Skip to content

Commit b256135

Browse files
lucacomelucacome
committed
fix
1 parent 6b04f22 commit b256135

9 files changed

Lines changed: 17 additions & 107 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,15 +146,17 @@ jobs:
146146
echo "Tag version: $TAG_VERSION"
147147
echo "POM version: $POM_VERSION"
148148
if [[ "$POM_VERSION" != "$TAG_VERSION" ]]; then
149+
echo "::error::Tag $TAG_VERSION does not match pom $POM_VERSION"
149150
echo "::warning::Tag $TAG_VERSION does not match pom $POM_VERSION (expected if release:prepare not used with v prefix))"
151+
exit 1
150152
fi
151153
152154
- name: Publish release
153155
env:
154156
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
155157
CENTRAL_TOKEN: ${{ secrets.CENTRAL_TOKEN }}
156158
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
157-
run: ./mvnw --batch-mode -s ./.settings.xml -Prelease -DskipTests deploy
159+
run: ./mvnw --batch-mode -Prelease -DskipTests deploy
158160

159161
snapshot:
160162
name: Publish snapshot
@@ -184,4 +186,4 @@ jobs:
184186
env:
185187
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
186188
CENTRAL_TOKEN: ${{ secrets.CENTRAL_TOKEN }}
187-
run: ./mvnw --batch-mode -s ./.settings.xml -DskipTests deploy
189+
run: ./mvnw --batch-mode -DskipTests deploy

‎instrument-starters/opentracing-spring-cloud-core/src/test/java/io/opentracing/contrib/spring/cloud/aop/BaseTracingAspectTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
*/
1616
package io.opentracing.contrib.spring.cloud.aop;
1717

18-
import static org.mockito.ArgumentMatchers.any;
19-
import static org.mockito.ArgumentMatchers.same;
18+
import static org.mockito.Matchers.any;
19+
import static org.mockito.Matchers.same;
2020
import static org.mockito.Mockito.never;
2121
import static org.mockito.Mockito.verify;
2222
import static org.mockito.Mockito.when;
@@ -36,7 +36,7 @@
3636
import org.junit.Before;
3737
import org.junit.Test;
3838
import org.junit.runner.RunWith;
39-
import org.mockito.ArgumentMatchers;
39+
import org.mockito.Matchers;
4040
import org.mockito.Mock;
4141
import org.mockito.junit.MockitoJUnitRunner;
4242
import org.springframework.stereotype.Component;
@@ -75,15 +75,15 @@ public void givenDecorators_whenMethodIsIntercepted_thenPreProceedShouldBeCalled
7575
throws Throwable {
7676
aspect.trace(pjp);
7777

78-
verify(decorator).onPreProceed(same(pjp), ArgumentMatchers.<Span>any());
78+
verify(decorator).onPreProceed(same(pjp), Matchers.<Span>any());
7979
}
8080

8181
@Test
8282
public void givenDecorators_whenMethodIsIntercepted_thenPostProceedShouldBeCalled()
8383
throws Throwable {
8484
Object result = aspect.trace(pjp);
8585

86-
verify(decorator).onPostProceed(same(pjp), same(result), ArgumentMatchers.<Span>any());
86+
verify(decorator).onPostProceed(same(pjp), same(result), Matchers.<Span>any());
8787
}
8888

8989
@Test
@@ -121,7 +121,7 @@ public void call() throws Throwable {
121121
}
122122
}).isSameAs(e);
123123

124-
verify(decorator).onError(same(pjp), same(e), ArgumentMatchers.<Span>any());
124+
verify(decorator).onError(same(pjp), same(e), Matchers.<Span>any());
125125
}
126126

