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

[JAVA-16376] Upgraded modules in batch (#13616) 

* [JAVA-18173] Moved vavr-modules to jdk9-and-above profile + fixed test message

* [JAVA-18139] Moved java-websocket module to jdk9-and-above profile

* [JAVA-18130] Moved azure module to jdk9-and-above profile

* [JAVA-18161] Moved netflix-modules to jdk9-and-above profile

* [JAVA-18178] Moved spf4j module to jdk9-and-above profile

* [JAVA-18159] Moved messaging-modules to jdk9-and-above profile

* [JAVA-18147] Moved kubernetes-modules to jdk9-and-above profile

* [JAVA-18191] Moved spring-di module to jdk9-and-above profile

* [JAVA-18192] Moved spring-di-2 module to jdk9-and-above profile

* [JAVA-18199] Moved spring-jinq module to jdk9-and-above profile

---------

Co-authored-by: Dhawal Kapil <dhawalkapil@gmail.com>
This commit is contained in:
panos-kakos 2023-03-19 16:16:22 +02:00 committed by GitHub
parent a529690d12
commit fd83fd8182
11 changed files with 35 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
azure/pom.xml
View File

@ -122,6 +122,7 @@
<docker.image.prefix>${azure.containerRegistry}.azurecr.io</docker.image.prefix>
<docker-maven-plugin.version>1.1.0</docker-maven-plugin.version>
<azure-webapp-maven-plugin.version>1.1.0</azure-webapp-maven-plugin.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

1
java-websocket/pom.xml
View File

@ -31,6 +31,7 @@
<properties>
<javax.websocket-api.version>1.1</javax.websocket-api.version>
<gson.version>2.8.0</gson.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

3
kubernetes-modules/pom.xml
View File

@ -15,8 +15,7 @@
<modules>
<module>k8s-intro</module>
<module>k8s-admission-controller</module>
<!-- <module>kubernetes-spring</module> --> <!-- JDK-11 Module -->
<module>k8s-java-heap-dump</module>
<module>kubernetes-spring</module>
</modules>
</project>

1
messaging-modules/pom.xml
View File

@ -18,6 +18,7 @@
<module>jgroups</module>
<module>rabbitmq</module>
<module>spring-amqp</module>
<module>spring-apache-camel</module>
<module>spring-jms</module>
</modules>

2
messaging-modules/spring-jms/pom.xml
View File

@ -67,7 +67,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
<configuration>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<warName>spring-jms</warName>
@ -83,6 +82,7 @@
<springframework.version>4.3.4.RELEASE</springframework.version>
<activemq.version>5.14.1</activemq.version>
<spring-boot-test.version>1.5.10.RELEASE</spring-boot-test.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

88
pom.xml
View File

@ -330,60 +330,35 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>azure</module>
<module>checker-plugin</module>
<!-- <module>clojure</module> --> <!-- Not a maven project -->
<module>core-java-modules</module>
<module>couchbase</module>
<!-- <module>ethereum</module> --> <!-- JAVA-6001 -->
<!-- <module>gradle-modules</module> --> <!-- Not a maven project -->
<module>gradle-modules/gradle/maven-to-gradle</module>
<!-- <module>grails</module> --> <!-- Not a maven project -->
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
<module>apache-httpclient</module>
<module>apache-httpclient4</module>
<module>java-jdi</module>
<module>java-websocket</module>
<module>jetbrains</module>
<module>jhipster-5</module>
<module>jmh</module>
<module>kubernetes-modules</module>
<!-- <module>lagom</module> --> <!-- Not a maven project -->
<module>language-interop</module>
<module>libraries-3</module>
<module>libraries-data-db</module>
<module>logging-modules</module>
<module>lombok-modules</module>
<module>maven-modules</module>
<module>messaging-modules</module>
<module>microservices-modules</module>
<module>muleesb</module>
<module>netflix-modules</module>
<module>osgi</module>
<module>persistence-modules</module>
<module>vavr-modules</module>
<module>web-modules</module>
</modules>
@ -429,7 +404,6 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>spf4j</module>
<module>spring-4</module>
<module>spring-aop</module>
@ -437,14 +411,12 @@
<module>spring-boot-modules</module>
<module>spring-cloud-modules</module>
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
<module>spring-di</module>
<module>spring-di-2</module>
<module>spring-ejb-modules</module>
<module>spring-exceptions</module>
<module>spring-integration</module>
<module>spring-jenkins-pipeline</module>
<module>spring-jinq</module>
<module>spring-katharsis</module>
<module>spring-mobile</module>
<module>spring-remoting-modules</module>
@ -524,7 +496,7 @@
<module>spring-ejb-modules/ejb-beans</module>
<module>vaadin</module>
<module>vavr-modules</module>
</modules>
</profile>
@ -560,8 +532,6 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>azure</module>
<module>checker-plugin</module>
<!-- <module>clojure</module> --> <!-- Not a maven project -->
@ -572,43 +542,24 @@
<module>gradle-modules/gradle/maven-to-gradle</module>
<!-- <module>grails</module> --> <!-- Not a maven project -->
<!-- <module>guest</module> --> <!-- not to be built as its for guest articles -->
<module>apache-httpclient</module>
<module>apache-httpclient4</module>
<module>java-jdi</module>
<module>java-websocket</module>
<module>jhipster-5</module>
<module>jmh</module>
<module>kubernetes-modules</module>
<!-- <module>lagom</module> --> <!-- Not a maven project -->
<module>language-interop</module>
<module>libraries-3</module>
<module>libraries-data-db</module>
<module>logging-modules</module>
<module>lombok-modules</module>
<module>maven-modules</module>
<module>messaging-modules</module>
<module>microservices-modules</module>
<module>muleesb</module>
<module>netflix-modules</module>
<module>osgi</module>
<module>persistence-modules</module>
<module>vavr-modules</module>
<module>web-modules</module>
</modules>
@ -646,21 +597,17 @@
<module>parent-spring-5</module>
<module>parent-java</module>
<module>spf4j</module>
<module>spring-4</module>
<module>spring-bom</module>
<module>spring-boot-modules</module>
<module>spring-cloud-modules</module>
<!-- <module>spring-cloud-cli</module> --> <!-- Not a maven project -->
<module>spring-di</module>
<module>spring-di-2</module>
<module>spring-ejb-modules</module>
<module>spring-exceptions</module>
<module>spring-integration</module>
<module>spring-jenkins-pipeline</module>
<module>spring-jinq</module>
<module>spring-katharsis</module>
<module>spring-mobile</module>
<module>spring-remoting-modules</module>
@ -731,7 +678,6 @@
<module>spring-boot-modules/spring-boot-react</module>
<module>spring-ejb-modules/ejb-beans</module>
<module>vaadin</module>
<module>vavr-modules</module>
</modules>
</profile>
@ -797,9 +743,19 @@
</build>
<modules>
<module>spring-di</module>
<module>spring-di-2</module>
<module>spring-jinq</module>
<module>vavr-modules</module>
<module>java-websocket</module>
<module>azure</module>
<module>netflix-modules</module>
<module>spf4j</module>
<module>spring-jersey</module>
<module>jersey</module>
<module>jaxb</module>
<module>javafx</module>
<module>spring-batch</module>
<module>spring-boot-rest</module>
@ -885,7 +841,7 @@
<module>drools</module>
<module>guava-modules</module>
<module>apache-httpclient-2</module>
<module>kubernetes-modules/kubernetes-spring</module>
<module>kubernetes-modules</module>
<module>libraries-concurrency</module>
<module>libraries-testing</module>
<module>maven-modules/compiler-plugin-java-9</module>
@ -1022,7 +978,7 @@
<module>xstream</module>
<module>webrtc</module>
<module>persistence-modules/java-mongodb</module>
<module>messaging-modules/spring-apache-camel</module>
<module>messaging-modules</module>
<module>spring-boot-modules/spring-boot-redis</module>
</modules>
@ -1057,9 +1013,19 @@
</build>
<modules>
<module>spring-di</module>
<module>spring-di-2</module>
<module>spring-jinq</module>
<module>vavr-modules</module>
<module>java-websocket</module>
<module>azure</module>
<module>netflix-modules</module>
<module>spf4j</module>
<module>spring-jersey</module>
<module>jersey</module>
<module>jaxb</module>
<module>javafx</module>
<module>spring-batch</module>
<module>spring-boot-rest</module>
@ -1143,7 +1109,7 @@
<module>drools</module>
<module>guava-modules</module>
<module>apache-httpclient-2</module>
<module>kubernetes-modules/kubernetes-spring</module>
<module>kubernetes-modules</module>
<module>libraries-concurrency</module>
<module>libraries-testing</module>
<module>maven-modules/compiler-plugin-java-9</module>
@ -1283,7 +1249,7 @@
<module>webrtc</module>
<module>persistence-modules/java-mongodb</module>
<module>libraries-2</module>
<module>messaging-modules/spring-apache-camel</module>
<module>messaging-modules</module>
<module>spring-boot-modules/spring-boot-redis</module>
</modules>

6
spf4j/spf4j-aspects-app/pom.xml
View File

@ -55,11 +55,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -98,7 +93,6 @@
<properties>
<spf4j.version>8.9.0</spf4j.version>
<compiler.plugin.version>3.8.0</compiler.plugin.version>
<dependency.plugin.version>3.1.1</dependency.plugin.version>
</properties>

6
spf4j/spf4j-core-app/pom.xml
View File

@ -61,11 +61,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin.version}</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -104,7 +99,6 @@
<properties>
<spf4j.version>8.9.0</spf4j.version>
<compiler.plugin.version>3.8.0</compiler.plugin.version>
<dependency.plugin.version>3.1.1</dependency.plugin.version>
</properties>

2
spring-di-2/pom.xml
View File

@ -85,7 +85,7 @@
<properties>
<spring-boot.version>2.6.1</spring-boot.version>
<aspectj-plugin.version>1.11</aspectj-plugin.version>
<aspectj-plugin.version>1.14.0</aspectj-plugin.version>
<javax.inject.version>1</javax.inject.version>
<log4j2.version>2.17.1</log4j2.version>
</properties>

1
spring-di/pom.xml
View File

@ -149,6 +149,7 @@
<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
<mockito.version>1.10.19</mockito.version>
<aspectjweaver.version>1.9.5</aspectjweaver.version>
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
</properties>
</project>

2
vavr-modules/vavr/src/test/java/com/baeldung/vavr/future/FutureUnitTest.java
View File

@ -184,6 +184,6 @@ public class FutureUnitTest {
assertThat(
errorMessage.get().getMessage())
.isEqualTo("String index out of range: -1");
.isEqualTo("begin -1, end 5, length 5");
}
}