[JAVA-27743] Upgraded spring-integration module to spring 6 & java 17 (#15343)

spring-integration/pom.xml

@@ -17,7 +17,6 @@
     </parent>
 
     <dependencies>
-        <!-- Testing -->
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-core</artifactId>
@@ -29,11 +28,6 @@
             <version>${javax-activation.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>${javax-mail.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-twitter</artifactId>
@@ -85,16 +79,21 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>${jaxb-api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
             <version>${postgresql.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.mail</groupId>
+            <artifactId>jakarta.mail</artifactId>
+            <version>${jakarta.mail.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -124,14 +123,13 @@
     </build>
 
     <properties>
-        <spring.version>5.1.13.RELEASE</spring.version>
+        <spring.version>6.0.0</spring.version>
         <spring-social.version>1.1.4.RELEASE</spring-social.version>
         <spring-integration-twitter.version>5.0.13.RELEASE</spring-integration-twitter.version>
-        <javax-mail.version>1.4.7</javax-mail.version>
         <javax-activation.version>1.1.1</javax-activation.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
-        <jaxb-api.version>2.3.0</jaxb-api.version>
         <postgresql.version>42.3.8</postgresql.version>
+        <jakarta.mail.version>2.0.1</jakarta.mail.version>
     </properties>
 
 </project>

spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java

@@ -1,6 +1,7 @@
 package com.baeldung.dsl;
 
 import java.io.File;
+import java.time.Duration;
 import java.util.Scanner;
 import java.util.concurrent.TimeUnit;
 
@@ -14,7 +15,6 @@ import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.core.GenericSelector;
 import org.springframework.integration.core.MessageSource;
 import org.springframework.integration.dsl.IntegrationFlow;
-import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.dsl.Pollers;
 import org.springframework.integration.dsl.MessageChannels;
 import org.springframework.integration.file.FileReadingMessageSource;
@@ -69,7 +69,7 @@ public class JavaDSLFileCopyConfig {
     
     @Bean
     public IntegrationFlow fileMover() {
-        return IntegrationFlows.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10000)))
+        return IntegrationFlow.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10000)))
             .filter(onlyJpgs())
             .handle(targetDirectory())
             .get();
@@ -77,7 +77,7 @@ public class JavaDSLFileCopyConfig {
 
     // @Bean
     public IntegrationFlow fileMoverWithLambda() {
-        return IntegrationFlows.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10000)))
+        return IntegrationFlow.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10000)))
             .filter(message -> ((File) message).getName()
                 .endsWith(".jpg"))
             .handle(targetDirectory())
@@ -92,7 +92,7 @@ public class JavaDSLFileCopyConfig {
 
     // @Bean
     public IntegrationFlow fileMoverWithPriorityChannel() {
-        return IntegrationFlows.from(sourceDirectory())
+        return IntegrationFlow.from(sourceDirectory())
             .filter(onlyJpgs())
             .channel("alphabetically")
             .handle(targetDirectory())
@@ -113,7 +113,7 @@ public class JavaDSLFileCopyConfig {
     
     // @Bean
     public IntegrationFlow fileReader() {
-        return IntegrationFlows.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10)))
+        return IntegrationFlow.from(sourceDirectory(), configurer -> configurer.poller(Pollers.fixedDelay(10)))
             .filter(onlyJpgs())
             .channel("holdingTank")
             .get();
@@ -121,16 +121,16 @@ public class JavaDSLFileCopyConfig {
 
     // @Bean
     public IntegrationFlow fileWriter() {
-        return IntegrationFlows.from("holdingTank")
+        return IntegrationFlow.from("holdingTank")
-            .bridge(e -> e.poller(Pollers.fixedRate(1, TimeUnit.SECONDS, 20)))
+            .bridge(e -> e.poller(Pollers.fixedRate(Duration.of(1, TimeUnit.SECONDS.toChronoUnit()), Duration.of(20, TimeUnit.SECONDS.toChronoUnit()))))
             .handle(targetDirectory())
             .get();
     }
 
     // @Bean
     public IntegrationFlow anotherFileWriter() {
-        return IntegrationFlows.from("holdingTank")
+        return IntegrationFlow.from("holdingTank")
-            .bridge(e -> e.poller(Pollers.fixedRate(2, TimeUnit.SECONDS, 10)))
+            .bridge(e -> e.poller(Pollers.fixedRate(Duration.of(2, TimeUnit.SECONDS.toChronoUnit()), Duration.of(10, TimeUnit.SECONDS.toChronoUnit()))))
             .handle(anotherTargetDirectory())
             .get();
     }