Merge branch 'master' into master

cje-production/Y-build/buildproperties.txt

@@ -38,21 +38,21 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.29"
-API_PREV_REF_LABEL="4.29"
+BASEBUILDER_TAG="4.30"
+API_PREV_REF_LABEL="4.30"
 #API_FREEZE_REF_LABEL="4.30RC1"
 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.29"
-PREVIOUS_RELEASE_REPO_ID="4.29"
+PREVIOUS_RELEASE_VER="4.30"
+PREVIOUS_RELEASE_REPO_ID="4.30"
 #build id for getting repo
-BASEBUILD_ID="R-4.29-202309031000"
+BASEBUILD_ID="R-4.30-202312010110"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.29-202309031000"
+PREVIOUS_RELEASE_ID="R-4.30-202312010110"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.22.0/R-3.22.0-20210612170523/repositoryunittests/"

cje-production/buildproperties.txt

@@ -47,12 +47,12 @@ API_FREEZE_REF_LABEL=""
 # Otherwise set to a blank space
 FREEZE_PARAMS=" "
 
-PREVIOUS_RELEASE_VER="4.30RC2"
-PREVIOUS_RELEASE_REPO_ID="4.30-I-builds"
+PREVIOUS_RELEASE_VER="4.30"
+PREVIOUS_RELEASE_REPO_ID="4.30"
 #build id for getting repo
-BASEBUILD_ID="I20231123-1700"
+BASEBUILD_ID="R-4.30-202312010110"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="S-4.30RC2-202311231700"
+PREVIOUS_RELEASE_ID="R-4.30-202312010110"
 
 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/"

cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04@sha256:2b7412e6465c3c7fc5bb21d3e6f1917c167358449fecac8176c6e496e5c1f05f
+FROM ubuntu:22.04@sha256:8eab65df33a6de2844c9aefd19efe8ddb87b7df5e9185a4ab73af936225685bb
 
 ### user name recognition at runtime w/ an arbitrary uid - for OpenShift deployments
 COPY scripts/uid_entrypoint /usr/local/bin/uid_entrypoint

eclipse-platform-parent/pom.xml

@@ -142,7 +142,7 @@
     <tycho.useJDK>BREE</tycho.useJDK>
 
     <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30-I-builds/I20231123-1700/</previous-release.baseline>
+    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</previous-release.baseline>
 
     <!--
       Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
@@ -610,7 +610,7 @@
         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.2</version>
+            <version>3.6.3</version>
             <configuration>
                 <source>17</source>
                 <legacyMode>true</legacyMode>
@@ -737,12 +737,12 @@
         <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
         <versionRangeForPatch>[3.19.200.v20230705-1800,3.19.249.v20231213-1800)</versionRangeForPatch>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</comparator.repo>
       </properties>
       <repositories>
        <repository>
          <id>eclipse-p2-repo-java21patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.29/R-4.29-202309031000/</url>
+         <url>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</url>
          <layout>p2</layout>
        </repository>
      </repositories>
@@ -1009,7 +1009,7 @@
           <plugin>
             <groupId>com.github.spotbugs</groupId>
             <artifactId>spotbugs-maven-plugin</artifactId>
-            <version>4.8.1.0</version>
+            <version>4.8.2.0</version>
             <configuration>
               <targetJDK>${java.version}</targetJDK>
               <xmlOutput>true</xmlOutput>

eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target

@@ -118,7 +118,7 @@
 			  <dependency>
 				  <groupId>commons-io</groupId>
 				  <artifactId>commons-io</artifactId>
-				  <version>2.15.0</version>
+				  <version>2.15.1</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
@@ -130,7 +130,7 @@
 			  <dependency>
 				  <groupId>commons-logging</groupId>
 				  <artifactId>commons-logging</artifactId>
-				  <version>1.2</version>
+				  <version>1.3.0</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
@@ -172,7 +172,7 @@
 			  <dependency>
 				  <groupId>org.jsoup</groupId>
 				  <artifactId>jsoup</artifactId>
