Skip to content

Update spring-boot related modules' version to 2.3.3-beta.1. #12189

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
saragluna merged 13 commits into from
Jun 18, 2020
Merged

Update spring-boot related modules' version to 2.3.3-beta.1. #12189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
1be0b1e
Update spring-boot related modules' version to 2.3.3-beta.1.
rujche Jun 15, 2020
5dad38f
Add the content which help to update version.
rujche Jun 16, 2020
cce9a94
Change the order of spring-boot related dependencies.
rujche Jun 16, 2020
7c4554a
Update spring-boot version to 2.3.0
rujche Jun 16, 2020
2c107c9
Update version by update_version.py
rujche Jun 16, 2020
0d861bd
Add spring-boot-starter-parent version.
rujche Jun 16, 2020
fa6b5b8
Update version by update_version.py
rujche Jun 16, 2020
71ce297
Remove unused property in pom.
rujche Jun 16, 2020
c8d840b
Fix error caused by spring-boot version up.
rujche Jun 16, 2020
66ed1af
Update vertion of spring framework related artifact.
rujche Jun 17, 2020
a09aafe
Update vertion of spring-context to 5.2.6-RELEASE.
rujche Jun 17, 2020
5566b18
Restore vertion_client.txt from master branch.
rujche Jun 17, 2020
6a84261
Update spring integration related vertion to 2.3.3-beta.1.
rujche Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,47 +206,47 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-spring-boot</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-secrets-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-spring-boot-metrics-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-metrics-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-spring-boot-metrics-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-servicebus-jms-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-b2c-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmosdb-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmosdb-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-data-gremlin-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-data-gremlin-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-data-gremlin-spring-boot-starter;current} -->
</dependency>
</dependencies>
<build>
Expand Down
41 changes: 22 additions & 19 deletions eng/versioning/external_dependencies.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,27 @@ org.powermock:powermock-api-mockito2;2.0.2
org.powermock:powermock-module-junit4;2.0.2
org.slf4j:slf4j-api;1.7.28
org.slf4j:slf4j-simple;1.7.25
org.springframework.boot:spring-boot-actuator-autoconfigure;2.2.0.RELEASE
org.springframework.boot:spring-boot-autoconfigure;2.2.0.RELEASE
org.springframework.boot:spring-boot-autoconfigure-processor;2.2.0.RELEASE
org.springframework.boot:spring-boot-configuration-processor;2.2.0.RELEASE
org.springframework.boot:spring-boot-dependencies;2.2.0.RELEASE
org.springframework.boot:spring-boot-starter;2.2.0.RELEASE
org.springframework.boot:spring-boot-starter-test;2.2.0.RELEASE
org.springframework.boot:spring-boot-starter-validation;2.2.0.RELEASE
org.springframework.boot:spring-boot-starter-web;2.2.0.RELEASE
org.springframework.security:spring-security-config;5.2.0.RELEASE
org.springframework.security:spring-security-core;5.2.0.RELEASE
org.springframework.security:spring-security-web;5.2.0.RELEASE
org.springframework.security:spring-security-oauth2-client;5.2.0.RELEASE
org.springframework.security:spring-security-oauth2-core;5.2.0.RELEASE
org.springframework.security:spring-security-oauth2-jose;5.2.0.RELEASE
org.springframework:spring-web;5.2.5.RELEASE
org.springframework:spring-jms;5.2.5.RELEASE

## Spring boot dependency versions
org.springframework.boot:spring-boot-actuator-autoconfigure;2.3.0.RELEASE
org.springframework.boot:spring-boot-autoconfigure-processor;2.3.0.RELEASE
org.springframework.boot:spring-boot-autoconfigure;2.3.0.RELEASE
org.springframework.boot:spring-boot-configuration-processor;2.3.0.RELEASE
org.springframework.boot:spring-boot-dependencies;2.3.0.RELEASE
org.springframework.boot:spring-boot-starter-test;2.3.0.RELEASE
org.springframework.boot:spring-boot-starter-validation;2.3.0.RELEASE
org.springframework.boot:spring-boot-starter-web;2.3.0.RELEASE
org.springframework.boot:spring-boot-starter;2.3.0.RELEASE
org.springframework.boot:spring-boot;2.3.0.RELEASE
org.springframework.boot:spring-boot-starter-parent;2.3.0.RELEASE
org.springframework.security:spring-security-config;5.3.2.RELEASE
org.springframework.security:spring-security-core;5.3.2.RELEASE
org.springframework.security:spring-security-web;5.3.2.RELEASE
org.springframework.security:spring-security-oauth2-client;5.3.2.RELEASE
org.springframework.security:spring-security-oauth2-core;5.3.2.RELEASE
org.springframework.security:spring-security-oauth2-jose;5.3.2.RELEASE
org.springframework:spring-web;5.2.6.RELEASE
org.springframework:spring-jms;5.2.6.RELEASE
pl.pragmatists:JUnitParams;1.1.1

