From 7c3f8007baaff22ab3773d40f7b4e3d135ff2ba3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Tue, 8 Mar 2016 17:51:24 +0100 Subject: [PATCH] Added no_lombok variable --- README.adoc | 5 ++++- docs/src/main/asciidoc/README.adoc | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.adoc b/README.adoc index 372190e6e..826582317 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,6 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) +:no_lombok: image::https://api.travis-ci.org/spring-cloud/spring-cloud-sleuth.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-sleuth] image::https://badges.gitter.im/spring-cloud/spring-cloud-sleuth.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-sleuth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] == Spring Cloud Sleuth @@ -318,6 +319,7 @@ following command: The generated eclipse projects can be imported by selecting `import existing projects` from the `file` menu. + ==== Adding Project Lombok Agent Spring Cloud uses http://projectlombok.org/features/index.html[Project Lombok] @@ -343,7 +345,7 @@ or you will encounter compile problems. It also needs a specific version of mave enabled. Intellij 14.1+ requires some configuration to ensure these are setup properly. 1. Click Preferences, Plugins. *Ensure Lombok is installed* - 2. Click New, Project from Existing Sources, choose your spring-cloud-sleuth directory + 2. Click New, Project from Existing Sources, choose your spring-cloud project directory 3. Choose Maven, and select Environment Settings. *Ensure you are using Maven 3.3.3* 4. In the next screen, *Select the profile `spring`* click Next until Finish. 5. Click Preferences, "Build, Execution, Deployment", Compiler, Annotation Processors. *Click Enable Annotation Processing* @@ -353,6 +355,7 @@ enabled. Intellij 14.1+ requires some configuration to ensure these are setup pr Maven is well supported by most Java IDEs. Refer to you vendor documentation. + IMPORTANT: There are 2 different versions of language level used in Spring Cloud Sleuth. Java 1.7 is used for main sources and Java 1.8 is used for tests. When importing your project to an IDE please activate the `ide` Maven profile to turn on Java 1.8 for both main and test sources. Of course remember that you MUST NOT use Java 1.8 features in the main sources. If you do diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 839512520..5a4c11676 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,3 +1,4 @@ +:no_lombok: image::https://api.travis-ci.org/spring-cloud/spring-cloud-sleuth.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-sleuth] image::https://badges.gitter.im/spring-cloud/spring-cloud-sleuth.svg[Gitter, link="https://gitter.im/spring-cloud/spring-cloud-sleuth?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"] include::intro.adoc[]