Skip to content

Commit 00656de

Browse files
vcolin7saraglunaNetyyyy
authored
Updated the Spring Cloud POMs for version 5+ to ensure they're compiled using Java 17, instead of using the Java runtime version (#38690)
* Updated CHANGELOG. * Updated POMs. * fix compilation versions * fix ci --------- Co-authored-by: Xiaolu Dai <[email protected]> Co-authored-by: Muyao <[email protected]>
1 parent d62a1be commit 00656de

File tree

51 files changed

+362
-36
lines changed
  • sdk
    • boms/spring-cloud-azure-dependencies
    • spring
      • CHANGELOG.md
      • spring-cloud-azure-actuator-autoconfigure
      • spring-cloud-azure-actuator
      • spring-cloud-azure-appconfiguration-config-web
      • spring-cloud-azure-appconfiguration-config
      • spring-cloud-azure-autoconfigure
      • spring-cloud-azure-core
      • spring-cloud-azure-feature-management
      • spring-cloud-azure-integration-test-appconfiguration-config
      • spring-cloud-azure-resourcemanager
      • spring-cloud-azure-service
      • spring-cloud-azure-starter-active-directory-b2c
      • spring-cloud-azure-starter-active-directory
      • spring-cloud-azure-starter-actuator
      • spring-cloud-azure-starter-appconfiguration-config
      • spring-cloud-azure-starter-appconfiguration
      • spring-cloud-azure-starter-cosmos
      • spring-cloud-azure-starter-data-cosmos
      • spring-cloud-azure-starter-eventgrid
      • spring-cloud-azure-starter-eventhubs
      • spring-cloud-azure-starter-integration-eventhubs
      • spring-cloud-azure-starter-integration-servicebus
      • spring-cloud-azure-starter-integration-storage-queue
      • spring-cloud-azure-starter-jdbc-mysql
      • spring-cloud-azure-starter-jdbc-postgresql
      • spring-cloud-azure-starter-keyvault-certificates
      • spring-cloud-azure-starter-keyvault-secrets
      • spring-cloud-azure-starter-keyvault
      • spring-cloud-azure-starter-monitor
      • spring-cloud-azure-starter-servicebus-jms
      • spring-cloud-azure-starter-servicebus
      • spring-cloud-azure-starter-storage-blob
      • spring-cloud-azure-starter-storage-file-share
      • spring-cloud-azure-starter-storage-queue
      • spring-cloud-azure-starter-storage
      • spring-cloud-azure-starter-stream-eventhubs
      • spring-cloud-azure-starter-stream-servicebus
      • spring-cloud-azure-starter
      • spring-cloud-azure-stream-binder-eventhubs-core
      • spring-cloud-azure-stream-binder-eventhubs
      • spring-cloud-azure-stream-binder-servicebus-core
      • spring-cloud-azure-stream-binder-servicebus
      • spring-integration-azure-core
      • spring-integration-azure-eventhubs
      • spring-integration-azure-servicebus
      • spring-integration-azure-storage-queue
      • spring-messaging-azure-eventhubs
      • spring-messaging-azure-servicebus
      • spring-messaging-azure-storage-queue
      • spring-messaging-azure

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+362
-36
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
</issueManagement>
4141

4242
<properties>
43+
<maven.compiler.source>17</maven.compiler.source>
44+
<maven.compiler.target>17</maven.compiler.target>
4345
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4446
<packageOutputDirectory>${project.build.directory}</packageOutputDirectory>
4547
<legal><![CDATA[[INFO] Any downloads listed may be third party software. Microsoft grants you no rights for third party software.]]></legal>

‎sdk/spring/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Release History
22

