Merge branch 'eclipse-platform:master' into UpLinks

Author: MohananRahul

.github/matcher/api-tools.json

@@ -82,7 +82,7 @@ jobs:
         with:
           maven-version: ${{ inputs.mavenVersion }}
       - name: Set up JDK
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           java-version: '21'
           distribution: 'temurin'

.github/workflows/callFreezePeriodCheck.yml

@@ -21,9 +21,18 @@ on:
         type: string
         required: false
         default: ''
+      working-directory:
+        description: Optional additional arguments to specify the directory in which maven build is executed
+        type: string
+        required: false
+        default: '.'
 
 permissions: {} # all none
 
+env:
+  MAVEN_ARGS: >-
+    --batch-mode --no-transfer-progress
+
 jobs:
   versions-check-and-increment:
     name: Check and increment service versions
@@ -35,7 +44,7 @@ jobs:
         fetch-depth: 0 # required for jgit timestamp provider to work
 
     - name: Set up Java
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: 21
         distribution: 'temurin'
@@ -56,10 +65,11 @@ jobs:
       with:
         attempt_delay: 200
         attempt_limit: 10
+        current_path: ${{ inputs.working-directory }}
         command: >
           mvn verify ${{ inputs.extra-maven-args }} -DskipTests -Dcompare-version-with-baselines.skip=false
           org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100
-          --threads 1C --fail-at-end --batch-mode --no-transfer-progress --show-version
+          --threads 1C --fail-at-end --show-version
 
     - name: Commit version increments, if any
       run: |
@@ -72,9 +82,11 @@ jobs:
           # Relevant files were staged, i.e. some version were changed
           
           # Read 'releaseNumberSDK' property as stream version
-          mvn help:evaluate -Dexpression=releaseNumberSDK --quiet '-Doutput=releaseNumberSDK-value.txt'
+          pushd ${{ inputs.working-directory }}
+          mvn help:evaluate -Dexpression=releaseNumberSDK ${{ inputs.extra-maven-args }} --quiet '-Doutput=releaseNumberSDK-value.txt'
           streamVersion=$(<releaseNumberSDK-value.txt)
           rm -f releaseNumberSDK-value.txt
+          popd
           
           git config --global user.email '${{ inputs.botMail }}'
           git config --global user.name '${{ inputs.botName }}'

.github/workflows/checkDependencies.yml

@@ -78,16 +78,28 @@ jobs:
       max-parallel: 1
       fail-fast: false
     steps:
+      - name: List number of open PRs
+        id: list-prs
+        run: |
+            json_output=$(gh pr list -l 'cleanup' -R $OWNER/$REPO -L 20 --json id)
+            echo "prs=$json_output" | tee -a "$GITHUB_OUTPUT"
+        env:
+          GH_TOKEN: ${{ secrets.token }}
+          OWNER: ${{ github.repository_owner }}
+          REPO: ${{ github.event.repository.name }}
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        if: ${{ fromJson(steps.list-prs.outputs.prs)[9] == null }}
         with:
           fetch-depth: 0
           ref: master
       - name: Set up Maven
         uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
+        if: ${{ fromJson(steps.list-prs.outputs.prs)[9] == null }}
         with:
           maven-version: ${{ inputs.mavenVersion }}
       - name: Set up JDK
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        if: ${{ fromJson(steps.list-prs.outputs.prs)[9] == null }}
         with:
           java-version: |
             8
@@ -98,17 +110,17 @@ jobs:
           cache: maven
       - name: Perform Cleanups on ${{ matrix.bundles }} 
         working-directory: ${{ matrix.bundles }}
-        if: ${{ inputs.do-cleanups }}
+        if: ${{ inputs.do-cleanups && fromJson(steps.list-prs.outputs.prs)[9] == null }}
         run: >-
           xvfb-run mvn -B -ntp tycho-cleancode:cleanup@cleanups
       - name: Perform QuickFixes on ${{ matrix.bundles }} 
         working-directory: ${{ matrix.bundles }}
-        if: ${{ inputs.do-quickfix }}
+        if: ${{ inputs.do-quickfix && fromJson(steps.list-prs.outputs.prs)[9] == null }}
         run: >-
-          xvfb-run mvn -B -ntp tycho-cleancode:quickfix@quickfixes
+          xvfb-run mvn -B -ntp -e tycho-cleancode:quickfix@quickfixes
       - name: Create final PR description
         working-directory: ${{ matrix.bundles }}/target
