Merge pull request #386 from vmware/feature/java-21

[all] (#330) Support for Java version 21 LTS
vmware · Aug 19, 2024 · 8afde33 · 8afde33
2 parents dd57325 + 46543b0
commit 8afde33
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        java: ["17"]
+        java: ["17","21"]
         maven: ["3.9.2"]
         node: ["16.20.2"]
         node_vmware_samples: ["14.17.1"]

diff --git a/.github/workflows/codeql-java.yml b/.github/workflows/codeql-java.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Maven Action
         uses: s4u/setup-maven-action@v1.7.0
         with:
-          java-version: '17'
+          java-version: '21'
           java-distribution: 'temurin' 
           maven-version: '3.9.2'
 

diff --git a/.github/workflows/super-linter.yml b/.github/workflows/super-linter.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Java Action
         uses: actions/setup-java@v3
         with:
-          java-version: "17"
+          java-version: "21"
           distribution: "temurin"
 
       - name: Super-Linter

diff --git a/common/artifact-manager/pom.xml b/common/artifact-manager/pom.xml
@@ -23,7 +23,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
+				<version>0.8.12</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>
@@ -48,8 +48,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>${java.version}</source>
+                    <target>${java.version}</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/common/o11n/project/pom.xml b/common/o11n/project/pom.xml
@@ -21,7 +21,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
+				<version>0.8.12</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>

diff --git a/maven/plugins/pom.xml b/maven/plugins/pom.xml
@@ -90,18 +90,10 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.8</version>
+				<version>0.8.12</version>
 				<executions>
 					<execution>
 						<id>prepare-agent</id>

diff --git a/package-installer/pom.xml b/package-installer/pom.xml
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.8</version>
+                <version>0.8.12</version>
                 <executions>
                     <execution>
                         <id>prepare-agent</id>

diff --git a/pom.xml b/pom.xml
@@ -24,6 +24,7 @@
 	<properties>
 		<main.basedir>${project.basedir}</main.basedir>
 		<revision>2.41.1-SNAPSHOT</revision>
+		<java.version>17</java.version>
 	</properties>
 
 	<licenses>
@@ -154,8 +155,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.10.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
 				</configuration>
 			</plugin>
 			<plugin>