Commit 912adfe Adrian Cole
committed
1 parent c406a60 commit 912adfe Copy full SHA for 912adfe
File tree 7 files changed +17
-12
lines changed
7 files changed +17
-12
lines changed Original file line number Diff line number Diff line change 83
83
<dependency >
84
84
<groupId >org.springframework</groupId >
85
85
<artifactId >spring-context</artifactId >
86
- <version >${spring5 .version} </version >
86
+ <version >${spring .version} </version >
87
87
<scope >test</scope >
88
88
</dependency >
89
89
<dependency >
95
95
<dependency >
96
96
<groupId >org.springframework</groupId >
97
97
<artifactId >spring-test</artifactId >
98
- <version >${spring5 .version} </version >
98
+ <version >${spring .version} </version >
99
99
<scope >test</scope >
100
100
</dependency >
101
101
</dependencies >
Original file line number Diff line number Diff line change 88
88
<dependency >
89
89
<groupId >org.springframework</groupId >
90
90
<artifactId >spring-web</artifactId >
91
+ <!-- TODO: brave-instrumentation-spring-web is revlocked to spring5 -->
91
92
<version >${spring5.version} </version >
92
93
</dependency >
93
94
127
128
<dependency >
128
129
<groupId >org.springframework</groupId >
129
130
<artifactId >spring-webmvc</artifactId >
131
+ <!-- TODO: brave-instrumentation-spring-webmvc is revlocked to spring5 -->
130
132
<version >${spring5.version} </version >
131
133
</dependency >
132
134
Original file line number Diff line number Diff line change 42
42
<dependency >
43
43
<groupId >org.springframework</groupId >
44
44
<artifactId >spring-aop</artifactId >
45
- <version >${spring5 .version} </version >
45
+ <version >${spring .version} </version >
46
46
<scope >provided</scope >
47
47
</dependency >
48
48
49
49
<!-- Spring 5 has GenericApplicationContext.registerBean which makes tests easier -->
50
50
<dependency >
51
51
<groupId >org.springframework</groupId >
52
52
<artifactId >spring-context</artifactId >
53
- <version >${spring5 .version} </version >
53
+ <version >${spring .version} </version >
54
54
<scope >provided</scope >
55
55
</dependency >
56
56
70
70
<dependency >
71
71
<groupId >org.springframework</groupId >
72
72
<artifactId >spring-core</artifactId >
73
- <version >${spring5 .version} </version >
73
+ <version >${spring .version} </version >
74
74
<scope >test</scope >
75
75
</dependency >
76
76
<dependency >
Original file line number Diff line number Diff line change 41
41
<dependency >
42
42
<groupId >org.springframework</groupId >
43
43
<artifactId >spring-web</artifactId >
44
+ <!-- TODO: revlocked at spring 5. We may need a new module for v6 -->
44
45
<version >${spring5.version} </version >
45
46
<scope >provided</scope >
46
47
</dependency >
109
110
<DynamicDependency >
110
111
<groupId >org.springframework</groupId >
111
112
<artifactId >spring-web</artifactId >
112
- <version >${spring .version} </version >
113
+ <version >${spring3 .version} </version >
113
114
<repositoryType >MAIN</repositoryType >
114
115
<type >jar</type >
115
116
</DynamicDependency >
Original file line number Diff line number Diff line change 42
42
<dependency >
43
43
<groupId >org.springframework</groupId >
44
44
<artifactId >spring-webmvc</artifactId >
45
+ <!-- TODO: revlocked at spring 5. We may need a new module for v6 -->
45
46
<version >${spring5.version} </version >
46
47
<scope >provided</scope >
47
48
</dependency >
Original file line number Diff line number Diff line change 87
87
<!-- to test @Inject annotations. Note 7.x is for jakarta annotations! -->
88
88
<guice .version>6.0.0</guice .version>
89
89
90
+ <spring .version>6.1.4</spring .version>
90
91
<!-- 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>
93
95
94
96
<!-- Apis used, but not in Jetty 7.6* imply duplication in servlet25 test fixtures -->
95
97
<jetty .version>9.4.53.v20231009</jetty .version>
103
105
<kafka .version>3.6.1</kafka .version>
104
106
<activemq .version>5.18.3</activemq .version>
105
107
<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. -->
107
110
<spring-rabbit .version>2.3.6</spring-rabbit .version>
108
111
109
112
<!-- TODO: update and fix drift or remove the FinagleContextInteropTest -->
Original file line number Diff line number Diff line change 31
31
<module .name>brave.spring.beans</module .name>
32
32
33
33
<main .basedir>${project.basedir} /..</main .basedir>
34
-
35
- <spring25 .version>2.5.6</spring25 .version>
36
34
</properties >
37
35
38
36
<dependencies >
60
58
<dependency >
61
59
<groupId >org.springframework</groupId >
62
60
<artifactId >spring-beans</artifactId >
63
- <version >${spring .version} </version >
61
+ <version >${spring3 .version} </version >
64
62
<scope >provided</scope >
65
63
</dependency >
66
64
<dependency >
You can’t perform that action at this time.
0 commit comments