Skip to content

Commit bdf1c4e

Browse files
authored
Update jms underpinnig library (Azure#19445)
* modify premium autoconfiguration * jms autoconfiguration with azure-servicebus-jms * update readme and changelog * modify jms IT by using two configuration files * add property of enabled
1 parent a8f124d commit bdf1c4e

File tree

26 files changed

+382
-31
lines changed

26 files changed

+382
-31
lines changed

eng/versioning/external_dependencies.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ com.microsoft.azure:azure-cosmos;3.7.3
3030
com.microsoft.azure:azure-keyvault-cryptography;1.2.2
3131
com.microsoft.azure:azure-media;0.9.8
3232
com.microsoft.azure:azure-servicebus;3.4.0
33+
com.microsoft.azure:azure-servicebus-jms;0.0.7
3334
com.microsoft.azure:qpid-proton-j-extensions;1.2.3
3435
com.microsoft.rest:client-runtime;1.7.4
3536
com.microsoft.rest.v2:client-runtime;2.1.1

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ We need to ensure that this [environment checklist][ready-to-run-checklist] is c
2727
# The idle timeout in milliseconds after which the connection will be failed if the peer sends no AMQP frames
2828
# Default is 1800000
2929
spring.jms.servicebus.idle-timeout=[idle-timeout]
30+
31+
#Fill service bus pricing tier according to the one you created. Supported values are premium, standard and basic.
32+
spring.jms.servicebus.pricing-tier=[pricing-tier]
3033
```
3134

3235
2. Specify your queue name. Update `QUEUE_NAME` in [QueueSendController] and [QueueReceiveController] .
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
spring.jms.servicebus.connection-string=[servicebus-namespace-connection-string]
22

33
spring.jms.servicebus.idle-timeout=[idle-timeout]
4+
5+
spring.jms.servicebus.pricing-tier=[pricing-tier]

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ We need to ensure that this [environment checklist][ready-to-run-checklist] is c
2929
# The idle timeout in milliseconds after which the connection will be failed if the peer sends no AMQP frames
3030
# Default is 1800000
3131
spring.jms.servicebus.idle-timeout=[idle-timeout]
32+
33+
#Fill service bus pricing tier according to the one you created. Supported values are premium and standard.
34+
spring.jms.servicebus.pricing-tier=[pricing-tier]
3235
```
3336

3437
2. Specify your topic name and subscription name. Update `TOPIC_NAME` in [TopicSendController] and [TopicReceiveController], and `SUBSCRIPTION_NAME` in [TopicReceiveController].

sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/src/main/resources/application.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ spring.jms.servicebus.connection-string=[servicebus-namespace-connection-string]
33
spring.jms.servicebus.topic-client-id=[topic-client-id]
44

55
spring.jms.servicebus.idle-timeout=[idle-timeout]
6+
7+
spring.jms.servicebus.pricing-tier=[pricing-tier]

sdk/spring/azure-spring-boot-starter-servicebus-jms/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# Release History
22

33
## 3.2.0-beta.1 (Unreleased)
4-
4+
### New Features
5+
- Enable MessageConverter bean customization.
6+
- Update the underpinning JMS library for the Premium pricing tier of Service Bus to JMS 2.0.
57

68
## 3.1.0 (2021-01-20)
79

sdk/spring/azure-spring-boot-starter-servicebus-jms/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Append the following code to the end of the *application.properties* file. Repla
3939
```yaml
4040
spring.jms.servicebus.connection-string=<ServiceBusNamespaceConnectionString>
4141
spring.jms.servicebus.idle-timeout=<IdleTimeout>
42+
# Supported values for pricing-tier are premium, standard and basic.
43+
spring.jms.servicebus.pricing-tier=<ServiceBusPricingTier>
4244
```
4345

4446
#### Use Service Bus topic
@@ -49,6 +51,8 @@ Append the following code to the end of the *application.properties* file. Repla
4951
spring.jms.servicebus.connection-string=<ServiceBusNamespaceConnectionString>
5052
spring.jms.servicebus.topic-client-id=<ServiceBusTopicClientId>
5153
spring.jms.servicebus.idle-timeout=<IdleTimeout>
54+
# Supported values for pricing-tier are premium and standard.
55+
spring.jms.servicebus.pricing-tier=<ServiceBusPricingTier>
5256
```
5357

5458
### Implement basic Service Bus functionality

sdk/spring/azure-spring-boot-starter-servicebus-jms/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
<artifactId>qpid-jms-client</artifactId>
4343
<version>0.53.0</version> <!-- {x-version-update;org.apache.qpid:qpid-jms-client;external_dependency} -->
4444
</dependency>
45+
<dependency>
46+
<groupId>com.microsoft.azure</groupId>
47+
<artifactId>azure-servicebus-jms</artifactId>
48+
<version>0.0.7</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms;external_dependency} -->
49+
</dependency>
4550
<dependency>
4651
<groupId>io.netty</groupId>
4752
<artifactId>netty-buffer</artifactId>
@@ -89,6 +94,7 @@
8994
<rules>
9095
<bannedDependencies>
9196
<includes>
97+
<include>com.microsoft.azure:azure-servicebus-jms:[0.0.7]</include> <!-- {x-include-update;com.microsoft.azure:azure-servicebus-jms;external_dependency} -->
9298
<include>org.apache.qpid:qpid-jms-client:[0.53.0]</include> <!-- {x-include-update;org.apache.qpid:qpid-jms-client;external_dependency} -->
9399
<include>io.netty:netty-buffer:[4.1.54.Final]</include> <!-- {x-include-update;io.netty:netty-buffer;external_dependency} -->
94100
<include>io.netty:netty-common:[4.1.54.Final]</include> <!-- {x-include-update;io.netty:netty-common;external_dependency} -->

sdk/spring/azure-spring-boot-test-core/src/main/java/com/azure/spring/test/EnvironmentVariable.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,8 @@ public class EnvironmentVariable {
4646
public static final String SPRING_RESOURCE_GROUP = System.getenv("SPRING_RESOURCE_GROUP");
4747
public static final String SPRING_SUBSCRIPTION_ID = System.getenv("SPRING_SUBSCRIPTION_ID");
4848
public static final String SPRING_TENANT_ID = System.getenv("SPRING_TENANT_ID");
49+
public static final String SPRING_JMS_STANDARD_SERVICEBUS_CONNECTION_STRING = System.getenv("SPRING_JMS_STANDARD_SERVICEBUS_CONNECTION_STRING");
50+
public static final String SPRING_JMS_PREMIUM_SERVICEBUS_CONNECTION_STRING = System.getenv("SPRING_JMS_PREMIUM_SERVICEBUS_CONNECTION_STRING");
51+
52+
4953
}

sdk/spring/azure-spring-boot-test-servicebus-jms/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
</exclusion>
3333
</exclusions>
3434
</dependency>
35+
<dependency>
36+
<groupId>com.azure.spring</groupId>
37+
<artifactId>azure-spring-boot-test-core</artifactId>
38+
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-test-core;current} -->
39+
</dependency>
3540
</dependencies>
36-
3741
</project>

0 commit comments

Comments
 (0)