upgrade to java 21

eclipse-xpanse · Oct 24, 2023 · 6b101f1 · 6b101f1
1 parent 33c69b6
commit 6b101f1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,10 +18,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Set Up JDK 17
+      - name: Set Up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
       - name: Build
         run: mvn --batch-mode --update-snapshots --no-transfer-progress verify
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -38,10 +38,10 @@ jobs:
           fetch-depth: 0
           token: ${{ secrets.BOT_GITHUB_TOKEN }}
 
-      - name: Set Up JDK 17
+      - name: Set Up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: 'temurin'
           gpg-private-key: ${{ secrets.ORG_GPG_PRIVATE_KEY }}
           gpg-passphrase: ${{ secrets.ORG_GPG_PASSPHRASE }}

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.2</version>
+		<version>3.1.5</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>org.eclipse.xpanse.terraform.boot</groupId>
@@ -19,12 +19,12 @@
 	<name>terraform-boot</name>
 	<description>RESTful API Wrapper for Terraform</description>
 	<properties>
-		<java.version>17</java.version>
-		<springdoc.version>2.1.0</springdoc.version>
+		<java.version>21</java.version>
+		<springdoc.version>2.2.0</springdoc.version>
 		<checkstyle-maven-plugin.version>3.3.0</checkstyle-maven-plugin.version>
-		<logbook.version>3.1.0</logbook.version>
+		<logbook.version>3.5.0</logbook.version>
 		<nimbusds.oidc.sdk.version>10.7</nimbusds.oidc.sdk.version>
-		<lombok.version>1.18.28</lombok.version>
+		<lombok.version>1.18.30</lombok.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -126,6 +126,26 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.4.1</version>
+				<executions>
+					<execution>
+						<id>enforce-versions</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireJavaVersion>
+									<version>21</version>
+								</requireJavaVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>