3+
## 5.9.1 (2024-02-07)
4+
5+
### Spring Cloud Azure
6+
7+
#### Bugs Fixed
8+
- Fixed issue where running on versions newer than Java 21 would throw a `UnsupportedClassVersionError`.
9+
310
## 5.9.0 (2024-02-04)
411
- This release is compatible with Spring Boot 3.0.0-3.0.13, 3.1.0-3.1.8, 3.2.0-3.2.2. (Note: 3.0.x (x>13), 3.1.y (y>8) and 3.2.z (z>2) should be supported, but they aren't tested with this release.)
512
- This release is compatible with Spring Cloud 2022.0.0-2022.0.4, 2023.0.0-2023.0.0. (Note: 2022.0.x (x>4) and 2023.0.y (y>0) should be supported, but they aren't tested with this release.)

‎sdk/spring/spring-cloud-azure-actuator-autoconfigure/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,15 @@
171171
<id>base-testCompile</id>
172172
<phase>none</phase>
173173
</execution>
174+
<!-- Ensure we compile with Java 17 -->
175+
<execution>
176+
<goals>
177+
<goal>compile</goal>
178+
</goals>
179+
<configuration>
180+
<release>17</release>
181+
</configuration>
182+
</execution>
174183
</executions>
175184
</plugin>
176185
<plugin>

‎sdk/spring/spring-cloud-azure-actuator/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,15 @@
164164
<id>base-testCompile</id>
165165
<phase>none</phase>
166166
</execution>
167+
<!-- Ensure we compile with Java 17 -->
168+
<execution>
169+
<goals>
170+
<goal>compile</goal>
171+
</goals>
172+
<configuration>
173+
<release>17</release>
174+
</configuration>
175+
</execution>
167176
</executions>
168177
</plugin>
169178
<plugin>

‎sdk/spring/spring-cloud-azure-appconfiguration-config-web/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
<id>base-testCompile</id>
9797
<phase>none</phase>
9898
</execution>
99+
<!-- Ensure we compile with Java 17 -->
99100
<execution>
100101
<goals>
101102
<goal>compile</goal>

‎sdk/spring/spring-cloud-azure-appconfiguration-config/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@
7777
<version>3.2.0</version> <!-- {x-version-update;org.springframework.boot:spring-boot-starter-test;external_dependency} -->
7878
<scope>test</scope>
7979
</dependency>
80+
<dependency>
81+
<groupId>org.springframework.boot</groupId>
82+
<artifactId>spring-boot-configuration-processor</artifactId>
83+
<version>3.2.0</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
84+
<optional>true</optional>
85+
</dependency>
8086

8187
<!-- Add mockito-core 4.11.0 to work with Java 21 -->
8288
<dependency>
@@ -137,11 +143,24 @@
137143
<id>base-testCompile</id>
138144
<phase>none</phase>
139145
</execution>
146+
<!-- Ensure we compile with Java 17 -->
147+
<execution>
148+
<goals>
149+
<goal>compile</goal>
150+
</goals>
151+
<configuration>
152+
<release>17</release>
153+
</configuration>
154+
</execution>
140155
<execution>
156+
<id>annotation-process</id>
141157
<goals>
142158
<goal>compile</goal>
143159
</goals>
144160
<configuration>
161+
<compilerArgs>
162+
<arg>-proc:only</arg> <!-- Turn on annotation processing -->
163+
</compilerArgs>
145164
<release>17</release>
146165
</configuration>
147166
</execution>
@@ -160,6 +179,7 @@
160179
<include>org.springframework.boot:spring-boot-actuator:[3.2.0]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-actuator;external_dependency} -->
161180
<include>org.springframework.boot:spring-boot-autoconfigure:[3.2.0]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-autoconfigure;external_dependency} -->
162181
<include>org.springframework.cloud:spring-cloud-context:[4.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-context;external_dependency} -->
182+
<include>org.springframework.boot:spring-boot-configuration-processor:[3.2.0]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
163183
<include>org.springframework.cloud:spring-cloud-starter-bootstrap:[4.1.0]</include> <!-- {x-include-update;org.springframework.cloud:spring-cloud-starter-bootstrap;external_dependency} -->
164184
</includes>
165185
</bannedDependencies>

‎sdk/spring/spring-cloud-azure-autoconfigure/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,17 @@
479479
<id>base-testCompile</id>
480480
<phase>none</phase>
481481
</execution>
482+
<!-- Ensure we compile with Java 17 -->
482483
<execution>
484+
<goals>
485+
<goal>compile</goal>
486+
</goals>
487+
<configuration>
488+
<release>17</release>
489+
</configuration>
490+
</execution>
491+
<execution>
492+
<id>annotation-process</id>
483493
<goals>
484494
<goal>compile</goal>
485495
</goals>