## Test dependency versions
Expand Down Expand Up @@ -135,8 +139,7 @@ org.junit.platform:junit-platform-testkit;1.6.2
org.junit.vintage:junit-vintage-engine;5.6.2
org.openjdk.jmh:jmh-core;1.22
org.openjdk.jmh:jmh-generator-annprocess;1.22
org.springframework.boot:spring-boot;2.2.0.RELEASE
org.springframework:spring-context;5.2.0.RELEASE
org.springframework:spring-context;5.2.6.RELEASE
org.spockframework:spock-core;1.3-groovy-2.5
org.testng:testng;6.14.3
uk.org.lidalia:slf4j-test;1.2.0
Expand Down
22 changes: 11 additions & 11 deletions eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,17 @@ com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-storage-queue;12.5.2;12.6.0-beta.1
com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
com.microsoft.azure:azure-spring-boot;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-active-directory-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-spring-boot-metrics-starter;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-spring-boot-tests;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-spring-boot-test-core;2.2.4;2.2.5-beta.1
com.microsoft.azure:azure-spring-boot;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-active-directory-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-cosmosdb-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-data-gremlin-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-metrics-starter;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-tests;2.3.2;2.3.3-beta.1
com.microsoft.azure:azure-spring-boot-test-core;2.3.2;2.3.3-beta.1


# Unreleased dependencies: Copy the entry from above, prepend "unreleased_" and remove the current
Expand Down
2 changes: 1 addition & 1 deletion ...ring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-b2c-oidc/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-b2c-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-b2c-spring-boot-starter;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ng/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend-v2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...pring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion ...ing/azure-spring-boot-samples/azure-spring-boot-sample-active-directory-stateless/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-active-directory/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-active-directory-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-active-directory-spring-boot-starter;current} -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-cosmosdb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-cosmosdb-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmosdb-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-cosmosdb-spring-boot-starter;current} -->
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-data-gremlin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-data-gremlin-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-data-gremlin-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-data-gremlin-spring-boot-starter;current} -->
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-keyvault-secrets/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-secrets-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-keyvault-secrets-spring-boot-starter;current} -->
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-queue/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-servicebus-jms-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;current} -->
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...ms-queue/src/test/java/com/microsoft/azure/jms/queue/ServiceBusJMSQueueApplicationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
Expand All @@ -31,7 +31,7 @@ public class ServiceBusJMSQueueApplicationIT {
private MockMvc mvc;

@Rule
public OutputCapture capture = new OutputCapture();
public OutputCaptureRule outputCaptureRule = new OutputCaptureRule();

@Test
public void testQueueSendAndReceiveMessage() throws Exception {
Expand All @@ -45,7 +45,7 @@ public void testQueueSendAndReceiveMessage() throws Exception {
boolean messageReceived = false;

for (int i = 0; i < 100; i++) {
final String output = capture.toString();
final String output = outputCaptureRule.toString();
if (!messageReceived && output.contains(messageReceivedLog)) {
messageReceived = true;
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/azure-spring-boot-sample-servicebus-jms-topic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-servicebus-jms-spring-boot-starter</artifactId>
<version>2.2.5-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;current} -->
<version>2.3.3-beta.1</version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms-spring-boot-starter;current} -->
</dependency>

<dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...ms-topic/src/test/java/com/microsoft/azure/jms/topic/ServiceBusJMSTopicApplicationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.system.OutputCaptureRule;
import org.springframework.test.context.TestPropertySource;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
Expand All @@ -31,7 +31,7 @@ public class ServiceBusJMSTopicApplicationIT {
private MockMvc mvc;

@Rule
public OutputCapture capture = new OutputCapture();
public OutputCaptureRule outputCaptureRule = new OutputCaptureRule();

@Test
public void testTopicSendAndReceiveMessage() throws Exception {
Expand All @@ -45,7 +45,7 @@ public void testTopicSendAndReceiveMessage() throws Exception {
boolean messageReceived = false;

for (int i = 0; i < 100; i++) {
final String output = capture.toString();
final String output = outputCaptureRule.toString();
if (!messageReceived && output.contains(messageReceivedLog)) {
messageReceived = true;
}
Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-samples/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.0.RELEASE</version>
<version>2.3.0.RELEASE</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-parent;external_dependency} -->
<relativePath/> <!-- lookup parent from repository -->
</parent>

Expand Down
2 changes: 1 addition & 1 deletion sdk/spring/azure-spring-boot-starter-active-directory-b2c/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Release History

## 2.2.5-beta.1 (Unreleased)
## 2.3.3-beta.1 (Unreleased)
Loading