-        if: ${{ hashFiles(format('{0}/target/quickfix.md', matrix.bundles)) != '' }} || ${{ hashFiles(format('{0}/target/cleanups.md', matrix.bundles)) != '' }} 
+        if: ${{ hashFiles(format('{0}/target/quickfix.md', matrix.bundles)) != '' || hashFiles(format('{0}/target/cleanups.md', matrix.bundles)) != '' }} 
         run: >-
           cat *.md > pr.md
       - name: Create Pull Request
@@ -121,6 +133,7 @@ jobs:
           body-path: ${{ matrix.bundles }}/target/pr.md
           delete-branch: true
           draft: false
+          labels: cleanup
           token: ${{ secrets.token }}
           committer: ${{ inputs.author }}
           author: ${{ inputs.author }}

.github/workflows/checkVersions.yml

@@ -21,6 +21,10 @@ on:
         required: false
         default: '3.9.9'
 
+env:
+  MAVEN_ARGS: >-
+    --batch-mode --no-transfer-progress
+
 jobs:
   analyze:
     name: Analyze
@@ -59,7 +63,7 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Set up Java
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: |
           8
@@ -77,12 +81,11 @@ jobs:
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
         maven-version: ${{ inputs.mavenVersion }}
+
     - name: Build with Maven
-      uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
-      with:
-       run: >- 
-        mvn --batch-mode -V -U
-        -ntp
+      run: >-
+        ${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
+        mvn --show-version --update-snapshots --errors
         -Dcompare-version-with-baselines.skip=true
         -Pbree-libs
         -DskipTests=true

.github/workflows/cleanCode.yml

@@ -15,14 +15,18 @@ on:
         type: string
         required: false
         default: 'false'
-      mavenVersion: 
+      mavenVersion:
         description: 'The version of Maven set up'
         type: string
         required: false
         default: '3.9.9'
 
 permissions: {}
 
+env:
+  MAVEN_ARGS: >-
+    --batch-mode --no-transfer-progress
+
 jobs:
   event_file:
     name: "Upload Event File"
@@ -42,6 +46,10 @@ jobs:
           - { name: Linux,   os: ubuntu-latest  }
           - { name: Windows, os: windows-latest }
           - { name: MacOS,   os: macos-13   }
+    defaults:
+      run: # Run on bash/cmd, because powershell (the Windows default) interprets dots in arguments differently
+        shell: ${{ matrix.config.name == 'Windows' && 'cmd' || 'bash' }}
+
     name: Verify ${{ matrix.config.name }}
     steps:
     - name: Checkout
@@ -50,7 +58,7 @@ jobs:
        fetch-depth: 0 # required for jgit timestamp provider to work
        submodules: ${{ inputs.submodules }}
     - name: Set up Java
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: |
           8
@@ -68,19 +76,11 @@ jobs:
       uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
       with:
         maven-version: ${{ inputs.mavenVersion }}
-    - name: Download the API Tools matcher
-      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9 # v1.6.0
-      id: api-tools-matcher
-      with:
-        url: "https://raw.githubusercontent.com/eclipse-platform/eclipse.platform.releng.aggregator/master/.github/matcher/api-tools.json"
-        target: .github/matcher
-    - run: echo "::add-matcher::.github/matcher/${{ steps.api-tools-matcher.outputs.filename }}"
+
     - name: Build with Maven
-      uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
-      with:
-       run: >- 
-        mvn --batch-mode -V -U -e
-        -ntp
+      run: >-
+        ${{ runner.os == 'Linux' && 'xvfb-run' || '' }}
+        mvn --show-version --update-snapshots --errors
         -Dcompare-version-with-baselines.skip=false
         -Pbree-libs
         -Papi-check

.github/workflows/codeQLworkflow.yml

@@ -0,0 +1,26 @@
+# Fast running checks for pull-requests
+
+name: Pull-Request Checks
+concurrency: 
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  check-freeze-period:
+    uses: ./.github/workflows/verifyFreezePeriod.yml
+  check-merge-commits:
+    uses: ./.github/workflows/checkMergeCommits.yml
+  check-versions:
+    # Run this check only for PRs from forks and not for changes from bots created on branches in this repository
+    if: github.event.pull_request.head.repo.full_name != github.repository
+    uses: ./.github/workflows/checkVersions.yml
+    with:
+      botName: Eclipse Platform Bot
+      botMail: [email protected]
+      # Only check 'eclipse.platform.releng' projects
+      working-directory: 'eclipse.platform.releng'
+      extra-maven-args: '-Pbuild-individual-bundles'

.github/workflows/mavenBuild.yml

@@ -29,7 +29,7 @@ jobs:
       with:
         ref: master
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: '21'
         distribution: 'temurin'

.github/workflows/pr-checks.yml

@@ -16,7 +16,7 @@ jobs:
       with:
         maven-version: 3.9.9
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: '21'
         distribution: 'temurin'