bumps deps to latest versions (#279)

codefromthecrypt · web-flow · commit 300dd7eca568 · 2025-02-16T14:27:23.000+08:00
Signed-off-by: Adrian Cole &lt;adrian.cole@elastic.co&gt;
diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml
@@ -24,7 +24,7 @@
     <!-- Be conscious about a 6.x upgrade: 5.x and 6.x types are incompatible
          as the former uses javax.jms and latter jakarta.jms. It could be
          better to make an activemq-client6 module. -->
-    <activemq.version>5.18.3</activemq.version>
+    <activemq.version>5.18.6</activemq.version>
   </properties>
 
   <dependencies>
diff --git a/amqp-client/pom.xml b/amqp-client/pom.xml
@@ -22,9 +22,9 @@
     <module.name>zipkin2.reporter.amqp</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
-    <amqp-client.version>5.21.0</amqp-client.version>
+    <amqp-client.version>5.25.0</amqp-client.version>
     <!-- Last pre-1.8 version -->
-    <old-amqp-client.version>4.12.0</old-amqp-client.version>
+    <floor-amqp-client.version>4.12.0</floor-amqp-client.version>
   </properties>
 
   <dependencies>
@@ -78,7 +78,7 @@
             <DynamicDependency>
               <groupId>com.rabbitmq</groupId>
               <artifactId>amqp-client</artifactId>
-              <version>${old-amqp-client.version}</version>
+              <version>${floor-amqp-client.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>
diff --git a/amqp-client/src/it/amqp_v4/pom.xml b/amqp-client/src/it/amqp_v4/pom.xml
@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>@old-amqp-client.version@</version>
+      <version>@floor-amqp-client.version@</version>
     </dependency>
 
     <dependency>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin-tests</artifactId>
-      <version>@zipkin.version@</version>
+      <version>@zipkin2.version@</version>
     </dependency>
 
     <dependency>
diff --git a/benchmarks/pom.xml b/benchmarks/pom.xml
@@ -99,7 +99,7 @@
       <groupId>com.linecorp.armeria</groupId>
       <artifactId>armeria</artifactId>
       <!-- match Zipkin version to avoid classpath problems -->
-      <version>1.26.4</version>
+      <version>1.31.3</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -144,7 +144,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
+            <version>1.7.0</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>ossrh</serverId>
@@ -155,12 +155,12 @@
 
           <plugin>
             <artifactId>maven-deploy-plugin</artifactId>
-            <version>3.1.1</version>
+            <version>3.1.2</version>
           </plugin>
 
           <plugin>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.2</version>
+            <version>3.2.7</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/brave/pom.xml b/brave/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin</artifactId>
-      <version>${zipkin.version}</version>
+      <version>${zipkin2.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin-junit5</artifactId>
-      <version>${zipkin.version}</version>
+      <version>${zipkin2.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -97,7 +97,7 @@
             <DynamicDependency>
               <groupId>com.squareup.okhttp3</groupId>
               <artifactId>mockwebserver</artifactId>
-              <version>${okhttp.version}</version>
+              <version>${okhttp4.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>
diff --git a/brave/src/it/no_zipkin_deps/pom.xml b/brave/src/it/no_zipkin_deps/pom.xml
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>@okhttp.version@</version>
+      <version>@okhttp4.version@</version>
     </dependency>
 
 
diff --git a/core/pom.xml b/core/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin</artifactId>
-      <version>${zipkin.version}</version>
+      <version>${zipkin2.version}</version>
     </dependency>
 
     <dependency>
diff --git a/kafka/pom.xml b/kafka/pom.xml
@@ -43,7 +43,7 @@
       <groupId>org.apache.kafka</groupId>
       <artifactId>kafka-clients</artifactId>
       <!-- recent clients can talk to old 0.10 brokers -->
-      <version>3.7.0</version>
+      <version>3.9.0</version>
     </dependency>
 
     <dependency>
diff --git a/libthrift/pom.xml b/libthrift/pom.xml
@@ -47,7 +47,7 @@
            common in libthrift and lead to rev-lock. As scribe is a deprecated
            transport in Zipkin, it is ok to update this to a signature breaking
            version on minor, but increment to the next minor in the PR. -->
-      <version>0.20.0</version>
+      <version>0.21.0</version>
     </dependency>
 
     <dependency>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>${okhttp.version}</version>
+      <version>${okhttp4.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/metrics-micrometer/pom.xml b/metrics-micrometer/pom.xml
@@ -22,7 +22,7 @@
     <module.name>zipkin2.reporter.metrics.micrometer</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
-    <micrometer.version>1.12.5</micrometer.version>
+    <micrometer.version>1.14.4</micrometer.version>
   </properties>
 
   <dependencies>
diff --git a/okhttp3/pom.xml b/okhttp3/pom.xml
@@ -23,7 +23,7 @@
 
     <main.basedir>${project.basedir}/..</main.basedir>
     <!-- pre-1.8, pre-kotlin, and last version before Call.timeout. -->
-    <old-okhttp.version>3.11.0</old-okhttp.version>
+    <floor-okhttp.version>3.11.0</floor-okhttp.version>
   </properties>
 
   <dependencies>
@@ -44,13 +44,13 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>${okhttp.version}</version>
+      <version>${okhttp4.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>${okhttp.version}</version>
+      <version>${okhttp4.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -77,7 +77,7 @@
             <DynamicDependency>
               <groupId>com.squareup.okhttp3</groupId>
               <artifactId>mockwebserver</artifactId>
-              <version>${old-okhttp.version}</version>
+              <version>${floor-okhttp.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>
diff --git a/okhttp3/src/it/okhttp3_v3/pom.xml b/okhttp3/src/it/okhttp3_v3/pom.xml
@@ -52,13 +52,13 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>mockwebserver</artifactId>
-      <version>@old-okhttp.version@</version>
+      <version>@floor-okhttp.version@</version>
     </dependency>
 
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin-tests</artifactId>
-      <version>@zipkin.version@</version>
+      <version>@zipkin2.version@</version>
     </dependency>
 
     <!-- route jul over log4j2 during integration tests -->
diff --git a/pom.xml b/pom.xml
@@ -50,45 +50,46 @@
 
     <!-- override to set exclusions per-project -->
     <errorprone.args />
-    <errorprone.version>2.30.0</errorprone.version>
+    <errorprone.version>2.36.0</errorprone.version>
 
     <!-- NOTE: Do not update to 3.x as that has floor Java 8 -->
-    <zipkin.version>2.27.1</zipkin.version>
+    <zipkin2.version>2.27.1</zipkin2.version>
 
     <!-- Do not set this value in bom/pom.xml to avoid cyclic pinning -->
-    <brave.version>6.0.3</brave.version>
+    <brave.version>6.1.0</brave.version>
 
-    <log4j.version>2.24.0</log4j.version>
-    <okhttp.version>4.12.0</okhttp.version>
+    <log4j.version>2.24.3</log4j.version>
+    <okhttp4.version>4.12.0</okhttp4.version>
 
-    <junit-jupiter.version>5.11.0</junit-jupiter.version>
-    <mockito.version>5.13.0</mockito.version>
-    <assertj.version>3.25.3</assertj.version>
+    <junit-jupiter.version>5.11.4</junit-jupiter.version>
+    <mockito.version>5.15.2</mockito.version>
+    <assertj.version>3.27.3</assertj.version>
     <awaitility.version>4.2.2</awaitility.version>
-    <testcontainers.version>1.20.1</testcontainers.version>
+    <testcontainers.version>1.20.4</testcontainers.version>
 
     <license.skip>${skipTests}</license.skip>
 
     <go-offline-maven-plugin.version>1.2.8</go-offline-maven-plugin.version>
     <!-- TODO: cleanup any redundant ignores now also in the 4.0 release (once final) -->
-    <license-maven-plugin.version>4.5</license-maven-plugin.version>
-    <maven-assembly-plugin.version>3.6.0</maven-assembly-plugin.version>
+    <license-maven-plugin.version>4.6</license-maven-plugin.version>
+    <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
+    <!-- NOTE: Do not update to 6.x as 5.x is the last version to support Java 11 -->
     <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
     <!-- Use same version as https://github.com/openzipkin/docker-java -->
     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
-    <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
-    <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
+    <maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
+    <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
     <!-- Use same version as https://github.com/openzipkin/docker-java -->
     <maven-help-plugin.version>3.5.1</maven-help-plugin.version>
-    <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
-    <maven-invoker-plugin.version>3.8.0</maven-invoker-plugin.version>
-    <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
-    <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>
-    <maven-release-plugin.version>3.0.1</maven-release-plugin.version>
+    <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
+    <maven-invoker-plugin.version>3.9.0</maven-invoker-plugin.version>
+    <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+    <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
+    <maven-release-plugin.version>3.1.1</maven-release-plugin.version>
     <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
-    <maven-surefire-plugin.version>3.5.0</maven-surefire-plugin.version>
-    <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
+    <maven-surefire-plugin.version>3.5.2</maven-surefire-plugin.version>
+    <nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
   </properties>
 
   <name>Zipkin Reporter (Parent)</name>
@@ -165,7 +166,7 @@
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin-tests</artifactId>
-      <version>${zipkin.version}</version>
+      <version>${zipkin2.version}</version>
       <scope>test</scope>
     </dependency>
 
@@ -204,6 +205,13 @@
       <version>${log4j.version}</version>
       <scope>test</scope>
     </dependency>
+    <!-- route slf4j 2 over log4j2 during integration tests -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j2-impl</artifactId>
+      <version>${log4j.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -509,10 +517,10 @@
     </profile>
 
     <profile>
-      <id>error-prone-11+</id>
+      <id>error-prone-17+</id>
       <activation>
-        <!-- Only LTS versions -->
-        <jdk>[11,12),[17,18),[21,22)</jdk>
+        <!-- Only LTS versions that work with errorprone -->
+        <jdk>[17,18),[21,22)</jdk>
       </activation>
       <build>
         <plugins>
@@ -536,8 +544,9 @@
                   <forceJavacCompilerUse>true</forceJavacCompilerUse>
                   <compilerArgs>
                     <arg>-XDcompilePolicy=simple</arg>
+                    <arg>--should-stop=ifError=FLOW</arg>
                     <arg>-Xplugin:ErrorProne ${errorprone.args}</arg>
-                    <!-- below needed for JDK16+ per https://errorprone.info/docs/installation -->
+                    <!-- below needed per https://errorprone.info/docs/installation -->
                     <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
                     <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>
                     <arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED</arg>
diff --git a/spring-beans/pom.xml b/spring-beans/pom.xml
@@ -26,10 +26,10 @@
     <!-- Note: Spring 6 is JDK 17 bytecode, so we can't update to it until we
          stop supporting Java 6 compilation target, or change our release to
          use multiple tool chains. -->
-    <spring.version>5.3.34</spring.version>
+    <spring.version>5.3.39</spring.version>
 
-    <spring-floor.version>2.5.6</spring-floor.version>
-    <log4j12.version>1.2.17</log4j12.version>
+    <spring2.version>2.5.6</spring2.version>
+    <log4j1.version>1.2.17</log4j1.version>
   </properties>
 
   <dependencyManagement>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>io.zipkin.zipkin2</groupId>
       <artifactId>zipkin</artifactId>
-      <version>${zipkin.version}</version>
+      <version>${zipkin2.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -147,14 +147,14 @@
             <DynamicDependency>
               <groupId>log4j</groupId>
               <artifactId>log4j</artifactId>
-              <version>${log4j12.version}</version>
+              <version>${log4j1.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>
             <DynamicDependency>
               <groupId>org.springframework</groupId>
               <artifactId>spring-beans</artifactId>
-              <version>${spring-floor.version}</version>
+              <version>${spring2.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>
diff --git a/spring-beans/src/it/spring2/README.md b/spring-beans/src/it/spring2/README.md
@@ -1,2 +1,2 @@
-# spring_floor
+# spring2
 This tests that the zipkin2.reporter.beans package does not rely on Spring 3+ APIs.
diff --git a/spring-beans/src/it/spring2/pom.xml b/spring-beans/src/it/spring2/pom.xml
diff --git a/spring-beans/src/it/spring2/src/test/resources/log4j.properties b/spring-beans/src/it/spring2/src/test/resources/log4j.properties
diff --git a/spring-beans/src/it/spring_context/pom.xml b/spring-beans/src/it/spring_context/pom.xml
diff --git a/urlconnection/pom.xml b/urlconnection/pom.xml
