Skip to content

Commit 912adfe

Browse files
author
Adrian Cole
committed
spring revlock notes
Signed-off-by: Adrian Cole <adrian@tetrate.io>
1 parent c406a60 commit 912adfe

File tree

7 files changed

+17
-12
lines changed

7 files changed

+17
-12
lines changed

brave/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<dependency>
8484
<groupId>org.springframework</groupId>
8585
<artifactId>spring-context</artifactId>
86-
<version>${spring5.version}</version>
86+
<version>${spring.version}</version>
8787
<scope>test</scope>
8888
</dependency>
8989
<dependency>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>org.springframework</groupId>
9797
<artifactId>spring-test</artifactId>
98-
<version>${spring5.version}</version>
98+
<version>${spring.version}</version>
9999
<scope>test</scope>
100100
</dependency>
101101
</dependencies>

instrumentation/benchmarks/pom.xml

+2
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<dependency>
8989
<groupId>org.springframework</groupId>
9090
<artifactId>spring-web</artifactId>
91+
<!-- TODO: brave-instrumentation-spring-web is revlocked to spring5 -->
9192
<version>${spring5.version}</version>
9293
</dependency>
9394

@@ -127,6 +128,7 @@
127128
<dependency>
128129
<groupId>org.springframework</groupId>
129130
<artifactId>spring-webmvc</artifactId>
131+
<!-- TODO: brave-instrumentation-spring-webmvc is revlocked to spring5 -->
130132
<version>${spring5.version}</version>
131133
</dependency>
132134

instrumentation/spring-rabbit/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
<dependency>
4343
<groupId>org.springframework</groupId>
4444
<artifactId>spring-aop</artifactId>
45-
<version>${spring5.version}</version>
45+
<version>${spring.version}</version>
4646
<scope>provided</scope>
4747
</dependency>
4848

4949
<!-- Spring 5 has GenericApplicationContext.registerBean which makes tests easier -->
5050
<dependency>
5151
<groupId>org.springframework</groupId>
5252
<artifactId>spring-context</artifactId>
53-
<version>${spring5.version}</version>
53+
<version>${spring.version}</version>
5454
<scope>provided</scope>
5555
</dependency>
5656

@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.springframework</groupId>
7272
<artifactId>spring-core</artifactId>
73-
<version>${spring5.version}</version>
73+
<version>${spring.version}</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>

instrumentation/spring-web/pom.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<dependency>
4242
<groupId>org.springframework</groupId>
4343
<artifactId>spring-web</artifactId>
44+
<!-- TODO: revlocked at spring 5. We may need a new module for v6 -->
4445
<version>${spring5.version}</version>
4546
<scope>provided</scope>
4647
</dependency>
@@ -109,7 +110,7 @@
109110
<DynamicDependency>
110111
<groupId>org.springframework</groupId>
111112
<artifactId>spring-web</artifactId>
112-
<version>${spring.version}</version>
113+
<version>${spring3.version}</version>
113114
<repositoryType>MAIN</repositoryType>
114115
<type>jar</type>
115116
</DynamicDependency>

instrumentation/spring-webmvc/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<dependency>
4343
<groupId>org.springframework</groupId>
4444
<artifactId>spring-webmvc</artifactId>
45+
<!-- TODO: revlocked at spring 5. We may need a new module for v6 -->
4546
<version>${spring5.version}</version>
4647
<scope>provided</scope>
4748
</dependency>

pom.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,11 @@
8787
<!-- to test @Inject annotations. Note 7.x is for jakarta annotations! -->
8888
<guice.version>6.0.0</guice.version>
8989

90+
<spring.version>6.1.4</spring.version>
9091
<!-- Ensure older versions of spring still work -->
91-
<spring5.version>5.3.31</spring5.version>
92-
<spring.version>3.2.18.RELEASE</spring.version>
92+
<spring25.version>2.5.6</spring25.version>
93+
<spring3.version>3.2.18.RELEASE</spring3.version>
94+
<spring5.version>5.3.32</spring5.version>
9395

9496
<!-- Apis used, but not in Jetty 7.6* imply duplication in servlet25 test fixtures -->
9597
<jetty.version>9.4.53.v20231009</jetty.version>
@@ -103,7 +105,8 @@
103105
<kafka.version>3.6.1</kafka.version>
104106
<activemq.version>5.18.3</activemq.version>
105107
<activemq.artemis.version>2.31.2</activemq.artemis.version>
106-
<!-- TODO: reflection drift after this version -->
108+
<!-- TODO: reflection drift after this version. Make changes as necessary
109+
and add an invoker test that 2.3.6 still works. -->
107110
<spring-rabbit.version>2.3.6</spring-rabbit.version>
108111

109112
<!-- TODO: update and fix drift or remove the FinagleContextInteropTest -->

spring-beans/pom.xml

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@
3131
<module.name>brave.spring.beans</module.name>
3232

3333
<main.basedir>${project.basedir}/..</main.basedir>
34-
35-
<spring25.version>2.5.6</spring25.version>
3634
</properties>
3735

3836
<dependencies>
@@ -60,7 +58,7 @@
6058
<dependency>
6159
<groupId>org.springframework</groupId>
6260
<artifactId>spring-beans</artifactId>
63-
<version>${spring.version}</version>
61+
<version>${spring3.version}</version>
6462
<scope>provided</scope>
6563
</dependency>
6664
<dependency>

0 commit comments

Comments
 (0)