‎sdk/spring/spring-cloud-azure-core/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,15 @@
161161
<id>base-testCompile</id>
162162
<phase>none</phase>
163163
</execution>
164+
<!-- Ensure we compile with Java 17 -->
165+
<execution>
166+
<goals>
167+
<goal>compile</goal>
168+
</goals>
169+
<configuration>
170+
<release>17</release>
171+
</configuration>
172+
</execution>
164173
</executions>
165174
</plugin>
166175
<plugin>

‎sdk/spring/spring-cloud-azure-feature-management/pom.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@
3939
</exclusion>
4040
</exclusions>
4141
</dependency>
42+
<dependency>
43+
<groupId>org.springframework.boot</groupId>
44+
<artifactId>spring-boot-configuration-processor</artifactId>
45+
<version>3.2.0</version> <!-- {x-version-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
46+
<optional>true</optional>
47+
</dependency>
4248
<dependency>
4349
<groupId>com.fasterxml.jackson.core</groupId>
4450
<artifactId>jackson-annotations</artifactId>
@@ -125,11 +131,24 @@
125131
<id>base-testCompile</id>
126132
<phase>none</phase>
127133
</execution>
134+
<!-- Ensure we compile with Java 17 -->
135+
<execution>
136+
<goals>
137+
<goal>compile</goal>
138+
</goals>
139+
<configuration>
140+
<release>17</release>
141+
</configuration>
142+
</execution>
128143
<execution>
144+
<id>annotation-process</id>
129145
<goals>
130146
<goal>compile</goal>
131147
</goals>
132148
<configuration>
149+
<compilerArgs>
150+
<arg>-proc:only</arg> <!-- Turn on annotation processing -->
151+
</compilerArgs>
133152
<release>17</release>
134153
</configuration>
135154
</execution>
@@ -146,6 +165,7 @@
146165
<include>com.fasterxml.jackson.core:jackson-annotations:[2.15.3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-annotations;external_dependency} -->
147166
<include>com.fasterxml.jackson.core:jackson-databind:[2.15.3]</include> <!-- {x-include-update;com.fasterxml.jackson.core:jackson-databind;external_dependency} -->
148167
<include>io.projectreactor.netty:reactor-netty:[1.1.13]</include> <!-- {x-include-update;io.projectreactor.netty:reactor-netty;external_dependency} -->
168+
<include>org.springframework.boot:spring-boot-configuration-processor:[3.2.0]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-configuration-processor;external_dependency} -->
149169
<include>org.springframework.boot:spring-boot-starter:[3.2.0]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter;external_dependency} -->
150170
<include>org.springframework.boot:spring-boot-starter-log4j2:[3.2.0]</include> <!-- {x-include-update;org.springframework.boot:spring-boot-starter-log4j2;external_dependency} -->
151171
<include>org.springframework:spring-context:[6.1.1]</include> <!-- {x-include-update;org.springframework:spring-context;external_dependency} -->
@@ -156,4 +176,4 @@
156176
</plugin>
157177
</plugins>
158178
</build>
159-
</project>
179+
</project>

‎sdk/spring/spring-cloud-azure-integration-test-appconfiguration-config/pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<artifactId>spring-cloud-azure-integration-test-appconfiguration-config</artifactId>
1414
<version>1.0.0</version> <!-- {x-version-update;com.azure.spring:spring-cloud-azure-integration-test-appconfiguration-config;current} -->
1515
<properties>
16+
<java.version>17</java.version>
1617
<skipSpringITs>true</skipSpringITs>
1718
</properties>
1819
<dependencies>
@@ -45,8 +46,7 @@
4546
<goal>integration-test</goal>
4647
</goals>
4748
<configuration>
48-
<skipITs>
49-
${skipSpringITs}</skipITs>
49+
<skipITs>${skipSpringITs}</skipITs>
5050
</configuration>
5151
</execution>
5252
</executions>
@@ -56,8 +56,7 @@
5656
<artifactId>maven-surefire-plugin</artifactId>
5757
<version>2.22.0</version>
5858
<configuration>
59-
<skipTests>
60-
${skipSpringITs}</skipTests>
59+
<skipTests>${skipSpringITs}</skipTests>
6160
</configuration>
6261
</plugin>
6362
</plugins>

0 commit comments

Comments
 (0)