Merge pull request #13482 from timis1/JAVA-18149
JAVA-18149 Upgrade libraries-2 module to JDK 11
This commit is contained in:
commit
fd049a29b6
4
.gitignore
vendored
4
.gitignore
vendored
@ -109,5 +109,9 @@ spring-boot-modules/spring-boot-properties-3/*.log
|
|||||||
# Localstack
|
# Localstack
|
||||||
**/.localstack
|
**/.localstack
|
||||||
|
|
||||||
|
#libraries-2
|
||||||
|
libraries-2/employee*
|
||||||
|
libraries-2/src/test/resources/crawler4j/**
|
||||||
|
|
||||||
#web-modules/ninja
|
#web-modules/ninja
|
||||||
devDb*.db
|
devDb*.db
|
@ -12,22 +12,6 @@
|
|||||||
<version>1.0.0-SNAPSHOT</version>
|
<version>1.0.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<repositories>
|
|
||||||
<repository>
|
|
||||||
<id>jboss-public-repository-group</id>
|
|
||||||
<name>JBoss Public Repository Group</name>
|
|
||||||
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
|
|
||||||
<releases>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
<updatePolicy>never</updatePolicy>
|
|
||||||
</releases>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
<updatePolicy>daily</updatePolicy>
|
|
||||||
</snapshots>
|
|
||||||
</repository>
|
|
||||||
</repositories>
|
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.mapdb</groupId>
|
<groupId>org.mapdb</groupId>
|
||||||
@ -82,6 +66,12 @@
|
|||||||
<groupId>edu.uci.ics</groupId>
|
<groupId>edu.uci.ics</groupId>
|
||||||
<artifactId>crawler4j</artifactId>
|
<artifactId>crawler4j</artifactId>
|
||||||
<version>${crawler4j.version}</version>
|
<version>${crawler4j.version}</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>com.sleepycat</groupId>
|
||||||
|
<artifactId>je</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.jknack</groupId>
|
<groupId>com.github.jknack</groupId>
|
||||||
@ -119,22 +109,40 @@
|
|||||||
<artifactId>spring-jdbc</artifactId>
|
<artifactId>spring-jdbc</artifactId>
|
||||||
<version>${spring.version}</version>
|
<version>${spring.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.sleepycat</groupId>
|
||||||
|
<artifactId>je</artifactId>
|
||||||
|
<version>18.3.12</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
|
<version>${maven-surefire-plugin.version}</version>
|
||||||
|
<configuration>
|
||||||
|
<argLine>--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-opens=jdk.compiler/com.sun.tools.javac=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED</argLine>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<mapdb.version>3.0.7</mapdb.version>
|
<mapdb.version>3.0.8</mapdb.version>
|
||||||
<classgraph.version>4.8.28</classgraph.version>
|
<classgraph.version>4.8.153</classgraph.version>
|
||||||
<jbpm.version>6.0.0.Final</jbpm.version>
|
<jbpm.version>7.1.0.Final</jbpm.version>
|
||||||
<picocli.version>3.9.6</picocli.version>
|
<picocli.version>4.7.0</picocli.version>
|
||||||
<chronicle.map.version>3.17.2</chronicle.map.version>
|
<chronicle.map.version>3.24ea1</chronicle.map.version>
|
||||||
<crawler4j.version>4.4.0</crawler4j.version>
|
<crawler4j.version>4.4.0</crawler4j.version>
|
||||||
<spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
|
<spring-boot-starter.version>2.7.8</spring-boot-starter.version>
|
||||||
<mesos.library.version>0.28.3</mesos.library.version>
|
<mesos.library.version>1.11.0</mesos.library.version>
|
||||||
<parallel-collectors.version>1.1.0</parallel-collectors.version>
|
<parallel-collectors.version>1.1.0</parallel-collectors.version>
|
||||||
<handlebars.version>4.1.2</handlebars.version>
|
<handlebars.version>4.3.1</handlebars.version>
|
||||||
<jasperreports.version>6.17.0</jasperreports.version>
|
<jasperreports.version>6.20.0</jasperreports.version>
|
||||||
<spring.version>5.1.9.RELEASE</spring.version>
|
<spring.version>5.3.25</spring.version>
|
||||||
<hsqldb.version>2.5.0</hsqldb.version>
|
<hsqldb.version>2.7.1</hsqldb.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
</project>
|
</project>
|
@ -40,7 +40,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
CompletableFuture<List<String>> results = ids.stream()
|
CompletableFuture<List<String>> results = ids.stream()
|
||||||
.collect(parallelToList(i -> fetchById(i), executor, 4));
|
.collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4));
|
||||||
|
|
||||||
System.out.println(results.join());
|
System.out.println(results.join());
|
||||||
}
|
}
|
||||||
@ -52,7 +52,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
List<String> results = ids.stream()
|
List<String> results = ids.stream()
|
||||||
.collect(parallelToList(i -> fetchById(i), executor, 4))
|
.collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4))
|
||||||
.join();
|
.join();
|
||||||
|
|
||||||
System.out.println(results); // [user-1, user-2, user-3]
|
System.out.println(results); // [user-1, user-2, user-3]
|
||||||
@ -92,7 +92,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
ids.stream()
|
ids.stream()
|
||||||
.collect(parallel(i -> fetchByIdWithRandomDelay(i), executor, 4))
|
.collect(parallel(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4))
|
||||||
.forEach(System.out::println);
|
.forEach(System.out::println);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -103,7 +103,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
ids.stream()
|
ids.stream()
|
||||||
.collect(parallelOrdered(i -> fetchByIdWithRandomDelay(i), executor, 4))
|
.collect(parallelOrdered(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4))
|
||||||
.forEach(System.out::println);
|
.forEach(System.out::println);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
Map<Integer, String> results = ids.stream()
|
Map<Integer, String> results = ids.stream()
|
||||||
.collect(parallelToMap(i -> i, i -> fetchById(i), executor, 4))
|
.collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, executor, 4))
|
||||||
.join();
|
.join();
|
||||||
|
|
||||||
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
|
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
|
||||||
@ -127,7 +127,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
Map<Integer, String> results = ids.stream()
|
Map<Integer, String> results = ids.stream()
|
||||||
.collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new, executor, 4))
|
.collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, TreeMap::new, executor, 4))
|
||||||
.join();
|
.join();
|
||||||
|
|
||||||
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
|
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
|
||||||
@ -140,7 +140,7 @@ public class ParallelCollectorsUnitTest {
|
|||||||
List<Integer> ids = Arrays.asList(1, 2, 3);
|
List<Integer> ids = Arrays.asList(1, 2, 3);
|
||||||
|
|
||||||
Map<Integer, String> results = ids.stream()
|
Map<Integer, String> results = ids.stream()
|
||||||
.collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new, (s1, s2) -> s1, executor, 4))
|
.collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, TreeMap::new, (s1, s2) -> s1, executor, 4))
|
||||||
.join();
|
.join();
|
||||||
|
|
||||||
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
|
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
|
||||||
|
4
pom.xml
4
pom.xml
@ -371,7 +371,6 @@
|
|||||||
|
|
||||||
<!-- <module>lagom</module> --> <!-- Not a maven project -->
|
<!-- <module>lagom</module> --> <!-- Not a maven project -->
|
||||||
<module>language-interop</module>
|
<module>language-interop</module>
|
||||||
<module>libraries-2</module>
|
|
||||||
<module>libraries-3</module>
|
<module>libraries-3</module>
|
||||||
<module>libraries-data</module>
|
<module>libraries-data</module>
|
||||||
|
|
||||||
@ -625,7 +624,6 @@
|
|||||||
|
|
||||||
<!-- <module>lagom</module> --> <!-- Not a maven project -->
|
<!-- <module>lagom</module> --> <!-- Not a maven project -->
|
||||||
<module>language-interop</module>
|
<module>language-interop</module>
|
||||||
<module>libraries-2</module>
|
|
||||||
<module>libraries-3</module>
|
<module>libraries-3</module>
|
||||||
<module>libraries-data</module>
|
<module>libraries-data</module>
|
||||||
|
|
||||||
@ -988,6 +986,7 @@
|
|||||||
<module>java-native</module>
|
<module>java-native</module>
|
||||||
<module>jsoup</module>
|
<module>jsoup</module>
|
||||||
<module>ksqldb</module>
|
<module>ksqldb</module>
|
||||||
|
<module>libraries-2</module>
|
||||||
<module>libraries-7</module>
|
<module>libraries-7</module>
|
||||||
<module>libraries-apache-commons</module>
|
<module>libraries-apache-commons</module>
|
||||||
<module>libraries-apache-commons-collections</module>
|
<module>libraries-apache-commons-collections</module>
|
||||||
@ -1271,6 +1270,7 @@
|
|||||||
<module>tensorflow-java</module>
|
<module>tensorflow-java</module>
|
||||||
<module>xstream</module>
|
<module>xstream</module>
|
||||||
<module>webrtc</module>
|
<module>webrtc</module>
|
||||||
|
<module>libraries-2</module>
|
||||||
<module>messaging-modules/spring-apache-camel</module>
|
<module>messaging-modules/spring-apache-camel</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user