spring revlock notes

Signed-off-by: Adrian Cole <adrian@tetrate.io>
openzipkin · Feb 27, 2024 · 912adfe · 912adfe
1 parent c406a60
commit 912adfe
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 12 deletions.
diff --git a/brave/pom.xml b/brave/pom.xml
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring5.version}</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -95,7 +95,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
-      <version>${spring5.version}</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/instrumentation/benchmarks/pom.xml b/instrumentation/benchmarks/pom.xml
@@ -88,6 +88,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
+      <!-- TODO: brave-instrumentation-spring-web is revlocked to spring5 -->
       <version>${spring5.version}</version>
     </dependency>
 
@@ -127,6 +128,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
+      <!-- TODO: brave-instrumentation-spring-webmvc is revlocked to spring5 -->
       <version>${spring5.version}</version>
     </dependency>
 

diff --git a/instrumentation/spring-rabbit/pom.xml b/instrumentation/spring-rabbit/pom.xml
@@ -42,15 +42,15 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-aop</artifactId>
-      <version>${spring5.version}</version>
+      <version>${spring.version}</version>
       <scope>provided</scope>
     </dependency>
 
     <!-- Spring 5 has GenericApplicationContext.registerBean which makes tests easier -->
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>${spring5.version}</version>
+      <version>${spring.version}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
-      <version>${spring5.version}</version>
+      <version>${spring.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/instrumentation/spring-web/pom.xml b/instrumentation/spring-web/pom.xml
@@ -41,6 +41,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
+      <!-- TODO: revlocked at spring 5. We may need a new module for v6 -->
       <version>${spring5.version}</version>
       <scope>provided</scope>
     </dependency>
@@ -109,7 +110,7 @@
             <DynamicDependency>
               <groupId>org.springframework</groupId>
               <artifactId>spring-web</artifactId>
-              <version>${spring.version}</version>
+              <version>${spring3.version}</version>
               <repositoryType>MAIN</repositoryType>
               <type>jar</type>
             </DynamicDependency>

diff --git a/instrumentation/spring-webmvc/pom.xml b/instrumentation/spring-webmvc/pom.xml
@@ -42,6 +42,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
+      <!-- TODO: revlocked at spring 5. We may need a new module for v6 -->
       <version>${spring5.version}</version>
       <scope>provided</scope>
     </dependency>

diff --git a/pom.xml b/pom.xml
@@ -87,9 +87,11 @@
     <!-- to test @Inject annotations. Note 7.x is for jakarta annotations! -->
     <guice.version>6.0.0</guice.version>
 
+    <spring.version>6.1.4</spring.version>
     <!-- Ensure older versions of spring still work -->
-    <spring5.version>5.3.31</spring5.version>
-    <spring.version>3.2.18.RELEASE</spring.version>
+    <spring25.version>2.5.6</spring25.version>
+    <spring3.version>3.2.18.RELEASE</spring3.version>
+    <spring5.version>5.3.32</spring5.version>
 
     <!-- Apis used, but not in Jetty 7.6* imply duplication in servlet25 test fixtures -->
     <jetty.version>9.4.53.v20231009</jetty.version>
@@ -103,7 +105,8 @@
     <kafka.version>3.6.1</kafka.version>
     <activemq.version>5.18.3</activemq.version>
     <activemq.artemis.version>2.31.2</activemq.artemis.version>
-    <!-- TODO: reflection drift after this version -->
+    <!-- TODO: reflection drift after this version. Make changes as necessary
+         and add an invoker test that 2.3.6 still works. -->
     <spring-rabbit.version>2.3.6</spring-rabbit.version>
 
     <!-- TODO: update and fix drift or remove the FinagleContextInteropTest -->

diff --git a/spring-beans/pom.xml b/spring-beans/pom.xml
@@ -31,8 +31,6 @@
     <module.name>brave.spring.beans</module.name>
 
     <main.basedir>${project.basedir}/..</main.basedir>
-
-    <spring25.version>2.5.6</spring25.version>
   </properties>
 
   <dependencies>
@@ -60,7 +58,7 @@
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-beans</artifactId>
-      <version>${spring.version}</version>
+      <version>${spring3.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>