127127
public static class TestTracingAspect extends BaseTracingAspect {

‎instrument-starters/opentracing-spring-cloud-feign-starter/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@
108108
<exclude>**/FeignOkhttpClientTest.java</exclude>
109109
<exclude>**/FeignWithSpanDecoratorsTest.java</exclude>
110110
<exclude>**/FeignHystrixTest.java</exclude>
111-
<!-- Boot 2.7 / Cloud 2021.0: Manual Feign tests need Client bean, incompat after Ribbon removal -->
112-
<exclude>**/FeignManualTest.java</exclude>
113-
<exclude>**/FeignManualWithSpanDecoratorsTest.java</exclude>
114111
</excludes>
115112
</configuration>
116113
</plugin>

‎instrument-starters/opentracing-spring-cloud-redis-starter/pom.xml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,4 @@
8787
<scope>test</scope>
8888
</dependency>
8989
</dependencies>
90-
91-
<build>
92-
<plugins>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-surefire-plugin</artifactId>
96-
<version>${version.maven-surefire-plugin}</version>
97-
<configuration>
98-
<excludes>
99-
<!-- Lettuce vs Jedis incompat with Boot 2.7 + redismock 0.1.6; exclude for CVE fix -->
100-
<exclude>**/IntegrationTest.java</exclude>
101-
</excludes>
102-
</configuration>
103-
</plugin>
104-
</plugins>
105-
</build>
10690
</project>

‎instrument-starters/opentracing-spring-cloud-redis-starter/src/test/java/io/opentracing/contrib/spring/cloud/redis/IntegrationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.springframework.context.annotation.Configuration;
3838
import org.springframework.data.redis.connection.RedisConnectionFactory;
3939
import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
40-
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
40+
import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
4141
import org.springframework.data.redis.core.RedisTemplate;
4242
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
4343

@@ -61,7 +61,7 @@ public static class IntegrationTestConfiguration {
6161
RedisStandaloneConfiguration config = new RedisStandaloneConfiguration();
6262
config.setHostName(redis.getHost());
6363
config.setPort(redis.getBindPort());
64-
return new LettuceConnectionFactory(config);
64+
return new JedisConnectionFactory(config);
6565
}
6666

6767
}

‎instrument-starters/opentracing-spring-cloud-websocket-starter/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,4 @@
5454
<scope>test</scope>
5555
</dependency>
5656
</dependencies>
57-
58-
<build>
59-
<plugins>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-surefire-plugin</artifactId>
63-
<version>${version.maven-surefire-plugin}</version>
64-
<configuration>
65-
<excludes>
66-
<exclude>**/SpringWebsocketTracingTest.java</exclude>
67-
</excludes>
68-
</configuration>
69-
</plugin>
70-
</plugins>
71-
</build>
7257
</project>

‎instrument-starters/opentracing-spring-cloud-websocket-starter/src/main/java/io/opentracing/contrib/spring/cloud/websocket/WebsocketAutoConfiguration.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public TracingChannelInterceptor tracingInboundChannelInterceptor(
4444
WebSocketMessageBrokerConfigurationSupport config) {
4545
TracingChannelInterceptor interceptor = new TracingChannelInterceptor(tracer,
4646
Tags.SPAN_KIND_SERVER);
47-
config.clientInboundChannel(config.clientInboundChannelExecutor()).addInterceptor(interceptor);
47+
config.clientInboundChannel().addInterceptor(interceptor);
4848
return interceptor;
4949
}
5050

@@ -54,7 +54,7 @@ public TracingChannelInterceptor tracingOutboundChannelInterceptor(
5454
WebSocketMessageBrokerConfigurationSupport config) {
5555
TracingChannelInterceptor interceptor = new TracingChannelInterceptor(tracer,
5656
Tags.SPAN_KIND_CLIENT);
57-
config.clientOutboundChannel(config.clientOutboundChannelExecutor()).addInterceptor(interceptor);
57+
config.clientOutboundChannel().addInterceptor(interceptor);
5858
return interceptor;
5959
}
6060
}

‎instrument-starters/opentracing-spring-cloud-zuul-starter/pom.xml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,4 @@
5555
<scope>test</scope>
5656
</dependency>
5757
</dependencies>
58-
59-
<build>
60-
<plugins>
61-
<plugin>
62-
<groupId>org.apache.maven.plugins</groupId>
63-
<artifactId>maven-surefire-plugin</artifactId>
64-
<version>${version.maven-surefire-plugin}</version>
65-
<configuration>
66-
<excludes>
67-
<exclude>**/ZuulTracingTest.java</exclude>
68-
</excludes>
69-
</configuration>
70-
</plugin>
71-
</plugins>
72-
</build>
7358
</project>

