diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 81af6bce..4a408ef6 100644
--- 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
index 2037da43..8328a597 100644
--- 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
index bdcc8859..8f618a41 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -42,7 +42,6 @@
src/main/assembly/assembly.xml
- ${project.build.finalName}
diff --git a/impl/pom.xml b/impl/pom.xml
index f010cc38..ed7dee6e 100644
--- a/impl/pom.xml
+++ b/impl/pom.xml
@@ -62,6 +62,7 @@
org.apache.maven.plugins
maven-shade-plugin
+ 3.5.0
package
@@ -98,6 +99,20 @@
META-INF/*.SF
META-INF/*.DSA
META-INF/*.RSA
+ META-INF/eclipse.inf
+ META-INF/LICENSE
+ META-INF/NOTICE
+ META-INF/MANIFEST.MF
+ **/module-info.class
+ .options
+ .api_description
+ *.html
+ schema/contentTypes.exsd
+ schema/preferences.exsd
+ plugin.xml
+ plugin.properties
+ about_files/*
+ OSGI-INF/**
diff --git a/pom.xml b/pom.xml
index 4a565953..2d44b42f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,12 +48,14 @@
- 11
- 11
+ 17
+ 17
+ 17
false
1.9
- 3.0.0-M3
+ 3.11.0
+ 3.1.2