deps: Update dependencies including log4j 2.15 (#6)

Litelinks does not have a dependency on log4j but makes use of it in unit tests. Changes to unit tests and surefire config are unrelated, but were required to fix some test flakes.
IBM · Dec 13, 2021 · 18fac1f · 18fac1f
1 parent 878ed9e
commit 18fac1f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -50,8 +50,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <netty-version>4.1.67.Final</netty-version>
-    <netty-tcnative-version>2.0.40.Final</netty-tcnative-version>
+    <netty-version>4.1.72.Final</netty-version>
   </properties>
 
   <build>
@@ -85,8 +84,8 @@
             <!-- required for LitelinksTests.client_close_test() -->
             <litelinks.delay_client_close>false</litelinks.delay_client_close>
           </systemPropertyVariables>
-          <!-- required to workaround issue with openjdk 8u181-b13-2 -->
-          <useSystemClassLoader>false</useSystemClassLoader>
+          <reuseForks>false</reuseForks>
+          <forkCount>2</forkCount>
         </configuration>
       </plugin>
       <plugin>
@@ -144,11 +143,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>io.netty</groupId>
-        <artifactId>netty-tcnative-boringssl-static</artifactId>
-        <version>${netty-tcnative-version}</version>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -183,7 +177,7 @@
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
-      <version>0.14.2</version>
+      <version>0.15.0</version>
       <scope>compile</scope>
       <exclusions>
         <!-- these are actually optional -->
@@ -289,7 +283,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>30.1.1-jre</version>
+      <version>31.0.1-jre</version>
       <scope>compile</scope>
     </dependency>
 
@@ -319,13 +313,13 @@
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-slf4j-impl</artifactId>
-      <version>2.14.1</version>
+      <version>2.15.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-core</artifactId>
-      <version>2.14.1</version>
+      <version>2.15.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -336,7 +330,7 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-annotations-api</artifactId>
-      <version>9.0.52</version>
+      <version>9.0.56</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/src/test/java/com/ibm/watson/litelinks/test/LitelinksLauncherTests.java b/src/test/java/com/ibm/watson/litelinks/test/LitelinksLauncherTests.java
@@ -136,7 +136,7 @@ public void test(Iface client) throws Exception {
      */
     @Test
     public void external_launch_test() throws Exception {
-        String sname = "launched_test";
+        String sname = "ext_launched_test";
         DummyService.Iface client = ThriftClientBuilder.newBuilder(DummyService.Client.class)
                 .withZookeeper(ZK).withServiceName(sname).withTimeout(5000).build();
         runTest(client, true, null, "-z", ZK, "-n", sname);
@@ -231,7 +231,7 @@ private static void do_ssl_test0(String mode, String[] clientargs, String[] serv
             for (int i = 0; i < serverEvs.length; i += 2) {
                 envVarMap.put("LITELINKS_SSL_" + serverEvs[i], serverEvs[i + 1]);
             }
-            String sname = "launched_test";
+            String sname = "launched_test_" + Long.toHexString(ThreadLocalRandom.current().nextLong());
             DummyService.Iface client = ThriftClientBuilder.newBuilder(DummyService.Client.class)
                     .withZookeeper(ZK).withServiceName(sname).withTimeout(5000).build();
             try (LitelinksServiceClient lsClient = (LitelinksServiceClient) client) {
@@ -319,7 +319,7 @@ public void req_listen_and_instid_test() throws Exception {
      */
     @Test
     public void service_version_test() throws Exception {
-        String sname = "launched_test";
+        String sname = "launched_sv_test";
         final String serviceVersion = "version-5";
         DummyService.Iface client = ThriftClientBuilder.newBuilder(DummyService.Client.class)
                 .withZookeeper(ZK).withServiceName(sname).withTimeout(5000).build();