-				  <version>1.16.2</version>
+				  <version>1.17.1</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
@@ -318,13 +318,13 @@
 			  <dependency>
 				  <groupId>net.bytebuddy</groupId>
 				  <artifactId>byte-buddy-agent</artifactId>
-				  <version>1.14.9</version>
+				  <version>1.14.10</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
 				  <groupId>net.bytebuddy</groupId>
 				  <artifactId>byte-buddy</artifactId>
-				  <version>1.14.9</version>
+				  <version>1.14.10</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
@@ -336,7 +336,7 @@
 			  <dependency>
 				  <groupId>org.mockito</groupId>
 				  <artifactId>mockito-core</artifactId>
-				  <version>5.7.0</version>
+				  <version>5.8.0</version>
 				  <type>jar</type>
 			  </dependency>
 			  <dependency>
@@ -572,6 +572,16 @@
 			    <artifactId>biz.aQute.resolve</artifactId>
 			    <version>7.0.0</version>
 			</dependency>
+			<dependency>
+			    <groupId>org.bndtools</groupId>
+			    <artifactId>org.bndtools.templating</artifactId>
+			    <version>7.0.0</version>
+			</dependency>
+			<dependency>
+			    <groupId>org.bndtools</groupId>
+			    <artifactId>org.bndtools.templates.template</artifactId>
+			    <version>7.0.0</version>
+			</dependency>
 		  </dependencies>
 	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Apache Felix" missingManifest="error" type="Maven">
@@ -738,6 +748,11 @@
 				  <version>2.0.1</version>
 				  <type>jar</type>
 			  </dependency>
+			  <dependency>
+				    <groupId>jakarta.xml.bind</groupId>
+				    <artifactId>jakarta.xml.bind-api</artifactId>
+				    <version>4.0.1</version>
+				</dependency>
 		  </dependencies>
 	  </location>
   </locations>

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/equinoxp2tests.properties

