Update to JDK 17

forge · Aug 16, 2023 · ea4646c · ea4646c
1 parent 1a16012
commit ea4646c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 15 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -38,6 +38,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
 
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: 17
+        cache: 'maven'
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -12,25 +12,19 @@ jobs:
   Build:
     strategy:
       matrix:
-        java: [ 11.0.x, 17]
+        java: [17]
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-
-    - name: Cache local Maven repository
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2/repository
-        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-maven-      
+    - uses: actions/checkout@v3
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
+        distribution: temurin
         java-version: ${{ matrix.java }}
+        cache: 'maven'
 
     - name: Build with Maven
       run: mvn install
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -42,7 +42,6 @@
                      <descriptors>
                         <descriptor>src/main/assembly/assembly.xml</descriptor>
                      </descriptors>
-                     <finalName>${project.build.finalName}</finalName>
                   </configuration>
                </execution>
             </executions>

diff --git a/impl/pom.xml b/impl/pom.xml
@@ -62,6 +62,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -98,6 +99,20 @@
                     <exclude>META-INF/*.SF</exclude>
                     <exclude>META-INF/*.DSA</exclude>
                     <exclude>META-INF/*.RSA</exclude>
+                    <exclude>META-INF/eclipse.inf</exclude>
+                    <exclude>META-INF/LICENSE</exclude>
+                    <exclude>META-INF/NOTICE</exclude>
+                    <exclude>META-INF/MANIFEST.MF</exclude>
+                    <exclude>**/module-info.class</exclude>
+                    <exclude>.options</exclude>
+                    <exclude>.api_description</exclude>
+                    <exclude>*.html</exclude>
+                    <exclude>schema/contentTypes.exsd</exclude>
+                    <exclude>schema/preferences.exsd</exclude>
+                    <exclude>plugin.xml</exclude>
+                    <exclude>plugin.properties</exclude>
+                    <exclude>about_files/*</exclude>
+                    <exclude>OSGI-INF/**</exclude>
                   </excludes>
                 </filter>
               </filters>

diff --git a/pom.xml b/pom.xml
@@ -48,12 +48,14 @@
   </developers>
 
   <properties>
-    <maven.compiler.target>11</maven.compiler.target>
-    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.release>17</maven.compiler.release>
     <maven.javadoc.failOnError>false</maven.javadoc.failOnError>
 
     <version.commons-text>1.9</version.commons-text>
-    <version.surefire.plugin>3.0.0-M3</version.surefire.plugin>
+    <version.compiler.plugin>3.11.0</version.compiler.plugin>
+    <version.surefire.plugin>3.1.2</version.surefire.plugin>
   </properties>
 
   <modules>