Upgraded dependencies and removed Lombok

Author: jruaux

jreleaser.yml

@@ -11,15 +11,24 @@ project:
 
 release:
   github:
-    username: jruaux
     overwrite: true
+    sign: true
     changelog:
-      contributors:
-        enabled: false
-      sort: DESC
       formatted: ALWAYS
       format: '- {{commitShortHash}} {{commitTitle}}'
+      contributors:
+        enabled: false
       labelers:
+        - label: 'merge_pull'
+          title: 'Merge pull'
+        - label: 'merge_branch'
+          title: 'Merge branch'
+        - label: 'translation'
+          title: '[translation]'
+        - label: 'task'
+          title: '[chore]'
+        - label: 'dependencies'
+          title: '[deps]'
         - label: 'feature'
           title: 'Resolves #'
           body: 'Resolves #'
@@ -29,11 +38,11 @@ release:
         - label: 'issue'
           title: 'Relates to #'
           body: 'Relates to #'
-        - label: 'task'
-          title: '[chore]'
-        - label: 'dependencies'
-          title: '[deps]'
       categories:
+        - title: 'Merge'
+          labels:
+            - 'merge_pull'
+            - 'merge_branch'
         - title: '🚀 Features'
           labels:
             - 'feature'
@@ -43,14 +52,29 @@ release:
         - title: '🧰 Tasks'
           labels:
             - 'task'
-        - title: '⚙️ Dependencies'
+        - title: '🌐 Translation'
+          labels:
+            - 'translation'
+        - title: '⚙️  Dependencies'
           labels:
             - 'dependencies'
+      hide:
+        categories:
+          - 'Merge'
+        contributors:
+          - 'GitHub'
       replacers:
         - search: '\[chore\] '
-          replace: ''
         - search: '\[deps\] '
-          replace: ''
+        - search: '\[translation\] '
+
+signing:
+  active: always
+  armored: true
+  files: false
+
+checksum:
+  files: false
 
 announce:
   slack:
@@ -69,6 +93,7 @@ distributions:
     artifacts:
       - path: target/components/packages/{{distributionName}}.{{projectVersion}}.zip
         transform: '{{distributionName}}.{{projectEffectiveVersion}}.zip'
+
 files:
   artifacts:
     - path: target/generated-docs/redis-enterprise-kafka-{{projectVersion}}.pdf

pom.xml

@@ -26,11 +26,11 @@
 		<jruby.version>9.2.17.0</jruby.version>
 		<junit.version>5.8.1</junit.version>
 		<lettucemod.version>1.8.1</lettucemod.version>
-		<lombok.version>1.18.22</lombok.version>
 		<mockito.version>4.1.0</mockito.version>
-		<reactor.version>3.4.12</reactor.version>
-		<spring-batch-redis.version>2.23.7</spring-batch-redis.version>
-		<slf4j.version>1.7.30</slf4j.version>
+		<reactor.version>3.4.13</reactor.version>
+		<spring-batch-redis.version>2.23.9</spring-batch-redis.version>
+		<spring-batch.version>4.3.4</spring-batch.version>
+		<slf4j.version>1.7.32</slf4j.version>
 		<testcontainers-redis.version>1.4.6</testcontainers-redis.version>
 		<testcontainers.version>1.15.3</testcontainers.version>
 		<component-owner>redis</component-owner>
@@ -98,20 +98,19 @@
 		</dependency>
 		<dependency>
 			<groupId>com.redis</groupId>
