Skip to content

Commit 14be293

Browse files
author
timis1
committed
JAVA-18149 Upgrade libraries-2 module to JDK 11
1 parent 5fb9fe4 commit 14be293

4 files changed

Lines changed: 37 additions & 30 deletions

File tree

‎.gitignore‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,4 +105,8 @@ spring-boot-modules/spring-boot-properties-3/*.log
105105
.sdkmanrc
106106

107107
# Localstack
108-
**/.localstack
108+
**/.localstack
109+
110+
#libraries-2
111+
libraries-2/employee*
112+
libraries-2/src/test/resources/crawler4j/**

‎libraries-2/pom.xml‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,7 @@
1616
<repository>
1717
<id>jboss-public-repository-group</id>
1818
<name>JBoss Public Repository Group</name>
19-
<url>http://repository.jboss.org/nexus/content/groups/public/</url>
20-
<releases>
21-
<enabled>true</enabled>
22-
<updatePolicy>never</updatePolicy>
23-
</releases>
24-
<snapshots>
25-
<enabled>true</enabled>
26-
<updatePolicy>daily</updatePolicy>
27-
</snapshots>
19+
<url>https://repo.maven.apache.org/maven2</url>
2820
</repository>
2921
</repositories>
3022

@@ -82,6 +74,12 @@
8274
<groupId>edu.uci.ics</groupId>
8375
<artifactId>crawler4j</artifactId>
8476
<version>${crawler4j.version}</version>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>com.sleepycat</groupId>
80+
<artifactId>je</artifactId>
81+
</exclusion>
82+
</exclusions>
8583
</dependency>
8684
<dependency>
8785
<groupId>com.github.jknack</groupId>
@@ -119,22 +117,27 @@
119117
<artifactId>spring-jdbc</artifactId>
120118
<version>${spring.version}</version>
121119
</dependency>
120+
<dependency>
121+
<groupId>com.sleepycat</groupId>
122+
<artifactId>je</artifactId>
123+
<version>18.3.12</version>
124+
</dependency>
122125
</dependencies>
123126

124127
<properties>
125-
<mapdb.version>3.0.7</mapdb.version>
126-
<classgraph.version>4.8.28</classgraph.version>
127-
<jbpm.version>6.0.0.Final</jbpm.version>
128-
<picocli.version>3.9.6</picocli.version>
129-
<chronicle.map.version>3.17.2</chronicle.map.version>
128+
<mapdb.version>3.0.8</mapdb.version>
129+
<classgraph.version>4.8.153</classgraph.version>
130+
<jbpm.version>7.1.0.Final</jbpm.version>
131+
<picocli.version>4.7.0</picocli.version>
132+
<chronicle.map.version>3.24ea1</chronicle.map.version>
130133
<crawler4j.version>4.4.0</crawler4j.version>
131-
<spring-boot-starter.version>2.1.4.RELEASE</spring-boot-starter.version>
132-
<mesos.library.version>0.28.3</mesos.library.version>
134+
<spring-boot-starter.version>2.7.8</spring-boot-starter.version>
135+
<mesos.library.version>1.11.0</mesos.library.version>
133136
<parallel-collectors.version>1.1.0</parallel-collectors.version>
134-
<handlebars.version>4.1.2</handlebars.version>
135-
<jasperreports.version>6.17.0</jasperreports.version>
136-
<spring.version>5.1.9.RELEASE</spring.version>
137-
<hsqldb.version>2.5.0</hsqldb.version>
137+
<handlebars.version>4.3.1</handlebars.version>
138+
<jasperreports.version>6.20.0</jasperreports.version>
139+
<spring.version>5.3.25</spring.version>
140+
<hsqldb.version>2.7.1</hsqldb.version>
138141
</properties>
139142

140143
</project>

‎libraries-2/src/test/java/com/baeldung/parallel_collectors/ParallelCollectorsUnitTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void shouldProcessInParallelWithParallelCollectors() {
4040
List<Integer> ids = Arrays.asList(1, 2, 3);
4141

4242
CompletableFuture<List<String>> results = ids.stream()
43-
.collect(parallelToList(i -> fetchById(i), executor, 4));
43+
.collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4));
4444

4545
System.out.println(results.join());
4646
}
@@ -52,7 +52,7 @@ public void shouldCollectToList() {
5252
List<Integer> ids = Arrays.asList(1, 2, 3);
5353

5454
List<String> results = ids.stream()
55-
.collect(parallelToList(i -> fetchById(i), executor, 4))
55+
.collect(parallelToList(ParallelCollectorsUnitTest::fetchById, executor, 4))
5656
.join();
5757

5858
System.out.println(results); // [user-1, user-2, user-3]
@@ -92,7 +92,7 @@ public void shouldStreamInCompletionOrder() {
9292
List<Integer> ids = Arrays.asList(1, 2, 3);
9393

9494
ids.stream()
95-
.collect(parallel(i -> fetchByIdWithRandomDelay(i), executor, 4))
95+
.collect(parallel(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4))
9696
.forEach(System.out::println);
9797
}
9898

@@ -103,7 +103,7 @@ public void shouldStreamInOriginalOrder() {
103103
List<Integer> ids = Arrays.asList(1, 2, 3);
104104

105105
ids.stream()
106-
.collect(parallelOrdered(i -> fetchByIdWithRandomDelay(i), executor, 4))
106+
.collect(parallelOrdered(ParallelCollectorsUnitTest::fetchByIdWithRandomDelay, executor, 4))
107107
.forEach(System.out::println);
108108
}
109109

@@ -114,7 +114,7 @@ public void shouldCollectToMap() {
114114
List<Integer> ids = Arrays.asList(1, 2, 3);
115115

116116
Map<Integer, String> results = ids.stream()
117-
.collect(parallelToMap(i -> i, i -> fetchById(i), executor, 4))
117+
.collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, executor, 4))
118118
.join();
119119

120120
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
@@ -127,7 +127,7 @@ public void shouldCollectToTreeMap() {
127127
List<Integer> ids = Arrays.asList(1, 2, 3);
128128

129129
Map<Integer, String> results = ids.stream()
130-
.collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new, executor, 4))
130+
.collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, TreeMap::new, executor, 4))
131131
.join();
132132

133133
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}
@@ -140,7 +140,7 @@ public void shouldCollectToTreeMapAndResolveClashes() {
140140
List<Integer> ids = Arrays.asList(1, 2, 3);
141141

142142
Map<Integer, String> results = ids.stream()
143-
.collect(parallelToMap(i -> i, i -> fetchById(i), TreeMap::new, (s1, s2) -> s1, executor, 4))
143+
.collect(parallelToMap(i -> i, ParallelCollectorsUnitTest::fetchById, TreeMap::new, (s1, s2) -> s1, executor, 4))
144144
.join();
145145

146146
System.out.println(results); // {1=user-1, 2=user-2, 3=user-3}

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,6 @@
387387

388388
<!-- <module>lagom</module> --> <!-- Not a maven project -->
389389
<module>language-interop</module>
390-
<module>libraries-2</module>
391390
<module>libraries-3</module>
392391
<module>libraries-data</module>
393392

@@ -670,7 +669,6 @@
670669

671670
<!-- <module>lagom</module> --> <!-- Not a maven project -->
672671
<module>language-interop</module>
673-
<module>libraries-2</module>
674672
<module>libraries-3</module>
675673
<module>libraries-data</module>
676674

@@ -1074,6 +1072,7 @@
10741072
<module>tensorflow-java</module>
10751073
<module>xstream</module>
10761074
<module>webrtc</module>
1075+
<module>libraries-2</module>
10771076
</modules>
10781077

10791078
<properties>
@@ -1275,6 +1274,7 @@
12751274
<module>tensorflow-java</module>
12761275
<module>xstream</module>
12771276
<module>webrtc</module>
1277+
<module>libraries-2</module>
12781278
</modules>
12791279

12801280
<properties>

0 commit comments

Comments
 (0)