Merge branch 'master' into patch-1

eclipse-platform · Sep 4, 2024 · e64febd · e64febd
2 parents 0fb62be + 967ea60
commit e64febd
Show file tree

Hide file tree

Showing 154 changed files with 1,020 additions and 476 deletions.
diff --git a/.github/workflows/codeQLworkflow.yml b/.github/workflows/codeQLworkflow.yml
@@ -59,7 +59,7 @@ jobs:
         languages: ${{ matrix.language }}
 
     - name: Set up Java
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         java-version: |
           8

diff --git a/.github/workflows/mavenBuild.yml b/.github/workflows/mavenBuild.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Upload
-      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: Event File
         path: ${{ github.event_path }}
@@ -50,7 +50,7 @@ jobs:
        fetch-depth: 0 # required for jgit timestamp provider to work
        submodules: ${{ inputs.submodules }}
     - name: Set up Java
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         java-version: |
           8
@@ -88,7 +88,7 @@ jobs:
         ${{ inputs.maven-goals }}
     - name: Upload Test Results for ${{ matrix.config.name }}
       if: always()
-      uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+      uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
       with:
         name: test-results-${{ matrix.config.os }}
         if-no-files-found: warn

diff --git a/.github/workflows/prepareRelease.yml b/.github/workflows/prepareRelease.yml
@@ -26,7 +26,7 @@ jobs:
       with:
         ref: master
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -36,7 +36,7 @@ jobs:
     - name: Update Release Versions
       run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.8:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
     - name: Create Pull Request for Release ${{ github.event.milestone.title }}
-      uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
+      uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 # v7.0.0
       with:
         commit-message: Prepare Release ${{ github.event.milestone.title }}
         branch: prepare_R${{ github.event.milestone.title }}

diff --git a/.github/workflows/updateRelease.yml b/.github/workflows/updateRelease.yml
@@ -16,7 +16,7 @@ jobs:
       with:
         maven-version: 3.9.7
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         java-version: '17'
         distribution: 'temurin'
@@ -38,7 +38,7 @@ jobs:
             -Dcompare-version-with-baselines.skip=false
             org.eclipse.tycho:tycho-versions-plugin:4.0.6:bump-versions -Dtycho.bump-versions.increment=100
     - name: Create Pull Request for Release ${{ github.event.milestone.title }}
-      uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6.1.0
+      uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 # v7.0.0
       with:
         commit-message: Update for release ${{ github.event.milestone.title }}
         branch: update_R${{ github.event.milestone.title }}

