From c6fea5434678210c94bb9fe8a5da1c28eb20389f Mon Sep 17 00:00:00 2001 From: spencergibb Date: Wed, 5 Feb 2025 16:00:53 -0500 Subject: [PATCH] Removes last vestiges of Lombok --- spring-cloud-consul-binder/pom.xml | 5 ----- spring-cloud-consul-core/pom.xml | 5 ----- spring-cloud-consul-discovery/pom.xml | 5 ----- .../spring-cloud-consul-bootstrap-tests/pom.xml | 6 ------ .../bootstraptests/ConsulBootstrapApplication.java | 3 --- .../cloud/consul/bootstraptests/SampleProperties.java | 11 ++++++++--- .../pom.xml | 6 ------ .../spring-cloud-consul-configdata-tests/pom.xml | 6 ------ .../consul/configdatatests/SampleProperties.java | 11 ++++++++--- 9 files changed, 16 insertions(+), 42 deletions(-) diff --git a/spring-cloud-consul-binder/pom.xml b/spring-cloud-consul-binder/pom.xml index a3b411a8..b12ef980 100644 --- a/spring-cloud-consul-binder/pom.xml +++ b/spring-cloud-consul-binder/pom.xml @@ -36,11 +36,6 @@ consul-api true - - org.projectlombok - lombok - test - org.springframework.cloud spring-cloud-deployer-local diff --git a/spring-cloud-consul-core/pom.xml b/spring-cloud-consul-core/pom.xml index 9788da7e..cb5219e0 100644 --- a/spring-cloud-consul-core/pom.xml +++ b/spring-cloud-consul-core/pom.xml @@ -78,11 +78,6 @@ httpcore true - - org.projectlombok - lombok - test - org.springframework.boot spring-boot-autoconfigure-processor diff --git a/spring-cloud-consul-discovery/pom.xml b/spring-cloud-consul-discovery/pom.xml index 39f6e664..e177fb9c 100644 --- a/spring-cloud-consul-discovery/pom.xml +++ b/spring-cloud-consul-discovery/pom.xml @@ -83,11 +83,6 @@ spring-boot-autoconfigure-processor true - - org.projectlombok - lombok - test - org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml index 7df4957f..4f68ac49 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/pom.xml @@ -56,12 +56,6 @@ org.springframework.cloud spring-cloud-starter-openfeign - - org.projectlombok - lombok - - true - diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/ConsulBootstrapApplication.java b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/ConsulBootstrapApplication.java index fe574db7..9321929f 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/ConsulBootstrapApplication.java +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/ConsulBootstrapApplication.java @@ -18,8 +18,6 @@ package org.springframework.cloud.consul.bootstraptests; import java.util.List; -import lombok.extern.slf4j.Slf4j; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.SpringApplication; @@ -48,7 +46,6 @@ import org.springframework.web.client.RestTemplate; @RestController @EnableConfigurationProperties @EnableFeignClients -@Slf4j public class ConsulBootstrapApplication { @Autowired diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/SampleProperties.java b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/SampleProperties.java index 1fa3e4d1..e0ef91e5 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/SampleProperties.java +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-bootstrap-tests/src/main/java/org/springframework/cloud/consul/bootstraptests/SampleProperties.java @@ -16,17 +16,22 @@ package org.springframework.cloud.consul.bootstraptests; -import lombok.Data; - import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author Spencer Gibb */ @ConfigurationProperties("sample") -@Data public class SampleProperties { private String prop = "default value"; + public String getProp() { + return prop; + } + + public void setProp(String prop) { + this.prop = prop; + } + } diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml index 58d9fbd9..ef18b2a7 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-retry-tests/pom.xml @@ -56,12 +56,6 @@ org.springframework.retry spring-retry - - org.projectlombok - lombok - - true - org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml index 7b23c822..56a2caf4 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/pom.xml @@ -41,12 +41,6 @@ org.springframework.cloud spring-cloud-starter-consul-config - - org.projectlombok - lombok - - true - org.springframework.boot spring-boot-starter-test diff --git a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/java/org/springframework/cloud/consul/configdatatests/SampleProperties.java b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/java/org/springframework/cloud/consul/configdatatests/SampleProperties.java index 75c0ef5e..444e4467 100644 --- a/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/java/org/springframework/cloud/consul/configdatatests/SampleProperties.java +++ b/spring-cloud-consul-integration-tests/spring-cloud-consul-configdata-tests/src/main/java/org/springframework/cloud/consul/configdatatests/SampleProperties.java @@ -16,17 +16,22 @@ package org.springframework.cloud.consul.configdatatests; -import lombok.Data; - import org.springframework.boot.context.properties.ConfigurationProperties; /** * @author Spencer Gibb */ @ConfigurationProperties("sample") -@Data public class SampleProperties { private String prop = "default value"; + public String getProp() { + return prop; + } + + public void setProp(String prop) { + this.prop = prop; + } + }