diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 81af6bce..bbd39788 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -18,6 +18,10 @@ on: # The branches below must be a subset of the branches above branches: [ "master" ] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: analyze: name: Analyze @@ -38,6 +42,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..3ba87fbb 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -8,29 +8,27 @@ on: branches: - master +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + 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/.lgtm.yml b/.lgtm.yml deleted file mode 100644 index 581fbc1a..00000000 --- a/.lgtm.yml +++ /dev/null @@ -1,11 +0,0 @@ -# LGTM Settings (https://lgtm.com/) -# For reference, see https://lgtm.com/help/lgtm/lgtm.yml-configuration-file -# or template at https://lgtm.com/static/downloads/lgtm.template.yml - -extraction: - java: - index: - maven: - version: "3.8.4" - # Specify the Java version required to build the project - java_version: "11" diff --git a/README.asciidoc b/README.asciidoc index f25401eb..40de6c4f 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -16,7 +16,7 @@ Installation ```xml - 2.26.0.Final + 2.28.0.Final diff --git a/api/pom.xml b/api/pom.xml index d960036a..3e03854d 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -3,7 +3,7 @@ org.jboss.forge.roaster roaster-parent - 2.28.0.Final + 2.29.0.Final ../pom.xml roaster-api diff --git a/bom/pom.xml b/bom/pom.xml index a4695ad9..79a4a6bd 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -8,7 +8,7 @@ org.jboss.forge.roaster roaster-bom - 2.28.0.Final + 2.29.0.Final pom Forge Roaster - BOM @@ -67,7 +67,7 @@ scm:git:git://github.com/forge/roaster.git scm:git:git@github.com:forge/roaster.git http://github.com/forge/roaster - 2.28.0.Final + 2.29.0.Final diff --git a/dist/pom.xml b/dist/pom.xml index 3446f95b..5554f478 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -5,7 +5,7 @@ org.jboss.forge.roaster roaster-parent - 2.28.0.Final + 2.29.0.Final ../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 a4317d88..05c17d1a 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -3,13 +3,13 @@ org.jboss.forge.roaster roaster-parent - 2.28.0.Final + 2.29.0.Final ../pom.xml roaster-jdt Forge Roaster - JDT Implementation - 3.31.0 + 3.34.0 @@ -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 eb3a7519..c2ca077a 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.jboss.forge.roaster roaster-parent - 2.28.0.Final + 2.29.0.Final pom Forge Roaster - Parent @@ -48,12 +48,14 @@ - 11 - 11 + 17 + 17 + 17 false 1.9 - 3.0.0-M3 + 3.11.0 + 3.1.2 @@ -87,7 +89,7 @@ scm:git:git://github.com/forge/roaster.git scm:git:git@github.com:forge/roaster.git http://github.com/forge/roaster - 2.28.0.Final + 2.29.0.Final diff --git a/tests/pom.xml b/tests/pom.xml index c9e04b77..afd77932 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -3,7 +3,7 @@ org.jboss.forge.roaster roaster-parent - 2.28.0.Final + 2.29.0.Final roaster-tests Forge Roaster - Tests @@ -20,19 +20,19 @@ org.junit.jupiter junit-jupiter - 5.9.1 + 5.10.0 test org.assertj assertj-core - 3.23.1 + 3.24.2 test org.mockito mockito-core - 4.8.1 + 5.3.1 test