Merge pull request #173 from adangel:update-target-platform

Update target platform #173

Author: adangel

.ci/build.sh

@@ -8,12 +8,6 @@ SCRIPT_INCLUDES="log.bash utils.bash setup-secrets.bash openjdk.bash maven.bash
 source "$(dirname "$0")/inc/fetch_ci_scripts.bash" && fetch_ci_scripts
 
 function build() {
-    pmd_ci_log_group_start "Install OpenJDK 8+17"
-        pmd_ci_openjdk_install_adoptopenjdk 8
-        pmd_ci_openjdk_install_adoptopenjdk 17
-        pmd_ci_openjdk_setdefault 17
-    pmd_ci_log_group_end
-
     echo
     pmd_ci_maven_display_info_banner
     pmd_ci_utils_determine_build_env pmd/pmd-eclipse-plugin
@@ -33,7 +27,7 @@ function build() {
         pmd_ci_log_group_start "Build with mvnw"
             ${xvfb_cmd} ./mvnw clean verify \
                 --show-version --errors --batch-mode --no-transfer-progress \
-                --toolchains .ci/files/toolchains.xml
+                -Dtarget.platform=${TARGET_PLATFORM}
         pmd_ci_log_group_end
         exit 0
     fi
@@ -45,7 +39,7 @@ function build() {
         pmd_ci_log_group_start "Build with mvnw"
             ${xvfb_cmd} ./mvnw clean verify \
                 --show-version --errors --batch-mode --no-transfer-progress \
-                --toolchains .ci/files/toolchains.xml
+                -Dtarget.platform=${TARGET_PLATFORM}
         pmd_ci_log_group_end
 
         pmd_ci_log_info "Stopping build here, because os is not linux"
@@ -77,13 +71,13 @@ function snapshot_build() {
         # Build 1 - without signing but with tests
         ${xvfb_cmd} ./mvnw clean verify \
             --show-version --errors --batch-mode --no-transfer-progress \
-            --toolchains .ci/files/toolchains.xml
+            -Dtarget.platform=${TARGET_PLATFORM}
 
         # Build 2 - with signing, but skipping tests, pmd, checkstyle
         ${xvfb_cmd} ./mvnw clean verify \
             --show-version --errors --batch-mode --no-transfer-progress \
-            --toolchains .ci/files/toolchains.xml \
             --activate-profiles sign \
+            -Dtarget.platform=${TARGET_PLATFORM} \
             -Dpmd.skip=true -DskipTests -Dcheckstyle.skip
 
         # Upload update site to sourceforge
@@ -134,13 +128,13 @@ function release_build() {
         # Build 1 - without signing but with tests
         ${xvfb_cmd} ./mvnw clean verify \
             --show-version --errors --batch-mode --no-transfer-progress \
-            --toolchains .ci/files/toolchains.xml
+            -Dtarget.platform=${TARGET_PLATFORM}
 
         # Build 2 - with signing, but skipping tests, pmd, checkstyle
         ${xvfb_cmd} ./mvnw clean verify \
             --show-version --errors --batch-mode --no-transfer-progress \
-            --toolchains .ci/files/toolchains.xml \
             --activate-profiles sign \
+            -Dtarget.platform=${TARGET_PLATFORM} \
             -Dpmd.skip=true -DskipTests -Dcheckstyle.skip
 
     pmd_ci_log_group_end

.ci/files/toolchains.xml

@@ -0,0 +1,23 @@
+name: 'Build'
+description: 'Runs the build script'
+inputs:
+  targetPlatform:
+    description: 'The eclipse target platform to build the plugins against'
+    required: true
+  pmdCiSecretPassphrase:
+    description: 'Secret needed for releases'
+    required: false
+  githubToken:
+    description: 'The GitHub Token used for releases'
+    required: false
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Build
+      run: .ci/build.sh
+      shell: bash
+      env:
+        TARGET_PLATFORM: ${{ inputs.targetPlatform }}
+        PMD_CI_SECRET_PASSPHRASE: ${{ inputs.pmdCiSecretPassphrase }}
+        GITHUB_TOKEN: ${{ inputs.githubToken }}

.github/actions/build/action.yml

@@ -0,0 +1,38 @@
+name: 'Setup'
+description: 'Setup java and ruby, check environment'
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Set up JDK 17
+      id: java17
+      uses: actions/setup-java@v3
+      with:
+        distribution: temurin
+        java-version: '17'
+    - name: Cache local Maven repository
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        # re-cache on changes in the pom and target files
+        key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml', '**/*.target') }}
+        restore-keys: |
+          ${{ runner.os }}-maven-
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Setup Environment
+      shell: bash
+      run: |
+        echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
+        echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3" >> $GITHUB_ENV
+        echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/20/scripts" >> $GITHUB_ENV
+    - name: Check Environment
+      shell: bash
+      run: |
+        f=check-environment.sh; \
+        mkdir -p .ci && \
+        ( [ -e .ci/$f ] || curl -sSL "${PMD_CI_SCRIPTS_URL}/$f" > ".ci/$f" ) && \
+        chmod 755 .ci/$f && \
+        .ci/$f

.github/actions/setup/action.yml

@@ -14,44 +14,61 @@ on:
   workflow_dispatch:
 
 jobs:
+  # verify build on one node before multiple builds on different os are started
+  fail-fast-build:
+    name: verify (ubuntu-latest, 2023-03)
+    timeout-minutes: 60
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Environment
+        uses: ./.github/actions/setup
+
+      - name: Build
+        uses: ./.github/actions/build
+        with:
+          targetPlatform: 2023-03
+          pmdCiSecretPassphrase: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}
+
+
   build:
-    runs-on: ${{ matrix.os }}
+    needs: fail-fast-build
+    name: verify (${{ matrix.os }}, ${{ matrix.targetPlatform }})
+    timeout-minutes: 60
     continue-on-error: false
+
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-    if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
+        targetPlatform: [ 2023-03 ]
+        exclude:
+          # exclude the fail-fast-build, which already ran
+          - os: ubuntu-latest
+            targetPlatform: 2023-03
+        # run other target platforms only on linux
+        include:
+          - os: ubuntu-latest
+            targetPlatform: 2022-12
+          - os: ubuntu-latest
+            targetPlatform: 2022-09
+          - os: ubuntu-latest
+            targetPlatform: 2022-06
+      fail-fast: true
+
+    runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/cache@v3
-      with:
-        path: |
-          ~/.m2/repository
-          ~/.cache
-        key: ${{ runner.os }}-${{ hashFiles('**/pom.xml') }}
-        restore-keys: |
-          ${{ runner.os }}-
-    - name: Set up Ruby 2.7
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-    - name: Setup Environment
-      shell: bash
-      run: |
-        echo "LANG=en_US.UTF-8" >> $GITHUB_ENV
-        echo "MAVEN_OPTS=-Dmaven.wagon.httpconnectionManager.ttlSeconds=180 -Dmaven.wagon.http.retryHandler.count=3" >> $GITHUB_ENV
-        echo "PMD_CI_SCRIPTS_URL=https://raw.githubusercontent.com/pmd/build-tools/20/scripts" >> $GITHUB_ENV
-    - name: Check Environment
-      shell: bash
-      run: |
-        f=check-environment.sh; \
-        mkdir -p .ci && \
-        ( [ -e .ci/$f ] || curl -sSL "${PMD_CI_SCRIPTS_URL}/$f" > ".ci/$f" ) && \
-        chmod 755 .ci/$f && \
-        .ci/$f
-    - name: Build
-      run: .ci/build.sh
-      shell: bash
-      env:
-        PMD_CI_SECRET_PASSPHRASE: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup Environment
+        uses: ./.github/actions/setup
+
+      - name: Build
+        uses: ./.github/actions/build
+        with:
+          targetPlatform: ${{ matrix.targetPlatform }}
+          pmdCiSecretPassphrase: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }}
+          githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build.yml

@@ -20,10 +20,7 @@ the repository on github and create pull requests. Any contributions are welcome
 
 ### Testing the latest version
 
-The plugin builds with Java 17 but also requires Java 8. This is achieved through
-[maven toolchains](https://maven.apache.org/guides/mini/guide-using-toolchains.html).
-You can use [toolchains.xml](.ci/files/toolchains.xml) from this repo to
-configure your own `toolchains.xml` file.
+The plugin requires Java 17 for building.
 
 Then simply build the plugin locally using maven:
 

README.md

@@ -7,14 +7,23 @@ Eclipse Update Site:
 *   Releases: <https://pmd.github.io/pmd-eclipse-plugin-p2-site/>
 *   Snapshots: <https://pmd.github.io/pmd-eclipse-plugin-p2-site/snapshot/>
 
-## ????: 4.45.0.v????
+## ????: 7.0.0.v????
 
-This is a minor release.
+This is a major release.
 
 ### New and noteworthy
 
+* Beginning with version 7 of this plugin, only the last four eclipse releases are supported. The plugin
+  might still work with older versions, but it's only developed and tested against the newer versions.
+
+* The version number of the PMD Eclipse Plugin now is synchronized with the supported and used PMD version.
+  For Bugfixes in the PMD Eclipse Plugin only, a new version is released with the same major, minor, and patch,
+  but a new qualifier only.
+
 ### Fixed Issues
 
+* [#172](https://github.com/pmd/pmd-eclipse-plugin/issues/172): Only support the last 4 eclipse releases
+
 ### API Changes
 
 ### External Contributions

ReleaseNotes.md

@@ -6,7 +6,7 @@
   <parent>
     <groupId>net.sourceforge.pmd</groupId>
     <artifactId>net.sourceforge.pmd.eclipse.parent</artifactId>
-    <version>4.45.0-SNAPSHOT</version>
+    <version>7.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>