Fixes #216 - Update to Java 21 (#217)

manorrock · Oct 9, 2023 · 8d28bed · 8d28bed
1 parent 0a22746
commit 8d28bed
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,9 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Java
+    - name: Set up Java 21
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
     - name: Build with Maven
       run: mvn -B --ntp package
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -9,9 +9,9 @@ jobs:
     steps:
     - name: Checkout sources
       uses: actions/checkout@v1
-    - name: Set up Java 17
+    - name: Set up Java 21
       uses: actions/setup-java@v1
       with:
-        java-version: 17
+        java-version: 21
     - name: Build with Maven
       run: mvn -B -DskipTests=true -f pom.xml --ntp install
diff --git a/pom.xml b/pom.xml
@@ -10,6 +10,10 @@
     <version>23.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Manorrock Sphynx - Project</name>
+    <properties>
+        <java.vereion>21</java.vereion>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
     <build>
         <pluginManagement>
             <plugins>
@@ -66,7 +70,7 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <inherited>true</inherited>
                 <configuration>
-                    <release>17</release>
+                    <release>${java.version}</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -117,7 +121,4 @@
         <module>cli</module>
         <module>webapp</module>
     </modules>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
 </project>