update java dependencies to their latest releases (#2440)

Signed-off-by: Henry Avetisyan <hga@yahooinc.com> Co-authored-by: Henry Avetisyan <hga@yahooinc.com>
AthenZ · Dec 1, 2023 · cb685e9 · cb685e9
1 parent 28ab99c
commit cb685e9
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 30 deletions.
diff --git a/clients/java/zms/examples/tls-support/pom.xml b/clients/java/zms/examples/tls-support/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.14</athenz.version>
+    <athenz.version>1.11.47</athenz.version>
   </properties>
 
   <dependencies>
@@ -49,12 +49,12 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
+      <version>1.3.12</version>
     </dependency>
   </dependencies>
 

diff --git a/clients/java/zpe/pom.xml b/clients/java/zpe/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <jmh.version>1.35</jmh.version>
     <mock.server.version>5.15.0</mock.server.version>
-    <commons.io.version>2.13.0</commons.io.version>
+    <commons.io.version>2.15.1</commons.io.version>
     <uberjar.name>benchmarks</uberjar.name>
     <code.coverage.min>0.8702</code.coverage.min>
   </properties>

diff --git a/clients/java/zts/examples/tls-support/pom.xml b/clients/java/zts/examples/tls-support/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.14</athenz.version>
+    <athenz.version>1.11.47</athenz.version>
     <jjwt.version>0.11.5</jjwt.version>
   </properties>
 
@@ -62,17 +62,17 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.36</version>
+      <version>2.0.9</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
+      <version>1.3.12</version>
     </dependency>
   </dependencies>
 

diff --git a/containers/jetty/pom.xml b/containers/jetty/pom.xml
@@ -39,7 +39,7 @@
   </dependencyManagement>
 
   <properties>
-    <kinesis.logback.version>2.1.1</kinesis.logback.version>
+    <kinesis.logback.version>2.1.3</kinesis.logback.version>
     <code.coverage.min>0.8893</code.coverage.min>
   </properties>
 

diff --git a/libs/java/cert_refresher/examples/tls-support/pom.xml b/libs/java/cert_refresher/examples/tls-support/pom.xml
@@ -27,7 +27,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.14</athenz.version>
+    <athenz.version>1.11.47</athenz.version>
   </properties>
 
   <dependencies>
@@ -39,12 +39,12 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
+      <version>1.3.12</version>
     </dependency>
   </dependencies>
 

diff --git a/libs/java/gcp_zts_creds/examples/gcp-zts-creds/pom.xml b/libs/java/gcp_zts_creds/examples/gcp-zts-creds/pom.xml
@@ -27,8 +27,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <athenz.version>1.11.46</athenz.version>
-    <gcp.bom.version>26.26.0</gcp.bom.version>
+    <athenz.version>1.11.47</athenz.version>
+    <gcp.bom.version>26.27.0</gcp.bom.version>
   </properties>
 
   <dependencyManagement>
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.5.0</version>
+      <version>1.6.0</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
-      <version>1.4.12</version>
+      <version>1.4.13</version>
     </dependency>
     <dependency>
       <groupId>com.google.auth</groupId>

diff --git a/pom.xml b/pom.xml
@@ -72,11 +72,11 @@
 
   <properties>
     <apache.httpclient.version>4.5.14</apache.httpclient.version>
-    <aws.version>1.12.592</aws.version>
-    <aws2.version>2.21.26</aws2.version>
+    <aws.version>1.12.602</aws.version>
+    <aws2.version>2.21.35</aws2.version>
     <bouncycastle.version>1.77</bouncycastle.version>
     <commons.daemon.version>1.3.4</commons.daemon.version>
-    <commons.logging.version>1.2</commons.logging.version>
+    <commons.logging.version>1.3.0</commons.logging.version>
     <gcp.api-client.version>2.2.0</gcp.api-client.version>
     <gcp.bom.version>26.27.0</gcp.bom.version>
     <guava.version>32.1.3-jre</guava.version>
@@ -94,15 +94,15 @@
     <jjwt.version>0.11.5</jjwt.version>
     <jna.version>5.13.0</jna.version>
     <logback.client.version>1.2.12</logback.client.version>
-    <logback.server.version>1.4.11</logback.server.version>
+    <logback.server.version>1.4.13</logback.server.version>
     <mockito.version>5.7.0</mockito.version>
     <mysql.connector.version>8.0.33</mysql.connector.version>
     <nimbus.jose.version>9.37.1</nimbus.jose.version>
     <rdl.version>1.5.4</rdl.version>
     <slf4j.client.version>1.7.36</slf4j.client.version>
     <slf4j.server.version>2.0.9</slf4j.server.version>
     <swagger.version>2.2.19</swagger.version>
-    <testcontainers.version>1.19.2</testcontainers.version>
+    <testcontainers.version>1.19.3</testcontainers.version>
     <testng.version>7.8.0</testng.version>
 
     <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>

diff --git a/servers/zms/src/test/java/com/yahoo/athenz/zms/DomainDependencyTest.java b/servers/zms/src/test/java/com/yahoo/athenz/zms/DomainDependencyTest.java
@@ -53,19 +53,29 @@ public void setUp() throws Exception {
         System.setProperty(ZMS_PROP_SERVICE_PROVIDER_MANAGER_FREQUENCY_SECONDS, String.valueOf(fetchFrequency));
 
         // Reset ServiceProviderManager Singleton
-        Field instance = ServiceProviderManager.class.getDeclaredField("instance");
-        instance.setAccessible(true);
-        instance.set(null, null);
-
+        resetServiceProviderManager();
         zmsTestInitializer.setUp();
     }
 
     @AfterMethod
-    public void clearConnections() {
+    public void clearConnections() throws Exception {
+
         zmsTestInitializer.clearConnections();
+
+        // Reset ServiceProviderManager Singleton
+        ZMSImpl zmsImpl = zmsTestInitializer.getZms();
+        ServiceProviderManager.getInstance(zmsImpl.dbService, zmsImpl).shutdown();
+        resetServiceProviderManager();
+
         System.clearProperty(ZMS_PROP_SERVICE_PROVIDER_MANAGER_FREQUENCY_SECONDS);
     }
 
+    void resetServiceProviderManager() throws Exception {
+        Field instance = ServiceProviderManager.class.getDeclaredField("instance");
+        instance.setAccessible(true);
+        instance.set(null, null);
+    }
+
     @Test
     public void testDomainDependency() {
 

diff --git a/servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSPrincipalRolesTest.java b/servers/zms/src/test/java/com/yahoo/athenz/zms/ZMSPrincipalRolesTest.java
@@ -32,7 +32,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.yahoo.athenz.zms.ZMSConsts.ZMS_PROP_SERVICE_PROVIDER_MANAGER_FREQUENCY_SECONDS;
 import static org.testng.Assert.*;
 
 public class ZMSPrincipalRolesTest {
@@ -50,14 +49,11 @@ public void startMemoryMySQL() {
     @AfterClass
     public void stopMemoryMySQL() {
         zmsTestInitializer.stopMemoryMySQL();
-        System.clearProperty(ZMS_PROP_SERVICE_PROVIDER_MANAGER_FREQUENCY_SECONDS);
     }
 
     @BeforeMethod
     public void setUp() throws Exception {
         MockitoAnnotations.openMocks(this);
-
-        System.setProperty(ZMS_PROP_SERVICE_PROVIDER_MANAGER_FREQUENCY_SECONDS, String.valueOf(1L));
         zmsTestInitializer.setUp();
     }