iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
panos-kakos 2023-03-06 16:52:07 +02:00 committed by GitHub
parent 45721d7704
commit 15d85085f5
18 changed files with 72 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pom.xml
View File

@ -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>

1
spring-boot-rest/pom.xml
View File

@ -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>

7
spring-core-4/pom.xml
View File

@ -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>

7
spring-core/pom.xml
View File

@ -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>

5
spring-drools/pom.xml
View File

@ -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>

9
spring-exceptions/pom.xml
View File

@ -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>

4
spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause1PersistenceConfig.java
View File

@ -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;

4
spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause2PersistenceConfig.java
View File

@ -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;

4
spring-exceptions/src/main/java/com/baeldung/ex/mappingexception/spring/Cause3PersistenceConfig.java
View File

@ -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;

4
spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause1NonTransientConfig.java
View File

@ -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;

4
spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause4NonTransientConfig.java
View File

@ -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;

4
spring-exceptions/src/main/java/com/baeldung/ex/nontransientexception/cause/Cause5NonTransientConfig.java
View File

@ -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;

4
spring-exceptions/src/main/java/com/baeldung/spring/config/PersistenceConfig.java
View File

@ -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;

2
spring-exceptions/src/main/resources/hibernate-mysql.properties
View File

@ -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

2
spring-exceptions/src/main/resources/persistence-mysql-incorrect.properties
View File

@ -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

2
spring-exceptions/src/main/resources/persistence-mysql.properties
View File

@ -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

11
spring-integration/pom.xml
View File

@ -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>

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

@ -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;