diff --git a/.github/workflows/updateTarget.yml b/.github/workflows/updateTarget.yml
@@ -0,0 +1,53 @@
+name: Update Target Platform
+
+concurrency: 
+    group: ${{ github.workflow }}-${{ github.ref }}
+    cancel-in-progress: true
+
+on:
+  schedule:
+    - cron:  '0 0 * * *'
+  push:
+    branches:
+      - master
+    paths:
+      - '**.target'
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      with:
+        fetch-depth: 0
+        ref: master
+    - name: Set up Maven
+      uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5
+      with:
+        maven-version: 3.9.7
+    - name: Set up JDK
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+        cache: maven
+    - name: Update Target Platform
+      run: >-
+          mvn -f eclipse.platform.releng.prereqs.sdk 
+          org.eclipse.tycho.extras:tycho-version-bump-plugin:4.0.9-SNAPSHOT:update-target
+          -DallowMajorUpdates=false
+          -Ddiscovery=parent
+          -Dmaven.version.rules=update-rules.xml
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@4320041ed380b20e97d388d56a7fb4f9b8c20e79 # v7.0.0
+      with:
+        commit-message: Update target-platform with latest version
+        branch: update_target
+        title: Dependency Updates
+        body: Please review the changes and merge if appropriate, or cherry pick individual updates.
+        delete-branch: true
+        draft: true
+        token: ${{ secrets.RELENG_BOT_PAT }}
+        committer: Eclipse Releng Bot <releng-bot@eclipse.org>
+        author: Eclipse Releng Bot <releng-bot@eclipse.org>
+        add-paths: |
+            **/*.target
diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
@@ -19,13 +19,13 @@ for (STREAM in STREAMS){
 # - - - Integration Eclipse SDK builds - - - 
 # 2024-06 Release Schedule
 # Normal : 6 PM every day (1/6 - 2/9)
-0 18 * * *
+# 0 18 * * *
 
 
 # Milestone/RC Schedule 
 # Post M1, no nightlies, I-builds only. (Be sure to "turn off" for tests and sign off days)
-#0 6 16-28 8 5-7,1-3
-#0 18 16-28 8 5-7,1-3
+# 0 6 16-28 8 5-7,1-3
+# 0 18 16-28 8 5-7,1-3
             """)
           }
         }

diff --git a/JenkinsJobs/JobDSL.json b/JenkinsJobs/JobDSL.json
@@ -1,8 +1,8 @@
 {
     "Streams": [
-        "4.33"
+        "4.34"
     ],
     "Branches": {
-		"4.33": "master"
+		"4.34": "master"
     }
 }
diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
@@ -51,12 +51,12 @@ FREEZE_PARAMS=" "
 PREVIOUS_RELEASE_VER="4.32"
 PREVIOUS_RELEASE_REPO_ID="4.32"
 #build id for getting repo
-BASEBUILD_ID="I20240601-0610"
+BASEBUILD_ID="R-4.32-202406010610"
 #release id for downloading eclipse
 PREVIOUS_RELEASE_ID="R-4.32-202406010610"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
-WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"
+WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
 ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.33-I-builds/"
 

diff --git a/cje-production/P-build/mb300_gatherEclipseParts.sh b/cje-production/P-build/mb300_gatherEclipseParts.sh
@@ -32,7 +32,7 @@ cp $CJE_ROOT/$AGG_DIR/eclipse-platform-parent/target/mavenproperties.properties
 
 # gather repo
 echo $PATCH_BUILD
-PATCH_BUILD_GENERIC=java22patch
+PATCH_BUILD_GENERIC=java23patch
 REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
 
 if [ -d $REPO_DIR ]; then

diff --git a/cje-production/Y-build/buildproperties.txt b/cje-production/Y-build/buildproperties.txt
@@ -21,10 +21,10 @@ PATCH_OR_BRANCH_LABEL="java23"
 BUILD_TYPE_NAME="Beta Java 23"
 BUILD_TYPE="Y"
 TESTED_BUILD_TYPE="Y"
-RELEASE_VER="4.33"
-STREAM="4.33.0"
+RELEASE_VER="4.34"
+STREAM="4.34.0"
 STREAMMajor="4"
-STREAMMinor="33"
+STREAMMinor="34"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -38,26 +38,26 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.31"
-API_PREV_REF_LABEL="4.31"
+BASEBUILDER_TAG="4.32"
+API_PREV_REF_LABEL="4.32"
 #API_FREEZE_REF_LABEL="4.33RC1"
 API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
 #FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202108251800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.32"
-PREVIOUS_RELEASE_REPO_ID="4.32"
+PREVIOUS_RELEASE_VER="4.33RC2"
+PREVIOUS_RELEASE_REPO_ID="4.33-I-builds"
 #build id for getting repo
-BASEBUILD_ID="R-4.32-202406010610"
+BASEBUILD_ID="I20240828-1820"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.32-202406010610"
+PREVIOUS_RELEASE_ID="S-4.33RC2-202408281820"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.31.0/R-3.31.0-20230903090456/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.33-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.34-I-builds/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

diff --git a/cje-production/buildproperties.txt b/cje-production/buildproperties.txt
@@ -21,10 +21,10 @@ PATCH_OR_BRANCH_LABEL="master"
 BUILD_TYPE_NAME="Integration"
 BUILD_TYPE="I"
 TESTED_BUILD_TYPE="I"
-RELEASE_VER="4.33"
-STREAM="4.33.0"
+RELEASE_VER="4.34"
+STREAM="4.34.0"
 STREAMMajor="4"
-STREAMMinor="33"
+STREAMMinor="34"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -38,26 +38,26 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.31"
-API_PREV_REF_LABEL="4.31"
+BASEBUILDER_TAG="4.33"
+API_PREV_REF_LABEL="4.33"
 #API_FREEZE_REF_LABEL="4.33RC1"
 API_FREEZE_REF_LABEL=""
 # Change to appropriate versions and uncomment when entering API freeze
 #FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-${API_FREEZE_REF_LABEL}-202208241800/eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip -DfreezeName=Eclipse-SDK-${API_FREEZE_REF_LABEL} -DfreezeFilename=eclipse-SDK-${API_FREEZE_REF_LABEL}-win32-x86_64.zip"
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.32"
-PREVIOUS_RELEASE_REPO_ID="4.32"
+PREVIOUS_RELEASE_VER="4.33RC2"
+PREVIOUS_RELEASE_REPO_ID="4.33-I-builds"
 #build id for getting repo
-BASEBUILD_ID="R-4.32-202406010610"
+BASEBUILD_ID="I20240828-1820"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.32-202406010610"
+PREVIOUS_RELEASE_ID="S-4.33RC2-202408281820"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.33.0/R-3.33.0-20240304165142/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.33-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.34-I-builds/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

diff --git a/cje-production/cleaners/cleanupNightlyRepo.sh b/cje-production/cleaners/cleanupNightlyRepo.sh
@@ -222,8 +222,8 @@ function cleanRepo ()
 workspace=$1
 remoteBase="/home/data/httpd/download.eclipse.org"
 
-eclipseIRepo="${remoteBase}/eclipse/updates/4.33-I-builds"
-eclipseYRepo="${remoteBase}/eclipse/updates/4.33-Y-builds"
+eclipseIRepo="${remoteBase}/eclipse/updates/4.34-I-builds"
+eclipseYRepo="${remoteBase}/eclipse/updates/4.34-Y-builds"
 eclipsePRepo="${remoteBase}/eclipse/updates/4.33-P-builds"
 eclipseBuildTools="${remoteBase}/eclipse/updates/buildtools"
 

diff --git a/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/Dockerfile b/cje-production/dockerfiles/centos-gtk4-mutter/9-swtBuild/Dockerfile
@@ -31,8 +31,7 @@ RUN dnf -y update && dnf -y install \
       webkit2gtk3 \
       webkit2gtk3-devel \
       gtk3-devel \
-      gtk2 \
-      gtk2-devel \
+      gtk4-devel \
       java-17-openjdk-devel \
       webkit2gtk3-devel \
       make \

diff --git a/cje-production/dockerfiles/opensuse-gtk3-metacity/15-gtk3/Dockerfile b/cje-production/dockerfiles/opensuse-gtk3-metacity/15-gtk3/Dockerfile
@@ -1,4 +1,4 @@
-FROM opensuse/leap:15@sha256:1cf79e78bb69f39fb2f78a7c2c7ebc4b64cf8d82eb1df76cd36767a595ada7a8
+FROM opensuse/leap:15@sha256:b92aba5f8413624d1a4b671dff4858e454fcbe5e38dff1880cc48241750c2e8e
 
 ### user name recognition at runtime w/ an arbitrary uid - for OpenShift deployments
 COPY scripts/uid_entrypoint /usr/local/bin/uid_entrypoint

diff --git a/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/Dockerfile b/cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:24.04@sha256:2e863c44b718727c860746568e1d54afd13b2fa71b160f5cd9058fc436217b30
+FROM ubuntu:24.04@sha256:8a37d68f4f73ebf3d4efafbcf66379bf3728902a8038616808f04e34a9ab63ee
 
 ### user name recognition at runtime w/ an arbitrary uid - for OpenShift deployments
 COPY scripts/uid_entrypoint /usr/local/bin/uid_entrypoint

diff --git a/cje-production/scripts/checkComposites/checkComposites.sh b/cje-production/scripts/checkComposites/checkComposites.sh
@@ -26,11 +26,11 @@ repoHttpAccess=https://download.eclipse.org
 repoAccess=${repoHttpAccess}
 # TODO: reduce this list soon
 repoList="\
-/eclipse/updates/4.32/ \
-/eclipse/updates/4.33-Y-builds/ \
-/eclipse/updates/4.33-P-builds/ \
 /eclipse/updates/4.33/ \
-/eclipse/updates/4.33-I-builds/ \
+/eclipse/updates/4.34-Y-builds/ \
+/eclipse/updates/4.33-P-builds/ \
+/eclipse/updates/4.34/ \
+/eclipse/updates/4.34-I-builds/ \
 "