-			<artifactId>spring-boot-starter-batch-redis</artifactId>
+			<artifactId>spring-batch-redis</artifactId>
 			<version>${spring-batch-redis.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.batch</groupId>
+			<artifactId>spring-batch-core</artifactId>
+			<version>${spring-batch.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
 			<version>${slf4j.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>${lombok.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.github.jcustenborder.kafka.connect</groupId>
 			<artifactId>connect-utils-testing</artifactId>
@@ -199,7 +198,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.6</version>
+				<version>0.8.7</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

src/test/integration/java/com/redis/kafka/connect/RedisEnterpriseSinkTaskIT.java

@@ -49,9 +49,6 @@
 import io.lettuce.core.Range;
 import io.lettuce.core.ScoredValue;
 import io.lettuce.core.StreamMessage;
-import lombok.Builder;
-import lombok.Data;
-import lombok.Singular;
 
 class RedisEnterpriseSinkTaskIT extends AbstractTestcontainersRedisTestBase {
 
@@ -130,39 +127,125 @@ void putHash(RedisTestContext redis) {
 		}
 	}
 
-	@Data
-	@Builder
 	private static class Person {
 		private long id;
 		private String name;
-		@Singular
-		private Set<String> hobbies;
+		private Set<String> hobbies = new HashSet<>();
 		private Address address;
+
+		public long getId() {
+			return id;
+		}
+
+		public void setId(long id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Set<String> getHobbies() {
+			return hobbies;
+		}
+
+		public void setHobbies(Set<String> hobbies) {
+			this.hobbies = hobbies;
+		}
+
+		public Address getAddress() {
+			return address;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
 	}
 
-	@Data
-	@Builder
 	private static class Address {
+
 		private String street;
 		private String city;
 		private String state;
 		private String zip;
+
+		public String getStreet() {
+			return street;
+		}
+
+		public void setStreet(String street) {
+			this.street = street;
+		}
+
+		public String getCity() {
+			return city;
+		}
+
+		public void setCity(String city) {
+			this.city = city;
+		}
+
+		public String getState() {
+			return state;
+		}
+
+		public void setState(String state) {
+			this.state = state;
+		}
+
+		public String getZip() {
+			return zip;
+		}
+
+		public void setZip(String zip) {
+			this.zip = zip;
+		}
+
 	}
 
 	@ParameterizedTest
 	@RedisTestContextsSource
 	void putJSON(RedisTestContext redis) throws JsonProcessingException {
 		String topic = "putJSON";
 		List<Person> persons = new ArrayList<>();
-		persons.add(Person.builder().id(1).name("Bodysnatch Cummerbund")
-				.address(Address.builder().city("New York").zip("10013").state("NY").street("150 Mott St").build())
-				.hobby("Fishing").hobby("Singing").build());
-		persons.add(Person.builder().id(2).name("Buffalo Custardbath").address(
-				Address.builder().city("Los Angeles").zip("90001").state("CA").street("123 Sunset Blvd").build())
-				.hobby("Surfing").hobby("Piano").build());
-		persons.add(Person.builder().id(3).name("Bumblesnuff Crimpysnitch")
-				.address(Address.builder().city("Chicago").zip("60603").state("IL").street("100 S State St").build())
-				.hobby("Skiing").hobby("Drums").build());
+		Person person1 = new Person();
+		person1.setId(1);
+		person1.setName("Bodysnitch Canderbunt");
+		person1.setHobbies(new HashSet<>(Arrays.asList("Fishing", "Singing")));
+		Address address1 = new Address();
+		address1.setCity("New York");
+		address1.setZip("10013");
+		address1.setState("NY");
+		address1.setStreet("150 Mott St");
+		person1.setAddress(address1);
+		persons.add(person1);
+		Person person2 = new Person();
+		person2.setId(2);
+		person2.setName("Buffalo Custardbath");
+		person2.setHobbies(new HashSet<>(Arrays.asList("Surfing", "Piano")));
+		Address address2 = new Address();
+		address2.setCity("Los Angeles");
+		address2.setZip("90001");
+		address2.setState("CA");
+		address2.setStreet("123 Sunset Blvd");
+		person2.setAddress(address2);
+		persons.add(person2);
+		Person person3 = new Person();
+		person3.setId(3);
+		person3.setName("Bumblesnuff Crimpysnitch");
+		person3.setHobbies(new HashSet<>(Arrays.asList("Skiing", "Drums")));
+		Address address3 = new Address();
+		address3.setCity("Chicago");
+		address3.setZip("60603");
+		address3.setState("IL");
+		address3.setStreet("100 S State St");
+		person3.setAddress(address3);
+		persons.add(person3);
 		List<SinkRecord> records = new ArrayList<>();
 		ObjectMapper mapper = new ObjectMapper();
 		for (Person person : persons) {

src/test/integration/java/com/redis/kafka/connect/RedisEnterpriseSourceTaskIT.java

@@ -14,6 +14,8 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.params.ParameterizedTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
 import org.testcontainers.junit.jupiter.Container;
 
@@ -28,11 +30,10 @@
 import com.redis.testcontainers.junit.jupiter.RedisTestContext;
 import com.redis.testcontainers.junit.jupiter.RedisTestContextsSource;
 
-import lombok.extern.slf4j.Slf4j;
-
-@Slf4j
 class RedisEnterpriseSourceTaskIT extends AbstractTestcontainersRedisTestBase {
 
+	private static final Logger log = LoggerFactory.getLogger(RedisEnterpriseSourceTaskIT.class);
+
 	@Container
 	private static final RedisContainer REDIS = new RedisContainer(
 			RedisContainer.DEFAULT_IMAGE_NAME.withTag(RedisContainer.DEFAULT_TAG)).withKeyspaceNotifications();