@@ -5,10 +5,10 @@ org.eclipse.equinox.p2.reconciler.tests.platform.archive.linux-x86_64=\${basedir
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-${buildId}-win32-x86_64.zip
 org.eclipse.equinox.p2.reconciler.tests.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.dmg
 
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.30RC2-linux-gtk-x86_64.tar.gz
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30RC2-win32-x86_64.zip
-org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30RC2-macosx-cocoa-x86_64.dmg
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.linux-x86_64=\${basedir}/eclipse-platform-4.30-linux-gtk-x86_64.tar.gz
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.win32-x86_64=\${basedir}\\\\eclipse-platform-4.30-win32-x86_64.zip
+org.eclipse.equinox.p2.reconciler.tests.lastrelease.platform.archive.macosx-x86_64=\${basedir}/eclipse-platform-4.30-macosx-cocoa-x86_64.dmg
 
 org.eclipse.equinox.p2.tests.current.build.repo=https://download.eclipse.org/eclipse/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-builds/${buildId}
-org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/S-4.30RC2-202311231700/
+org.eclipse.equinox.p2.tests.last.release.build.repo=https://download.eclipse.org/equinox/drops/R-4.30-202312010110/
 

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/resources/label.properties

@@ -5,4 +5,4 @@ buildId=${buildId}
 # such as "4.5" instead of "4.5.0".
 eclipseStream=${releaseNumberSDK}
 # similar for previous release version
-previousReleaseVersion=4.30RC2
+previousReleaseVersion=4.30

eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/getPreviousRelease.sh

@@ -7,9 +7,9 @@
 
 
 mkdir -p workarea/${buildId}/eclipse-testing
-cp /home/files/buildzips/oxygen/R/S-4.30RC2-202311231700//eclipse-platform-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
+cp /home/files/buildzips/oxygen/R/R-4.30-202312010110//eclipse-platform-4.30-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/platformLocation/
 
-cp /home/files/buildzips/oxygen/R/S-4.30RC2-202311231700//eclipse-SDK-4.30RC2-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
+cp /home/files/buildzips/oxygen/R/R-4.30-202312010110//eclipse-SDK-4.30-linux-gtk-x86_64.tar.gz ./workarea/${buildId}/eclipse-testing/
 
 cp eclipse-junit-tests-${buildId}.zip workarea/${buildId}/eclipse-testing/
 

eclipse.platform.releng/features/org.eclipse.test-feature/forceQualifierUpdate.txt

@@ -39,4 +39,5 @@ Update bytebuddy to 1.14.8
 Update bytebuddy to 1.14.9
 Update Mockito to 5.6.0 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1443
 Update Mockito to 5.7.0
-Update org.junit.platform 1.10.1 and org.junit.vintage 5.10.1 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1512
+Update org.junit.platform 1.10.1 and org.junit.vintage 5.10.1 https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/pull/1512
+Update Mockito to 5.8.0 and bytebuddy to 1.14.10

oomph/Platform.setup

@@ -829,7 +829,7 @@
       <repository
           url="https://download.eclipse.org/technology/m2e/snapshots/latest"/>
       <repository
-          url="https://download.eclipse.org/webtools/CI/3.32.0/I-latest/repository"/>
+          url="https://download.eclipse.org/webtools/CI/3.33.0/I-latest/repository"/>
     </setupTask>
     <stream
         name="master"

production/testScripts/configuration/streamSpecific.properties

@@ -11,16 +11,16 @@ streamSpecificPropertiesTitle="Properties for 4.31.0 builds and tests"
 # stable version of Eclipse, that is used, for example, for it's p2
 # director, etc., so that "running the tests" is not actually using
 # the "just built" versions.
-previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.30RC2-202311231700/
+previousReleaseLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.30-202312010110/
 # version here is "build label" ... in general form, the "middle" of archive name,
 # such as  "eclipse-platform-${previousReleaseVersion}-linux-gtk-x86_64.tar.gz
 # Also used used in p2 testing?
-previousReleaseVersion=4.30RC2
+previousReleaseVersion=4.30
 # This is last segment of last release repo, such as in
 #  http://${ARCHIVE_HOST}/eclipse/updates/${previousReleaseVersion}
 # NOTE: I am assuming the "composite" repo is suitable for p2. In theory,
 # they might want the simple repo, such as at 4.4/R-4.4.1-201409250400
-previousReleaseVersionRepo=4.30-I-builds
+previousReleaseVersionRepo=4.30
 
 # Note: API tests needs the _base_ of previous release, and also the previous service release
 # Bug 378587 - update releng tests (data) to go work against previous release
@@ -34,12 +34,12 @@ apiTestsPreviousRefererenceWin32Filename=obsoleteAndNotUsed
 # baselinePerf=true
 # are specified. The baselinePerf will often be the same as "previous release", but
 # not necessarily, so is not hard coded in assumptions.
-baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.30RC2-202311231700
+baselinePerfLocation=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.30-202312010110
 # NOTE: value must match baselineCode in testScripts/updateTestResultsPages.sh
-baselinePerfVersion=S-4.30RC2-202311231700
+baselinePerfVersion=R-4.30-202312010110
 # TODO: could/should eventually "compute" label, from full version?
 baselinePerfVersionLabel=4.30
-baselinePerfBuildId=I20231123-1700
+baselinePerfBuildId=I20231201-0110
 
 # We currently set here, but would be better to compute this value 
 # by peeking in the "to be tested" tar file. 

production/testScripts/updateTestResultsPages.sh

@@ -295,7 +295,7 @@ then
 
   # TODO: avoid this hard coding of baseline value
   # NOTE: value must start with a letter match baselinePerfVersion in testScripts/configuration/streamSpecific.properties
-  baselineCode="S-4.30RC2-202311231700"
+  baselineCode="R-4.30-202312010110"
   # to get time stamp, first remove initial IMN:
   baselineForBuildSuffix=${buildId/[IMN]/}
   #Then remove final '-' in build id