Skip to content

Commit 5fd44e7

Browse files
author
Rujun Chen
authored
Prepare to release azure-spring-bom and azure-spring-cloud-dependencies. (Azure#24425)
1 parent 462e0f9 commit 5fd44e7

File tree

2 files changed

+41
-109
lines changed
  • sdk/boms

2 files changed

+41
-109
lines changed

‎sdk/boms/azure-spring-boot-bom/pom.xml‎

Lines changed: 17 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,10 @@
3737
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3838
<packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
3939
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
40-
<azure.spring.boot.version>${project.version}</azure.spring.boot.version>
41-
<azure.core.version>1.20.0</azure.core.version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
42-
<azure.identity.version>1.3.6</azure.identity.version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
43-
<azure.keyvault.secret.version>4.3.3</azure.keyvault.secret.version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
44-
<azure.keyvault.jca.version>2.0.0</azure.keyvault.jca.version>
45-
<azure.msal.version>1.10.1</azure.msal.version> <!-- {x-version-update;com.microsoft.azure:msal4j;external_dependency} -->
40+
<azure.keyvault.jca.version>2.1.0</azure.keyvault.jca.version> <!-- {x-version-update;com.azure:azure-security-keyvault-jca;dependency} -->
4641
<azure.servicebus.jms.version>0.0.7</azure.servicebus.jms.version> <!-- {x-version-update;com.microsoft.azure:azure-servicebus-jms;external_dependency} -->
47-
<azure.spring.boot.starter.keyvault.certificates.version>3.1.0</azure.spring.boot.starter.keyvault.certificates.version>
42+
<azure.spring.boot.starter.keyvault.certificates.version>3.2.0</azure.spring.boot.starter.keyvault.certificates.version> <!-- {x-version-update;com.azure.spring:azure-spring-boot-starter-keyvault-certificates;dependency} -->
4843
<azure.spring.data.cosmos.version>3.11.0</azure.spring.data.cosmos.version> <!-- {x-version-update;com.azure:azure-spring-data-cosmos;dependency} -->
49-
<azure.storage.blob.version>12.14.0</azure.storage.blob.version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
50-
<azure.storage.fileshare.version>12.11.0</azure.storage.fileshare.version> <!-- {x-version-update;com.azure:azure-storage-file-share;dependency} -->
5144
</properties>
5245

5346
<issueManagement>
@@ -57,37 +50,44 @@
5750

5851
<dependencyManagement>
5952
<dependencies>
53+
<dependency>
54+
<groupId>com.azure</groupId>
55+
<artifactId>azure-sdk-bom</artifactId>
56+
<version>1.0.4</version>
57+
<type>pom</type>
58+
<scope>import</scope>
59+
</dependency>
6060

6161
<!-- Azure Dependencies Bom -->
6262
<dependency>
6363
<groupId>com.azure.spring</groupId>
6464
<artifactId>azure-spring-boot</artifactId>
65-
<version>${azure.spring.boot.version}</version>
65+
<version>${project.version}</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.azure.spring</groupId>
6969
<artifactId>azure-spring-boot-starter</artifactId>
70-
<version>${azure.spring.boot.version}</version>
70+
<version>${project.version}</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.azure.spring</groupId>
7474
<artifactId>azure-spring-boot-starter-active-directory</artifactId>
75-
<version>${azure.spring.boot.version}</version>
75+
<version>${project.version}</version>
7676
</dependency>
7777
<dependency>
7878
<groupId>com.azure.spring</groupId>
7979
<artifactId>azure-spring-boot-starter-active-directory-b2c</artifactId>
80-
<version>${azure.spring.boot.version}</version>
80+
<version>${project.version}</version>
8181
</dependency>
8282
<dependency>
8383
<groupId>com.azure.spring</groupId>
8484
<artifactId>azure-spring-boot-starter-cosmos</artifactId>
85-
<version>${azure.spring.boot.version}</version>
85+
<version>${project.version}</version>
8686
</dependency>
8787
<dependency>
8888
<groupId>com.azure.spring</groupId>
8989
<artifactId>azure-spring-boot-starter-keyvault-secrets</artifactId>
90-
<version>${azure.spring.boot.version}</version>
90+
<version>${project.version}</version>
9191
</dependency>
9292
<dependency>
9393
<groupId>com.azure.spring</groupId>
@@ -97,68 +97,30 @@
9797
<dependency>
9898
<groupId>com.azure.spring</groupId>
9999
<artifactId>azure-spring-boot-starter-servicebus-jms</artifactId>
100-
<version>${azure.spring.boot.version}</version>
100+
<version>${project.version}</version>
101101
</dependency>
102102
<dependency>
103103
<groupId>com.azure.spring</groupId>
104104
<artifactId>azure-spring-boot-starter-storage</artifactId>
105-
<version>${azure.spring.boot.version}</version>
105+
<version>${project.version}</version>
106106
</dependency>
107-
108107
<dependency>
109108
<groupId>com.azure</groupId>
110109
<artifactId>azure-spring-data-cosmos</artifactId>
111110
<version>${azure.spring.data.cosmos.version}</version>
112111
</dependency>
113112

114113
<!-- Azure libraries-->
115-
<dependency>
116-
<groupId>com.azure</groupId>
117-
<artifactId>azure-core</artifactId>
118-
<version>${azure.core.version}</version>
119-
</dependency>
120-
121-
<dependency>
122-
<groupId>com.azure</groupId>
123-
<artifactId>azure-identity</artifactId>
124-
<version>${azure.identity.version}</version>
125-
</dependency>
126-
127-
<dependency>
128-
<groupId>com.microsoft.azure</groupId>
129-
<artifactId>msal4j</artifactId>
130-
<version>${azure.msal.version}</version>
131-
</dependency>
132-
133114
<dependency>
134115
<groupId>com.microsoft.azure</groupId>
135116
<artifactId>azure-servicebus-jms</artifactId>
136117
<version>${azure.servicebus.jms.version}</version>
137118
</dependency>
138-
139-
<dependency>
140-
<groupId>com.azure</groupId>
141-
<artifactId>azure-security-keyvault-secrets</artifactId>
142-
<version>${azure.keyvault.secret.version}</version>
143-
</dependency>
144-
145119
<dependency>
146120
<groupId>com.azure</groupId>
147121
<artifactId>azure-security-keyvault-jca</artifactId>
148122
<version>${azure.keyvault.jca.version}</version>
149123
</dependency>
150-
151-
<dependency>
152-
<groupId>com.azure</groupId>
153-
<artifactId>azure-storage-blob</artifactId>
154-
<version>${azure.storage.blob.version}</version>
155-
</dependency>
156-
157-
<dependency>
158-
<groupId>com.azure</groupId>
159-
<artifactId>azure-storage-file-share</artifactId>
160-
<version>${azure.storage.fileshare.version}</version>
161-
</dependency>
162124
</dependencies>
163125
</dependencyManagement>
164126

‎sdk/boms/azure-spring-cloud-dependencies/pom.xml‎

Lines changed: 24 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -43,97 +43,97 @@
4343
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4444
<packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
4545
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>
46-
<azure.core.version>1.20.0</azure.core.version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
47-
<azure.eventhubs.checkpoint.version>1.10.0</azure.eventhubs.checkpoint.version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
48-
<azure.eventhubs.version>5.10.1</azure.eventhubs.version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
49-
<azure.identity.version>1.3.6</azure.identity.version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
50-
<azure.servicebus.version>7.4.1</azure.servicebus.version> <!-- {x-version-update;com.azure:azure-messaging-servicebus;dependency} -->
5146
<azure.resourcemanager.version>2.8.0</azure.resourcemanager.version> <!-- {x-version-update;com.azure.resourcemanager:azure-resourcemanager;dependency} -->
52-
<azure.spring.appconfigure.version>2.1.0</azure.spring.appconfigure.version>
53-
<azure.spring.appconfigure.starter.version>2.1.0</azure.spring.appconfigure.starter.version>
54-
<azure.spring.appconfigure.feature.management.version>2.0.0</azure.spring.appconfigure.feature.management.version>
55-
<azure.spring.cloud.version>${project.version}</azure.spring.cloud.version>
56-
<azure.storage.queue.version>12.11.0</azure.storage.queue.version> <!-- {x-version-update;com.azure:azure-storage-queue;dependency} -->
47+
<azure.spring.appconfigure.version>2.1.1</azure.spring.appconfigure.version>
48+
<azure.spring.appconfigure.starter.version>2.1.1</azure.spring.appconfigure.starter.version>
49+
<azure.spring.appconfigure.feature.management.version>2.0.1</azure.spring.appconfigure.feature.management.version>
5750
</properties>
5851

5952
<dependencyManagement>
6053
<dependencies>
54+
<dependency>
55+
<groupId>com.azure</groupId>
56+
<artifactId>azure-sdk-bom</artifactId>
57+
<version>1.0.4</version>
58+
<type>pom</type>
59+
<scope>import</scope>
60+
</dependency>
6161
<!-- Azure Spring Integration -->
6262
<dependency>
6363
<groupId>com.azure.spring</groupId>
6464
<artifactId>azure-spring-integration-eventhubs</artifactId>
65-
<version>${azure.spring.cloud.version}</version>
65+
<version>${project.version}</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>com.azure.spring</groupId>
6969
<artifactId>azure-spring-integration-servicebus</artifactId>
70-
<version>${azure.spring.cloud.version}</version>
70+
<version>${project.version}</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>com.azure.spring</groupId>
7474
<artifactId>azure-spring-integration-storage-queue</artifactId>
75-
<version>${azure.spring.cloud.version}</version>
75+
<version>${project.version}</version>
7676
</dependency>
7777

7878
<!-- Azure Spring Cloud-->
7979
<dependency>
8080
<groupId>com.azure.spring</groupId>
8181
<artifactId>azure-spring-cloud-context</artifactId>
82-
<version>${azure.spring.cloud.version}</version>
82+
<version>${project.version}</version>
8383
</dependency>
8484
<dependency>
8585
<groupId>com.azure.spring</groupId>
8686
<artifactId>azure-spring-cloud-autoconfigure</artifactId>
87-
<version>${azure.spring.cloud.version}</version>
87+
<version>${project.version}</version>
8888
</dependency>
8989
<dependency>
9090
<groupId>com.azure.spring</groupId>
9191
<artifactId>azure-spring-cloud-messaging</artifactId>
92-
<version>${azure.spring.cloud.version}</version>
92+
<version>${project.version}</version>
9393
</dependency>
9494

9595
<!-- Azure Spring Cloud Stream Binder -->
9696
<dependency>
9797
<groupId>com.azure.spring</groupId>
9898
<artifactId>azure-spring-cloud-stream-binder-eventhubs</artifactId>
99-
<version>${azure.spring.cloud.version}</version>
99+
<version>${project.version}</version>
100100
</dependency>
101101
<dependency>
102102
<groupId>com.azure.spring</groupId>
103103
<artifactId>azure-spring-cloud-stream-binder-servicebus-topic</artifactId>
104-
<version>${azure.spring.cloud.version}</version>
104+
<version>${project.version}</version>
105105
</dependency>
106106
<dependency>
107107
<groupId>com.azure.spring</groupId>
108108
<artifactId>azure-spring-cloud-stream-binder-servicebus-queue</artifactId>
109-
<version>${azure.spring.cloud.version}</version>
109+
<version>${project.version}</version>
110110
</dependency>
111111

112112
<!--Spring Cloud Azure Starters-->
113113
<dependency>
114114
<groupId>com.azure.spring</groupId>
115115
<artifactId>azure-spring-cloud-starter-cache</artifactId>
116-
<version>${azure.spring.cloud.version}</version>
116+
<version>${project.version}</version>
117117
</dependency>
118118
<dependency>
119119
<groupId>com.azure.spring</groupId>
120120
<artifactId>azure-spring-cloud-starter-servicebus</artifactId>
121-
<version>${azure.spring.cloud.version}</version>
121+
<version>${project.version}</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>com.azure.spring</groupId>
125125
<artifactId>azure-spring-cloud-starter-eventhubs</artifactId>
126-
<version>${azure.spring.cloud.version}</version>
126+
<version>${project.version}</version>
127127
</dependency>
128128
<dependency>
129129
<groupId>com.azure.spring</groupId>
130130
<artifactId>azure-spring-cloud-starter-eventhubs-kafka</artifactId>
131-
<version>${azure.spring.cloud.version}</version>
131+
<version>${project.version}</version>
132132
</dependency>
133133
<dependency>
134134
<groupId>com.azure.spring</groupId>
135135
<artifactId>azure-spring-cloud-starter-storage-queue</artifactId>
136-
<version>${azure.spring.cloud.version}</version>
136+
<version>${project.version}</version>
137137
</dependency>
138138

139139
<!-- App Configuration -->
@@ -164,41 +164,11 @@
164164
</dependency>
165165

166166
<!--Azure SDK-->
167-
<dependency>
168-
<groupId>com.azure</groupId>
169-
<artifactId>azure-core</artifactId>
170-
<version>${azure.core.version}</version>
171-
</dependency>
172-
<dependency>
173-
<groupId>com.azure</groupId>
174-
<artifactId>azure-identity</artifactId>
175-
<version>${azure.identity.version}</version>
176-
</dependency>
177167
<dependency>
178168
<groupId>com.azure.resourcemanager</groupId>
179169
<artifactId>azure-resourcemanager</artifactId>
180170
<version>${azure.resourcemanager.version}</version>
181171
</dependency>
182-
<dependency>
183-
<groupId>com.azure</groupId>
184-
<artifactId>azure-messaging-eventhubs</artifactId>
185-
<version>${azure.eventhubs.version}</version>
186-
</dependency>
187-
<dependency>
188-
<groupId>com.azure</groupId>
189-
<artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
190-
<version>${azure.eventhubs.checkpoint.version}</version>
191-
</dependency>
192-
<dependency>
193-
<groupId>com.azure</groupId>
194-
<artifactId>azure-messaging-servicebus</artifactId>
195-
<version>${azure.servicebus.version}</version>
196-
</dependency>
197-
<dependency>
198-
<groupId>com.azure</groupId>
199-
<artifactId>azure-storage-queue</artifactId>
200-
<version>${azure.storage.queue.version}</version>
201-
</dependency>
202172
</dependencies>
203173
</dependencyManagement>
204174

0 commit comments

Comments
 (0)