From 15d85085f5ffbfaa61a10ee4d31250bb26a4fdb9 Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 6 Mar 2023 16:52:07 +0200
Subject: [PATCH] JAVA-18183 Upgraded spring related modules (#13574)

* [JAVA-18183] Moved spring-batch module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-boot-rest module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-drools module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-exceptions module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-jenkins-pipeline module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-core module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-core-4 module to jdk9-and-above-profile

* [JAVA-18183] Moved spring-integration module to jdk9-and-above-profile

* [JAVA-18183] Upgraded spring-drools dependencies

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
---
 pom.xml                                       | 35 ++++++++++---------
 spring-boot-rest/pom.xml                      |  1 +
 spring-core-4/pom.xml                         |  7 ++++
 spring-core/pom.xml                           |  7 ++++
 spring-drools/pom.xml                         |  5 +--
 spring-exceptions/pom.xml                     |  9 ++++-
 .../spring/Cause1PersistenceConfig.java       |  4 +--
 .../spring/Cause2PersistenceConfig.java       |  4 +--
 .../spring/Cause3PersistenceConfig.java       |  4 +--
 .../cause/Cause1NonTransientConfig.java       |  4 +--
 .../cause/Cause4NonTransientConfig.java       |  4 +--
 .../cause/Cause5NonTransientConfig.java       |  4 +--
 .../spring/config/PersistenceConfig.java      |  4 +--
 .../main/resources/hibernate-mysql.properties |  2 +-
 .../persistence-mysql-incorrect.properties    |  2 +-
 .../resources/persistence-mysql.properties    |  2 +-
 spring-integration/pom.xml                    | 11 ++++--
 .../baeldung/dsl/JavaDSLFileCopyConfig.java   |  2 +-
 18 files changed, 72 insertions(+), 39 deletions(-)

diff --git a/pom.xml b/pom.xml
index dcfa26abd5..8eced5674b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -437,22 +437,15 @@
                 <module>spf4j</module>
                 <module>spring-4</module>
                 <module>spring-aop</module>
-                <module>spring-batch</module>
+
                 <module>spring-bom</module>
                 <module>spring-boot-modules</module>
-                <module>spring-boot-rest</module>
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-core</module>
-                <module>spring-core-4</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
-                <module>spring-drools</module>
                 <module>spring-ejb-modules</module>
 
-                <module>spring-exceptions</module>
-                <module>spring-integration</module>
-                <module>spring-jenkins-pipeline</module>
                 <module>spring-jersey</module>
                 <module>spring-jinq</module>
                 <module>spring-katharsis</module>
@@ -665,21 +658,15 @@
 
                 <module>spf4j</module>
                 <module>spring-4</module>
-                <module>spring-batch</module>
+
                 <module>spring-bom</module>
                 <module>spring-boot-modules</module>
-                <module>spring-boot-rest</module>
                 <module>spring-cloud-modules</module>
                 <!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
-                <module>spring-core</module>
-                <module>spring-core-4</module>
                 <module>spring-di</module>
                 <module>spring-di-2</module>
-                <module>spring-drools</module>
                 <module>spring-ejb-modules</module>
-                <module>spring-exceptions</module>
-                <module>spring-integration</module>
-                <module>spring-jenkins-pipeline</module>
+
                 <module>spring-jersey</module>
                 <module>spring-jinq</module>
                 <module>spring-katharsis</module>
@@ -818,6 +805,14 @@
             </build>
 
             <modules>
+                <module>spring-batch</module>
+                <module>spring-boot-rest</module>
+                <module>spring-drools</module>
+                <module>spring-exceptions</module>
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-core</module>
+                <module>spring-core-4</module>
+                <module>spring-integration</module>
                 <module>libraries-security</module>
                 <module>performance-tests</module>
                 <module>security-modules</module>
@@ -1063,6 +1058,14 @@
             </build>
 
             <modules>
+                <module>spring-batch</module>
+                <module>spring-boot-rest</module>
+                <module>spring-drools</module>
+                <module>spring-exceptions</module>
+                <module>spring-jenkins-pipeline</module>
+                <module>spring-core</module>
+                <module>spring-core-4</module>
+                <module>spring-integration</module>
                 <module>libraries-security</module>
                 <module>performance-tests</module>
                 <module>security-modules</module>
diff --git a/spring-boot-rest/pom.xml b/spring-boot-rest/pom.xml
index f81286adb6..fb5df4e68a 100644
--- a/spring-boot-rest/pom.xml
+++ b/spring-boot-rest/pom.xml
@@ -88,6 +88,7 @@
         <start-class>com.baeldung.SpringBootRestApplication</start-class>
         <xstream.version>1.4.11.1</xstream.version>
         <modelmapper.version>3.1.0</modelmapper.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core-4/pom.xml b/spring-core-4/pom.xml
index 2874931738..6ba8357a0e 100644
--- a/spring-core-4/pom.xml
+++ b/spring-core-4/pom.xml
@@ -66,6 +66,11 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>${servlet-api.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
     </dependencies>
 
     <properties>
@@ -73,6 +78,8 @@
         <spring.boot.version>2.2.2.RELEASE</spring.boot.version>
         <awaitility.version>4.0.2</awaitility.version>
         <servlet-api.version>4.0.0</servlet-api.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-core/pom.xml b/spring-core/pom.xml
index d8eaf22220..d1c155b92a 100644
--- a/spring-core/pom.xml
+++ b/spring-core/pom.xml
@@ -62,6 +62,11 @@
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>${annotation-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -82,6 +87,8 @@
         <javax.inject.version>1</javax.inject.version>
         <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
         <mockito.version>1.10.19</mockito.version>
+        <annotation-api.version>1.3.2</annotation-api.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-drools/pom.xml b/spring-drools/pom.xml
index b8c025893c..e13feb6c80 100644
--- a/spring-drools/pom.xml
+++ b/spring-drools/pom.xml
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-spring</artifactId>
-            <version>${drools-version}</version>
+            <version>${kie-spring.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -75,7 +75,8 @@
     </dependencies>
 
     <properties>
-        <drools-version>7.0.0.Final</drools-version>
+        <drools-version>8.34.0.Final</drools-version>
+        <kie-spring.version>7.73.0.Final</kie-spring.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-exceptions/pom.xml b/spring-exceptions/pom.xml
index 0621009bdd..8912cad674 100644
--- a/spring-exceptions/pom.xml
+++ b/spring-exceptions/pom.xml
@@ -133,6 +133,11 @@
             <artifactId>derbytools</artifactId>
             <version>${derby.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -157,7 +162,7 @@
 
     <properties>
         <!-- Spring -->
-        <org.springframework.version>4.3.4.RELEASE</org.springframework.version>
+        <org.springframework.version>5.3.25</org.springframework.version>
         <org.springframework.security.version>4.2.0.RELEASE</org.springframework.security.version>
         <javassist.version>3.21.0-GA</javassist.version>
         <!-- persistence -->
@@ -168,6 +173,7 @@
         <!-- various -->
         <hibernate-validator.version>5.3.3.Final</hibernate-validator.version>
         <javax.el.version>2.2</javax.el.version>
+        <jaxb-api.version>2.3.0</jaxb-api.version>
         <!-- util -->
         <httpcore.version>4.4.5</httpcore.version>
         <httpclient.version>4.5.2</httpclient.version>
@@ -175,6 +181,7 @@
         <!-- maven plugins -->
         <maven-resources-plugin.version>2.7</maven-resources-plugin.version>
         <cargo-maven2-plugin.version>1.6.1</cargo-maven2-plugin.version>
+        <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
index d2929e3d91..6a24db6733 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
index 399238073c..a60fa5bc17 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
index f5191d52f2..ee76232323 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
@@ -13,8 +13,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
index 118cb5da90..6cf905c330 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
index e79266e9ee..fdad253671 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
index 784b36afbf..3256b002da 100644
--- a/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java b/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
index 0a31b158d9..b2630f5603 100644
--- a/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
+++ b/spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
@@ -12,8 +12,8 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor;
-import org.springframework.orm.hibernate4.HibernateTransactionManager;
-import org.springframework.orm.hibernate4.LocalSessionFactoryBean;
+import org.springframework.orm.hibernate5.HibernateTransactionManager;
+import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
 import com.google.common.base.Preconditions;
diff --git a/spring-exceptions/src/main/resources/hibernate-mysql.properties b/spring-exceptions/src/main/resources/hibernate-mysql.properties
index 49ca7fb3d1..bba27db11b 100644
--- a/spring-exceptions/src/main/resources/hibernate-mysql.properties
+++ b/spring-exceptions/src/main/resources/hibernate-mysql.properties
@@ -2,6 +2,6 @@ hibernate.connection.username=tutorialuser
 hibernate.connection.password=tutorialmy5ql
 hibernate.connection.driver_class=com.mysql.jdbc.Driver
 hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
-hibernate.connection.url=jdbc:mysql://localhost:3306/spring_hibernate4_exceptions?createDatabaseIfNotExist=true
+hibernate.connection.url=jdbc:mysql://localhost:3306/spring_hibernate5_exceptions?createDatabaseIfNotExist=true
 hibernate.show_sql=false
 hibernate.hbm2ddl.auto=create
\ No newline at end of file
diff --git a/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties b/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
index b5b8095104..142997a974 100644
--- a/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
+++ b/spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
@@ -1,6 +1,6 @@
 # jdbc.X
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql:3306://localhost/spring_hibernate4_exceptions?createDatabaseIfNotExist=true
+jdbc.url=jdbc:mysql:3306://localhost/spring_hibernate5_exceptions?createDatabaseIfNotExist=true
 jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
diff --git a/spring-exceptions/src/main/resources/persistence-mysql.properties b/spring-exceptions/src/main/resources/persistence-mysql.properties
index af56ce1bf8..5ac477607c 100644
--- a/spring-exceptions/src/main/resources/persistence-mysql.properties
+++ b/spring-exceptions/src/main/resources/persistence-mysql.properties
@@ -1,6 +1,6 @@
 # jdbc.X
 jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_exceptions?createDatabaseIfNotExist=true
+jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate5_exceptions?createDatabaseIfNotExist=true
 jdbc.user=tutorialuser
 jdbc.pass=tutorialmy5ql
 
diff --git a/spring-integration/pom.xml b/spring-integration/pom.xml
index 2e0e242a56..9882e02c57 100644
--- a/spring-integration/pom.xml
+++ b/spring-integration/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-twitter</artifactId>
-            <version>${spring.version}</version>
+            <version>${spring-integration-twitter.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.integration</groupId>
@@ -85,6 +85,11 @@
             <artifactId>h2</artifactId>
             <version>${h2.version}</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${jaxb-api.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -114,11 +119,13 @@
     </build>
 
     <properties>
-        <spring.version>5.0.13.RELEASE</spring.version>
+        <spring.version>5.1.13.RELEASE</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>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java b/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
index e79eec3e83..adaeac5386 100644
--- a/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
+++ b/spring-integration/src/main/java/com/baeldung/dsl/JavaDSLFileCopyConfig.java
@@ -16,7 +16,7 @@ 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.channel.MessageChannels;
+import org.springframework.integration.dsl.MessageChannels;
 import org.springframework.integration.file.FileReadingMessageSource;
 import org.springframework.integration.file.FileWritingMessageHandler;
 import org.springframework.messaging.MessageChannel;