‎pom.xml‎

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,13 @@
8888
<version.io.opentracing.contrib-opentracing-reactor>0.2.0</version.io.opentracing.contrib-opentracing-reactor>
8989
<version.io.opentracing.contrib-opentracing-rxjava-1>0.1.4</version.io.opentracing.contrib-opentracing-rxjava-1>
9090
<version.io.opentracing.contrib-opentracing-spring-mongo>0.1.5</version.io.opentracing.contrib-opentracing-spring-mongo>
91-
<version.io.github.openfeign-feign-okhttp>11.10</version.io.github.openfeign-feign-okhttp>
91+
<version.io.github.openfeign-feign-okhttp>10.2.0</version.io.github.openfeign-feign-okhttp>
9292
<version.io.github.openfeign.opentracing>0.4.0</version.io.github.openfeign.opentracing>
9393
<version.io.opentracing.contrib-opentracing-kafka-spring>0.1.15</version.io.opentracing.contrib-opentracing-kafka-spring>
9494
<!-- spring-boot-starter-parent is a module of spring-boot-dependencies
9595
https://github.com/spring-projects/spring-boot/blob/master/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
96-
<version.org.springframework.boot>2.7.18</version.org.springframework.boot>
97-
<version.org.springframework.cloud-spring-cloud-dependencies>2021.0.9</version.org.springframework.cloud-spring-cloud-dependencies>
98-
<!-- Pinned Netflix versions for starters removed in 2021.0 (last Hoxton) -->
99-
<version.org.springframework.cloud-starter-netflix>2.2.10.RELEASE</version.org.springframework.cloud-starter-netflix>
96+
<version.org.springframework.boot>2.3.12.RELEASE</version.org.springframework.boot>
97+
<version.org.springframework.cloud-spring-cloud-dependencies>Hoxton.SR12</version.org.springframework.cloud-spring-cloud-dependencies>
10098
<version.org.awaitility-awaitility>4.3.0</version.org.awaitility-awaitility>
10199
<version.de.flapdoodle-embed.mongo>2.2.0</version.de.flapdoodle-embed.mongo>
102100
<version.cz.jirutka.spring-embedmongo-spring>1.3.1</version.cz.jirutka.spring-embedmongo-spring>
@@ -297,47 +295,6 @@
297295
<type>pom</type>
298296
<scope>import</scope>
299297
</dependency>
300-
<!-- Pinned for 2021.0 compatibility: starters removed in 2021.0 but still used -->
301-
<dependency>
302-
<groupId>org.springframework.cloud</groupId>
303-
<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
304-
<version>${version.org.springframework.cloud-starter-netflix}</version>
305-
</dependency>
306-
<dependency>
307-
<groupId>org.springframework.cloud</groupId>
308-
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
309-
<version>${version.org.springframework.cloud-starter-netflix}</version>
310-
</dependency>
311-
<dependency>
312-
<groupId>org.springframework.cloud</groupId>
313-
<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
314-
<version>${version.org.springframework.cloud-starter-netflix}</version>
315-
</dependency>
316-
<dependency>
317-
<groupId>org.springframework.cloud</groupId>
318-
<artifactId>spring-cloud-netflix-hystrix</artifactId>
319-
<version>${version.org.springframework.cloud-starter-netflix}</version>
320-
</dependency>
321-
<dependency>
322-
<groupId>org.springframework.cloud</groupId>
323-
<artifactId>spring-cloud-netflix-ribbon</artifactId>
324-
<version>${version.org.springframework.cloud-starter-netflix}</version>
325-
</dependency>
326-
<dependency>
327-
<groupId>org.springframework.cloud</groupId>
328-
<artifactId>spring-cloud-netflix-zuul</artifactId>
329-
<version>${version.org.springframework.cloud-starter-netflix}</version>
330-
</dependency>
331-
<dependency>
332-
<groupId>org.springframework.cloud</groupId>
333-
<artifactId>spring-cloud-gateway-core</artifactId>
334-
<version>2.2.10.RELEASE</version>
335-
</dependency>
336-
<dependency>
337-
<groupId>org.springframework.cloud</groupId>
338-
<artifactId>spring-cloud-gateway-server</artifactId>
339-
<version>3.1.9</version>
340-
</dependency>
341298
<dependency>
342299
<groupId>org.assertj</groupId>
343300
<artifactId>assertj-core</artifactId>

0 commit comments

Comments
 (0)