Skip to content

Commit 1f83e9a

Browse files
committed
Update to JDK 17
1 parent 1a16012 commit 1f83e9a

File tree

5 files changed

+32
-15
lines changed

5 files changed

+32
-15
lines changed

.github/workflows/codeql-analysis.yml

+7
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ jobs:
3838
- name: Checkout repository
3939
uses: actions/checkout@v3
4040

41+
- name: Set up JDK 17
42+
uses: actions/setup-java@v3
43+
with:
44+
distribution: temurin
45+
java-version: 17
46+
cache: 'maven'
47+
4148
# Initializes the CodeQL tools for scanning.
4249
- name: Initialize CodeQL
4350
uses: github/codeql-action/init@v2

.github/workflows/maven.yml

+5-11
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,19 @@ jobs:
1212
Build:
1313
strategy:
1414
matrix:
15-
java: [ 11.0.x, 17]
15+
java: [17]
1616

1717
runs-on: ubuntu-latest
1818

1919
steps:
20-
- uses: actions/checkout@v1
21-
22-
- name: Cache local Maven repository
23-
uses: actions/cache@v2
24-
with:
25-
path: ~/.m2/repository
26-
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
27-
restore-keys: |
28-
${{ runner.os }}-maven-
20+
- uses: actions/checkout@v3
2921

3022
- name: Set up JDK ${{ matrix.java }}
31-
uses: actions/setup-java@v1
23+
uses: actions/setup-java@v3
3224
with:
25+
distribution: temurin
3326
java-version: ${{ matrix.java }}
27+
cache: 'maven'
3428

3529
- name: Build with Maven
3630
run: mvn install

dist/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
<descriptors>
4343
<descriptor>src/main/assembly/assembly.xml</descriptor>
4444
</descriptors>
45-
<finalName>${project.build.finalName}</finalName>
4645
</configuration>
4746
</execution>
4847
</executions>

impl/pom.xml

+15
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<plugin>
6363
<groupId>org.apache.maven.plugins</groupId>
6464
<artifactId>maven-shade-plugin</artifactId>
65+
<version>3.5.0</version>
6566
<executions>
6667
<execution>
6768
<phase>package</phase>
@@ -98,6 +99,20 @@
9899
<exclude>META-INF/*.SF</exclude>
99100
<exclude>META-INF/*.DSA</exclude>
100101
<exclude>META-INF/*.RSA</exclude>
102+
<exclude>META-INF/eclipse.inf</exclude>
103+
<exclude>META-INF/LICENSE</exclude>
104+
<exclude>META-INF/NOTICE</exclude>
105+
<exclude>META-INF/MANIFEST.MF</exclude>
106+
<exclude>**/module-info.class</exclude>
107+
<exclude>.options</exclude>
108+
<exclude>.api_description</exclude>
109+
<exclude>*.html</exclude>
110+
<exclude>schema/contentTypes.exsd</exclude>
111+
<exclude>schema/preferences.exsd</exclude>
112+
<exclude>plugin.xml</exclude>
113+
<exclude>plugin.properties</exclude>
114+
<exclude>about_files/*</exclude>
115+
<exclude>OSGI-INF/**</exclude>
101116
</excludes>
102117
</filter>
103118
</filters>

pom.xml

+5-3
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,14 @@
4848
</developers>
4949

5050
<properties>
51-
<maven.compiler.target>11</maven.compiler.target>
52-
<maven.compiler.source>11</maven.compiler.source>
51+
<maven.compiler.target>17</maven.compiler.target>
52+
<maven.compiler.source>17</maven.compiler.source>
53+
<maven.compiler.release>17</maven.compiler.release>
5354
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
5455

5556
<version.commons-text>1.9</version.commons-text>
56-
<version.surefire.plugin>3.0.0-M3</version.surefire.plugin>
57+
<version.compiler.plugin>3.11.0</version.compiler.plugin>
58+
<version.surefire.plugin>3.1.2</version.surefire.plugin>
5759
</properties>
5860

5961
<modules>

0 commit comments

Comments
 (0)