Adopt to JDK22 (#2)

YaSuenag · Mar 25, 2024 · 25d0a41 · 25d0a41
1 parent 7c02dce
commit 25d0a41
Show file tree

Hide file tree

Showing 12 changed files with 196 additions and 302 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,10 +21,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: 16
+          java-version: 22
           cache: maven
 
       # Test not only testcases but also packaging with jlink

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,11 +38,11 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
-    - name: "Java 17"
-      uses: actions/setup-java@v3.3.0
+    - name: Setup Java
+      uses: actions/setup-java@v4
       with:
         distribution: temurin
-        java-version: 16
+        java-version: 22
         cache: maven
 
     # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,10 +27,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: 'Setup Java'
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '16'
+          java-version: 22
           cache: 'maven'
 
       - name: 'Run Maven'

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Class File Analyzer (CFA).  
+Class File Analyzer (CFA)
 ![CI result](../../actions/workflows/ci.yml/badge.svg)
 ![CodeQL](../../workflows/CodeQL/badge.svg)
 ===================
@@ -9,7 +9,7 @@ Analyze class files from ConstantPool.
 
 ## Requirements
 
-* JDK 16 or later
+* JDK 22 or later
 * Maven 3.6.3 or later
 
 ## Build

diff --git a/pom.xml b/pom.xml
@@ -26,16 +26,16 @@
 
     <groupId>com.yasuenag</groupId>
     <artifactId>cfa</artifactId>
-    <version>0.3.3</version>
+    <version>0.4.0</version>
     <name>CFA</name>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <imageName>${project.artifactId}-${project.version}</imageName>
         <buildYear>${maven.build.timestamp}</buildYear>
         <maven.build.timestamp.format>yyyy</maven.build.timestamp.format>
-        <maven.compiler.source>16</maven.compiler.source>
-        <maven.compiler.target>16</maven.compiler.target>
+        <maven.compiler.source>22</maven.compiler.source>
+        <maven.compiler.target>22</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -56,16 +56,16 @@
                 <configuration>
                     <compilerArgs>
                         <arg>-Xlint:all</arg>
-                        <arg>--add-exports=jdk.jdeps/com.sun.tools.classfile=cfa</arg>
                     </compilerArgs>
+                    <enablePreview>true</enablePreview>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.2.3</version>
                 <configuration>
-                  <argLine>--add-exports=jdk.jdeps/com.sun.tools.classfile=cfa</argLine>
+                  <argLine>--enable-preview</argLine>
                   <workingDirectory>${project.build.directory}</workingDirectory>
                 </configuration>
             </plugin>
@@ -92,10 +92,9 @@
                         <addModule>cfa</addModule>
                     </addModules>
                     <addOptions>
-                        <addOption>--add-exports=jdk.jdeps/com.sun.tools.classfile=cfa</addOption>
+                        <addOption>--enable-preview</addOption>
                     </addOptions>
                     <launcher>${project.artifactId}=cfa/com.yasuenag.cfa.Main</launcher>
-                    <compress>2</compress>
                     <noHeaderFiles>true</noHeaderFiles>
                     <noManPages>true</noManPages>
                 </configuration>