Skip to content

Commit 2107748

Browse files
author
Gytis Trikleris
authored
Upgrade Spring Boot to 2.0.3 and Spring Cloud to Finchley.SR2 (#21)
1 parent 8b10a26 commit 2107748

File tree

8 files changed

+22
-94
lines changed

8 files changed

+22
-94
lines changed

‎opentracing-spring-messaging-it/opentracing-spring-messaging-it-stream-artemis/pom.xml

Lines changed: 6 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -28,103 +28,33 @@
2828
<properties>
2929
<main.basedir>${project.basedir}/../..</main.basedir>
3030

31-
<version.io.opentracing.contrib.opentracing-spring-cloud-starter>0.1.0</version.io.opentracing.contrib.opentracing-spring-cloud-starter>
32-
<version.me.snowdrop.spring-cloud-starter-stream-artemis>1.0.0.Alpha1</version.me.snowdrop.spring-cloud-starter-stream-artemis>
33-
<version.org.apache.activemq>2.1.0</version.org.apache.activemq>
31+
<version.io.opentracing.contrib.opentracing-spring-cloud-jms-starter>0.2.1</version.io.opentracing.contrib.opentracing-spring-cloud-jms-starter>
32+
<version.me.snowdrop.spring-cloud-starter-stream-artemis>0.1.0</version.me.snowdrop.spring-cloud-starter-stream-artemis>
3433
</properties>
3534

36-
<dependencyManagement>
37-
<dependencies>
38-
<dependency>
39-
<groupId>io.opentracing.contrib</groupId>
40-
<artifactId>opentracing-spring-messaging-it-stream-common</artifactId>
41-
<version>${project.version}</version>
42-
</dependency>
43-
<dependency>
44-
<groupId>io.opentracing.contrib</groupId>
45-
<artifactId>opentracing-spring-cloud-starter</artifactId>
46-
<version>${version.io.opentracing.contrib.opentracing-spring-cloud-starter}</version>
47-
</dependency>
48-
<dependency>
49-
<groupId>me.snowdrop</groupId>
50-
<artifactId>spring-cloud-starter-stream-artemis</artifactId>
51-
<version>${version.me.snowdrop.spring-cloud-starter-stream-artemis}</version>
52-
</dependency>
53-
<!-- Override Artemis versions as the stream binder currently only works with 2.x -->
54-
<dependency>
55-
<groupId>org.apache.activemq</groupId>
56-
<artifactId>artemis-commons</artifactId>
57-
<version>${version.org.apache.activemq}</version>
58-
</dependency>
59-
<dependency>
60-
<groupId>org.apache.activemq</groupId>
61-
<artifactId>artemis-core-client</artifactId>
62-
<version>${version.org.apache.activemq}</version>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.apache.activemq</groupId>
66-
<artifactId>artemis-jms-client</artifactId>
67-
<version>${version.org.apache.activemq}</version>
68-
</dependency>
69-
<dependency>
70-
<groupId>org.apache.activemq</groupId>
71-
<artifactId>artemis-jms-server</artifactId>
72-
<version>${version.org.apache.activemq}</version>
73-
</dependency>
74-
<dependency>
75-
<groupId>org.apache.activemq</groupId>
76-
<artifactId>artemis-journal</artifactId>
77-
<version>${version.org.apache.activemq}</version>
78-
</dependency>
79-
<dependency>
80-
<groupId>org.apache.activemq</groupId>
81-
<artifactId>artemis-native</artifactId>
82-
<version>${version.org.apache.activemq}</version>
83-
</dependency>
84-
<dependency>
85-
<groupId>org.apache.activemq</groupId>
86-
<artifactId>artemis-selector</artifactId>
87-
<version>${version.org.apache.activemq}</version>
88-
</dependency>
89-
<dependency>
90-
<groupId>org.apache.activemq</groupId>
91-
<artifactId>artemis-server</artifactId>
92-
<version>${version.org.apache.activemq}</version>
93-
</dependency>
94-
<dependency>
95-
<groupId>org.apache.activemq</groupId>
96-
<artifactId>artemis-service-extensions</artifactId>
97-
<version>${version.org.apache.activemq}</version>
98-
</dependency>
99-
</dependencies>
100-
</dependencyManagement>
101-
10235
<dependencies>
10336
<dependency>
10437
<groupId>io.opentracing.contrib</groupId>
10538
<artifactId>opentracing-spring-messaging-it-stream-common</artifactId>
39+
<version>${project.version}</version>
10640
<scope>test</scope>
10741
</dependency>
10842
<dependency>
10943
<groupId>io.opentracing.contrib</groupId>
110-
<artifactId>opentracing-spring-cloud-starter</artifactId>
111-
<scope>test</scope>
44+
<artifactId>opentracing-spring-cloud-jms-starter</artifactId>
45+
<version>${version.io.opentracing.contrib.opentracing-spring-cloud-jms-starter}</version>
11246
</dependency>
11347
<dependency>
11448
<groupId>me.snowdrop</groupId>
11549
<artifactId>spring-cloud-starter-stream-artemis</artifactId>
50+
<version>${version.me.snowdrop.spring-cloud-starter-stream-artemis}</version>
11651
<scope>test</scope>
11752
</dependency>
11853
<dependency>
11954
<groupId>org.apache.activemq</groupId>
12055
<artifactId>artemis-jms-server</artifactId>
12156
<scope>test</scope>
12257
</dependency>
123-
<dependency>
124-
<groupId>org.springframework.boot</groupId>
125-
<artifactId>spring-boot-starter-websocket</artifactId>
126-
<scope>test</scope>
127-
</dependency>
12858
<dependency>
12959
<groupId>org.awaitility</groupId>
13060
<artifactId>awaitility</artifactId>

‎opentracing-spring-messaging-it/opentracing-spring-messaging-it-stream-artemis/src/test/java/io/opentracing/contrib/spring/integration/messaging/ArtemisBinderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void testFlowFromSourceToSink() {
8383
}
8484

8585
@Test
86-
public void testFromFromJmsTemplateToSink() {
86+
public void testFlowFromJmsTemplateToSink() {
8787
jmsTemplate.setPubSubDomain(true);
8888
jmsTemplate.convertAndSend("testDestination", "Ping");
8989

‎opentracing-spring-messaging-it/opentracing-spring-messaging-it-stream-artemis/src/test/resources/application.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
spring:
22
cloud:
33
stream:
4-
artemis:
5-
binder:
6-
transport: org.apache.activemq.artemis.core.remoting.impl.invm.InVMConnectorFactory
74
bindings:
85
input:
96
destination: testDestination

‎opentracing-spring-messaging-it/opentracing-spring-messaging-it-stream-common/src/main/java/io/opentracing/contrib/spring/integration/messaging/Receiver.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2017 The OpenTracing Authors
2+
* Copyright 2017-2018 The OpenTracing Authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
* in compliance with the License. You may obtain a copy of the License at
@@ -19,22 +19,21 @@
1919
import org.springframework.cloud.stream.annotation.EnableBinding;
2020
import org.springframework.cloud.stream.annotation.StreamListener;
2121
import org.springframework.cloud.stream.messaging.Sink;
22-
import org.springframework.messaging.Message;
2322

2423
/**
2524
* @author <a href="mailto:gytis@redhat.com">Gytis Trikleris</a>
2625
*/
2726
@EnableBinding(Sink.class)
2827
public class Receiver {
2928

30-
private final List<Message> receivedMessages = new ArrayList<>();
29+
private final List<String> receivedMessages = new ArrayList<>();
3130

3231
@StreamListener(Sink.INPUT)
33-
public void receive(Message message) {
32+
public void receive(String message) {
3433
receivedMessages.add(message);
3534
}
3635

37-
public List<Message> getReceivedMessages() {
36+
public List<String> getReceivedMessages() {
3837
return receivedMessages;
3938
}
4039

‎opentracing-spring-messaging-it/opentracing-spring-messaging-it-stream-common/src/main/java/io/opentracing/contrib/spring/integration/messaging/Sender.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2017 The OpenTracing Authors
2+
* Copyright 2017-2018 The OpenTracing Authors
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
55
* in compliance with the License. You may obtain a copy of the License at
@@ -33,7 +33,7 @@ public Sender(Source source) {
3333
this.source = source;
3434
}
3535

36-
public void send(Object payload) {
36+
public void send(String payload) {
3737
Message message = MessageBuilder.withPayload(payload)
3838
.build();
3939
source.output()

‎opentracing-spring-messaging-it/opentracing-spring-messaging-it-stream-kafka/src/test/java/io/opentracing/contrib/spring/integration/messaging/KafkaBinderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ public void testFlowFromSourceToSink() {
7373
assertThat(outputSpan.tags()).containsEntry(Tags.COMPONENT.getKey(), OpenTracingChannelInterceptor.COMPONENT_NAME);
7474
assertThat(outputSpan.tags()).containsEntry(Tags.MESSAGE_BUS_DESTINATION.getKey(), "output");
7575

76-
MockSpan inputSpan = getSpanByOperation("send:input");
77-
assertThat(inputSpan.parentId()).isEqualTo(0);
76+
MockSpan inputSpan = getSpanByOperation("receive:input");
77+
assertThat(inputSpan.parentId()).isEqualTo(outputSpan.context().spanId());
7878
assertThat(inputSpan.tags()).hasSize(3);
79-
assertThat(inputSpan.tags()).containsEntry(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_PRODUCER);
79+
assertThat(inputSpan.tags()).containsEntry(Tags.SPAN_KIND.getKey(), Tags.SPAN_KIND_CONSUMER);
8080
assertThat(inputSpan.tags()).containsEntry(Tags.COMPONENT.getKey(), OpenTracingChannelInterceptor.COMPONENT_NAME);
8181
assertThat(inputSpan.tags()).containsEntry(Tags.MESSAGE_BUS_DESTINATION.getKey(), "input");
8282

‎opentracing-spring-messaging/src/test/java/io/opentracing/contrib/spring/integration/messaging/MessageTextMapTest.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.AbstractMap;
2020
import java.util.HashMap;
2121
import java.util.Map;
22+
import java.util.UUID;
2223
import org.junit.Assert;
2324
import org.junit.Test;
2425
import org.springframework.integration.support.MutableMessageHeaders;
@@ -69,15 +70,16 @@ public void shouldGetMessageWithNewHeaders() {
6970
@Test
7071
public void shouldPreserveTimestampAndId() {
7172
MutableMessageHeaders headers = new MutableMessageHeaders(new HashMap<>());
72-
headers.put("id", "1");
73+
String id = UUID.randomUUID().toString();
74+
headers.put("id", id);
7375
headers.put("timestamp", "123456789");
7476
Message<String> message = MessageBuilder.createMessage("test", headers);
7577

7678
MessageTextMap<String> map = new MessageTextMap<>(message);
7779
Message<String> copiedMessage = map.getMessage();
7880

7981
assertThat(copiedMessage.getHeaders()).contains(new AbstractMap.SimpleEntry<>("timestamp", "123456789"));
80-
assertThat(copiedMessage.getHeaders()).contains(new AbstractMap.SimpleEntry<>("id", "1"));
82+
assertThat(copiedMessage.getHeaders()).contains(new AbstractMap.SimpleEntry<>("id", id));
8183
}
8284

8385
@Test

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959

6060
<version.io.opentracing>0.31.0</version.io.opentracing>
6161
<version.org.awaitility>3.0.0</version.org.awaitility>
62-
<version.org.springframework.boot>1.5.8.RELEASE</version.org.springframework.boot>
63-
<version.org.springframework.cloud>Dalston.SR4</version.org.springframework.cloud>
62+
<version.org.springframework.boot>2.0.3.RELEASE</version.org.springframework.boot>
63+
<version.org.springframework.cloud>Finchley.SR2</version.org.springframework.cloud>
6464

6565
<!-- plugins -->
6666
<version.maven-deploy-plugin>2.8.2</version.maven-deploy-plugin>

0 commit comments

Comments
 (0)