From bc7f5436634b50be59e6c0e67f2dde55556c81c8 Mon Sep 17 00:00:00 2001 From: timis1 Date: Tue, 14 Feb 2023 22:11:53 +0200 Subject: [PATCH 1/5] JAVA-18149 Upgrade libraries-2 module to JDK 11 --- .gitignore | 6 ++- libraries-2/pom.xml | 43 ++++++++++--------- .../ParallelCollectorsUnitTest.java | 14 +++--- pom.xml | 4 +- 4 files changed, 37 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 7b448f6cb0..87b9545954 100644 --- a/.gitignore +++ b/.gitignore @@ -105,4 +105,8 @@ spring-boot-modules/spring-boot-properties-3/*.log .sdkmanrc # Localstack -**/.localstack \ No newline at end of file +**/.localstack + +#libraries-2 +libraries-2/employee* +libraries-2/src/test/resources/crawler4j/** \ No newline at end of file diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml index ea1b2ca8b6..3f6f787f31 100644 --- a/libraries-2/pom.xml +++ b/libraries-2/pom.xml @@ -16,15 +16,7 @@ jboss-public-repository-group JBoss Public Repository Group - http://repository.jboss.org/nexus/content/groups/public/ - - true - never - - - true - daily - + https://repo.maven.apache.org/maven2 @@ -82,6 +74,12 @@ edu.uci.ics crawler4j ${crawler4j.version} + + + com.sleepycat + je + + com.github.jknack @@ -119,22 +117,27 @@ spring-jdbc ${spring.version} + + com.sleepycat + je + 18.3.12 + - 3.0.7 - 4.8.28 - 6.0.0.Final - 3.9.6 - 3.17.2 + 3.0.8 + 4.8.153 + 7.1.0.Final + 4.7.0 + 3.24ea1 4.4.0 - 2.1.4.RELEASE - 0.28.3 + 2.7.8 + 1.11.0 1.1.0 - 4.1.2 - 6.17.0 - 5.1.9.RELEASE - 2.5.0 + 4.3.1 + 6.20.0 + 5.3.25 + 2.7.1 \ No newline at end of file diff --git a/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java b/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java index adc753a8ad..e1ad2f7537 100644 --- a/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java +++ b/libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java @@ -40,7 +40,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); CompletableFuture> results = ids.stream() - .collect(parallelToList(i -> fetchById(i), executor, 4)); + .collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4)); System.out.println(results.join()); } @@ -52,7 +52,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); List results = ids.stream() - .collect(parallelToList(i -> fetchById(i), executor, 4)) + .collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4)) .join(); System.out.println(results); // [user-1, user-2, user-3] @@ -92,7 +92,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); ids.stream() - .collect(parallel(i -> fetchByIdWithRandomDelay(i), executor, 4)) + .collect(parallel(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4)) .forEach(System.out::println); } @@ -103,7 +103,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); ids.stream() - .collect(parallelOrdered(i -> fetchByIdWithRandomDelay(i), executor, 4)) + .collect(parallelOrdered(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4)) .forEach(System.out::println); } @@ -114,7 +114,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); Map results = ids.stream() - .collect(parallelToMap(i -> i, i -> fetchById(i), executor, 4)) + .collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, executor, 4)) .join(); System.out.println(results); // {1=user-1, 2=user-2, 3=user-3} @@ -127,7 +127,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); Map 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(); System.out.println(results); // {1=user-1, 2=user-2, 3=user-3} @@ -140,7 +140,7 @@ public class ParallelCollectorsUnitTest { List ids = Arrays.asList(1, 2, 3); Map 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(); System.out.println(results); // {1=user-1, 2=user-2, 3=user-3} diff --git a/pom.xml b/pom.xml index 4016d669a4..ea69fc7570 100644 --- a/pom.xml +++ b/pom.xml @@ -387,7 +387,6 @@ language-interop - libraries-2 libraries-3 libraries-data @@ -670,7 +669,6 @@ language-interop - libraries-2 libraries-3 libraries-data @@ -1074,6 +1072,7 @@ tensorflow-java xstream webrtc + libraries-2 @@ -1275,6 +1274,7 @@ tensorflow-java xstream webrtc + libraries-2 From 9479883dbfd299ddbebeb9fe356d463ef5d332b4 Mon Sep 17 00:00:00 2001 From: timis1 Date: Thu, 16 Feb 2023 09:18:21 +0200 Subject: [PATCH 2/5] JAVA-18149 Change chronicle.map version --- libraries-2/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml index 3f6f787f31..3c822eea47 100644 --- a/libraries-2/pom.xml +++ b/libraries-2/pom.xml @@ -129,7 +129,7 @@ 4.8.153 7.1.0.Final 4.7.0 - 3.24ea1 + 3.17.2 4.4.0 2.7.8 1.11.0 diff --git a/pom.xml b/pom.xml index 14f3c4e5ba..15db6e4cd1 100644 --- a/pom.xml +++ b/pom.xml @@ -1012,6 +1012,7 @@ java-native jsoup ksqldb + libraries-2 libraries-7 libraries-apache-commons libraries-apache-commons-collections @@ -1066,7 +1067,6 @@ tensorflow-java xstream webrtc - libraries-2 From 7fcff3227ce851467d9b1c3f32acb2f17ffb271b Mon Sep 17 00:00:00 2001 From: timis1 Date: Sat, 18 Feb 2023 13:16:48 +0200 Subject: [PATCH 3/5] JAVA-18149 Latest version chronicle.map --- libraries-2/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml index 3c822eea47..3f6f787f31 100644 --- a/libraries-2/pom.xml +++ b/libraries-2/pom.xml @@ -129,7 +129,7 @@ 4.8.153 7.1.0.Final 4.7.0 - 3.17.2 + 3.24ea1 4.4.0 2.7.8 1.11.0 From 2b48a6b4741792f6e3530a33e7c336d4ae6a60ea Mon Sep 17 00:00:00 2001 From: timis1 Date: Wed, 22 Feb 2023 19:38:11 +0200 Subject: [PATCH 4/5] JAVA-18149 Pass to the build the required parameters for chronicle-map --- libraries-2/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml index 3f6f787f31..01c5c79588 100644 --- a/libraries-2/pom.xml +++ b/libraries-2/pom.xml @@ -124,6 +124,19 @@ + + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0-M7 + + --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 + + + + + 3.0.8 4.8.153 From 7fddfb33eb2814a139cc2a96ea463d31feef1547 Mon Sep 17 00:00:00 2001 From: timis1 Date: Thu, 23 Feb 2023 14:16:02 +0200 Subject: [PATCH 5/5] JAVA-18149 Formatting pom.xml and apply some suggestion --- libraries-2/pom.xml | 10 +--------- pom.xml | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/libraries-2/pom.xml b/libraries-2/pom.xml index 01c5c79588..1d5cde75a2 100644 --- a/libraries-2/pom.xml +++ b/libraries-2/pom.xml @@ -12,14 +12,6 @@ 1.0.0-SNAPSHOT - - - jboss-public-repository-group - JBoss Public Repository Group - https://repo.maven.apache.org/maven2 - - - org.mapdb @@ -129,7 +121,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M7 + ${maven-surefire-plugin.version} --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 diff --git a/pom.xml b/pom.xml index 55b25f40de..63113b665c 100644 --- a/pom.xml +++ b/pom.xml @@ -997,7 +997,7 @@ java-native jsoup ksqldb - libraries-2 + libraries-2 libraries-7 libraries-apache-commons libraries-apache-commons-collections