From 918e930aa2a9c01674ef7d7e566c23f322058d95 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@pivotal.io>
Date: Tue, 12 Jan 2016 11:45:23 +0000
Subject: [PATCH] Explicit version management for Lombok

---
 bus/pom.xml                                                | 5 -----
 config-client-decrypt/pom.xml                              | 5 -----
 config-client/pom.xml                                      | 5 -----
 config-retry/pom.xml                                       | 5 -----
 .../src/main/java/bootstrap/RetryConfiguration.java        | 7 ++++---
 5 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/bus/pom.xml b/bus/pom.xml
index 867899b..ef744fd 100644
--- a/bus/pom.xml
+++ b/bus/pom.xml
@@ -44,11 +44,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-bus-redis</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/config-client-decrypt/pom.xml b/config-client-decrypt/pom.xml
index 783c0b8..6152534 100644
--- a/config-client-decrypt/pom.xml
+++ b/config-client-decrypt/pom.xml
@@ -48,11 +48,6 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-rsa</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/config-client/pom.xml b/config-client/pom.xml
index 2f17e1a..07980df 100644
--- a/config-client/pom.xml
+++ b/config-client/pom.xml
@@ -40,11 +40,6 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-starter-config</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/config-retry/pom.xml b/config-retry/pom.xml
index 9ab30dc..e5610d2 100644
--- a/config-retry/pom.xml
+++ b/config-retry/pom.xml
@@ -48,11 +48,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-config-server</artifactId>
diff --git a/config-retry/src/main/java/bootstrap/RetryConfiguration.java b/config-retry/src/main/java/bootstrap/RetryConfiguration.java
index 8e902ca..474d384 100644
--- a/config-retry/src/main/java/bootstrap/RetryConfiguration.java
+++ b/config-retry/src/main/java/bootstrap/RetryConfiguration.java
@@ -16,8 +16,8 @@
 
 package bootstrap;
 
-import lombok.extern.slf4j.Slf4j;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.retry.interceptor.RetryInterceptorBuilder;
@@ -27,9 +27,10 @@ import org.springframework.retry.interceptor.RetryOperationsInterceptor;
  * @author Dave Syer
  *
  */
-@Slf4j
 public class RetryConfiguration {
 
+	private static Logger log = LoggerFactory.getLogger(RetryConfiguration.class);
+
 	@Bean
 	@ConditionalOnMissingBean(name = "configServerRetryInterceptor")
 	public RetryOperationsInterceptor configServerRetryInterceptor() {