Updates for PBuild Java 21

tracked in #1213
eclipse-platform · Jul 12, 2023 · 3372326 · 3372326
1 parent 3cae09f
commit 3372326
Show file tree

Hide file tree

Showing 29 changed files with 108 additions and 143 deletions.
diff --git a/JenkinsJobs/YBuilds/P_build.groovy b/JenkinsJobs/YBuilds/P_build.groovy
@@ -325,13 +325,13 @@ spec:
         failure {
             emailext body: "Please go to <a href='${BUILD_URL}console'>${BUILD_URL}console</a> and check the build failure.<br><br>",
             subject: "${env.RELEASE_VER.trim()} P-Build: ${env.BUILD_IID.trim()} - BUILD FAILED", 
-            to: "rahul.mohanan@ibm.com jarthana@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com",
+            to: "rahul.mohanan@ibm.com jarthana@in.ibm.com Sheena.Sheena@ibm.com alshama.m.s@ibm.com elsa.zacharia@ibm.com suby.surendran@ibm.com gpunathi@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com",
             from:"genie.releng@eclipse.org"
         }
         success {
             emailext body: "Software site repository:<br>    <a href='https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-P-builds'>https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-P-builds</a><br><br>Specific (simple) site repository:<br>    <a href='https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-P-builds/${env.BUILD_IID.trim()}'>https://download.eclipse.org/eclipse/updates/${env.RELEASE_VER.trim()}-P-builds/${env.BUILD_IID.trim()}</a><br><br>", 
             subject: "${env.RELEASE_VER.trim()} P-Build: ${env.BUILD_IID.trim()}", 
-            to: "rahul.mohanan@ibm.com jarthana@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com",
+            to: "rahul.mohanan@ibm.com jarthana@in.ibm.com Sheena.Sheena@ibm.com alshama.m.s@ibm.com elsa.zacharia@ibm.com suby.surendran@ibm.com gpunathi@in.ibm.com sravankumarl@in.ibm.com kalyan_prasad@in.ibm.com lshanmug@in.ibm.com manoj.palat@in.ibm.com niraj.modi@in.ibm.com noopur_gupta@in.ibm.com sarika.sinha@in.ibm.com vikas.chandra@in.ibm.com",
             from:"genie.releng@eclipse.org"
         }
 	}

diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
@@ -17,15 +17,15 @@
 
 # CJE build variables
 BRANCH="master"
-PATCH_OR_BRANCH_LABEL="java20patch"
-PATCH_BUILD="java20patch"
-BUILD_TYPE_NAME="Beta Java 20"
+PATCH_OR_BRANCH_LABEL="java21patch"
+PATCH_BUILD="java21patch"
+BUILD_TYPE_NAME="Beta Java 21"
 BUILD_TYPE="P"
 TESTED_BUILD_TYPE="P"
-RELEASE_VER="4.27"
-STREAM="4.27.0"
+RELEASE_VER="4.29"
+STREAM="4.29.0"
 STREAMMajor="4"
-STREAMMinor="27"
+STREAMMinor="29"
 STREAMService="0"
 GIT_ROOT="git@github.com:"
 AGG_REPO="eclipse-platform/eclipse.platform.releng.aggregator.git"
@@ -39,26 +39,26 @@ BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
 LOCAL_REPO="localMavenRepo"
 
 # Base builder parameters
-BASEBUILDER_TAG="4.26"
-API_PREV_REF_LABEL="4.26"
-#API_FREEZE_REF_LABEL="4.26RC1"
+BASEBUILDER_TAG="4.28"
+API_PREV_REF_LABEL="4.28"
+#API_FREEZE_REF_LABEL="4.28RC1"
 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.26"
-PREVIOUS_RELEASE_REPO_ID="4.26"
+PREVIOUS_RELEASE_VER="4.28"
+PREVIOUS_RELEASE_REPO_ID="4.28"
 #build id for getting repo
-BASEBUILD_ID="R-4.26-202211231800"
+BASEBUILD_ID="R-4.28-202306050440"
 #release id for downloading eclipse
-PREVIOUS_RELEASE_ID="R-4.26-202211231800"
+PREVIOUS_RELEASE_ID="R-4.28-202306050440"
 
 BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
 WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.27.0/R-3.27.0-20220829002010/repositoryunittests/"
 BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.28-I-builds/"
+ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.29-I-builds/"
 
 #Maven parameters
 MAVEN_OPTS="-Xmx6G"

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=java20patch
+PATCH_BUILD_GENERIC=java21patch
 REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
 
 if [ -d $REPO_DIR ]; then

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
@@ -600,36 +600,36 @@
   </build>
   <profiles>
    <profile>
-      <id>java20patch</id>
+      <id>java21patch</id>
       <properties>
-        <tycho.buildqualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA20'</tycho.buildqualifier.format>
+        <tycho.buildqualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA21'</tycho.buildqualifier.format>
 
         <featureToPatch>org.eclipse.jdt</featureToPatch>
 
         <!--
           For future versions, in addition to changing this value of "featureToPatchVersion",
           the same value needs to be edited in
-          .../java20patch/org.eclipse.jdt.java20patch/feature.xml
+          .../java21patch/org.eclipse.jdt.java21patch/feature.xml
           and
-          .../java20patch/org.eclipse.jdt-feature-dummy/feature.xml
+          .../java21patch/org.eclipse.jdt-feature-dummy/feature.xml
           and it of course, must "match" what ever version was produced by the build specified
           a few lines below, as the eclipse-p2-repo-java20patch p2 repository, as well as the lower
           bound, in 'versionRangeForPatch'.
  
           Also, when new patch created, should update the wiki at
-          https://wiki.eclipse.org/Java20
+          https://wiki.eclipse.org/Java21
         -->
         <!-- This needs the version of the feature to be patched. -->
-        <featureToPatchVersion>3.19.0.v20230302-0300</featureToPatchVersion>
+        <featureToPatchVersion>3.19.200.v20230705-1800</featureToPatchVersion>
         <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
-        <versionRangeForPatch>[3.19.0.v20230302-0300,3.19.49.v20230604-1800)</versionRangeForPatch>
+        <versionRangeForPatch>[3.19.200.v20230705-1800,3.19.249.v20230905-1800)</versionRangeForPatch>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.28/R-4.28-202306050440/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230705-1800/</comparator.repo>
       </properties>
       <repositories>
        <repository>
-         <id>eclipse-p2-repo-java20patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.28/R-4.28-202306050440/</url>
+         <id>eclipse-p2-repo-java21patch</id>
+         <url>https://download.eclipse.org/eclipse/updates/4.29-I-builds/I20230705-1800/</url>
          <layout>p2</layout>
        </repository>
      </repositories>

diff --git a/...releng.tychoeclipsebuilder/java20patch/eclipse.releng.repository.java20patch/category.xml b/...releng.tychoeclipsebuilder/java20patch/eclipse.releng.repository.java20patch/category.xml
diff --git a/...e.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt.java20patch/feature.xml b/...e.platform.releng.tychoeclipsebuilder/java20patch/org.eclipse.jdt.java20patch/feature.xml
diff --git a/...ng.repository.java20patch/antrunbuild.xml → ...ng.repository.java21patch/antrunbuild.xml b/...ng.repository.java20patch/antrunbuild.xml → ...ng.repository.java21patch/antrunbuild.xml
diff --git a/...releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml b/...releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.jdt.java21patch" version="0.0.0" patch="true">
+      <category name="Eclipse Java 21 support for 2023-09 development stream"/>
+   </feature>
+   <feature id="org.eclipse.jdt.java21patch.source" version="0.0.0" patch="true">
+      <category name="Eclipse Java 21 support for 2023-09 development stream"/>
+   </feature>
+   <category-def name="Eclipse Java 21 support for 2023-09 development stream" label="Eclipse Java 21 support for 2023-09 development stream">
+      <description>
+         Eclipse Java 21 support for 2023-09 development stream.
+      </description>
+   </category-def>
+</site>
diff --git a/...ository.java20patch/patchMatchVersion.xsl → ...ository.java21patch/patchMatchVersion.xsl b/...ository.java20patch/patchMatchVersion.xsl → ...ository.java21patch/patchMatchVersion.xsl
diff --git a/...pse.releng.repository.java20patch/pom.xml → ...pse.releng.repository.java21patch/pom.xml b/...pse.releng.repository.java20patch/pom.xml → ...pse.releng.repository.java21patch/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2022 Eclipse Foundation and others.
+  Copyright (c) 2023 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -16,13 +16,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java20patch</artifactId>
+    <artifactId>eclipse.platform.releng.java21patch</artifactId>
     <version>4.29.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.releng</groupId>
-  <artifactId>eclipse.releng.repository.java20patch</artifactId>
+  <artifactId>eclipse.releng.repository.java21patch</artifactId>
   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
@@ -158,7 +158,7 @@
         <version>${tycho.version}</version>
         <executions>
           <execution>
-            <id>categories-java20patch</id>
+            <id>categories-java21patch</id>
             <phase>package</phase>
             <goals>
               <goal>publish-categories</goal>
@@ -175,22 +175,22 @@
         </configuration>
         <executions>
           <execution>
-            <id>assemble-java20patch</id>
+            <id>assemble-java21patch</id>
             <phase>package</phase>
             <configuration>
-              <repositoryName>Early Access of Java 20 support</repositoryName>
-              <finalName>Java20EarlyAccessPatchRepo</finalName>
+              <repositoryName>Early Access of Java 21 support</repositoryName>
+              <finalName>Java21EarlyAccessPatchRepo</finalName>
             </configuration>
             <goals>
               <goal>assemble-repository</goal>
             </goals>
           </execution>
           <execution>
-            <id>archive-java20patch</id>
+            <id>archive-java21patch</id>
             <phase>pre-integration-test</phase>
             <configuration>
-              <repositoryName>Early Access of Java 20 support</repositoryName>
-              <finalName>Java20EarlyAccessPatchRepo</finalName>
+              <repositoryName>Early Access of Java 21 support</repositoryName>
+              <finalName>Java21EarlyAccessPatchRepo</finalName>
             </configuration>
             <goals>
               <goal>archive-repository</goal>

diff --git a/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs b/...settings/org.eclipse.core.resources.prefs → ...settings/org.eclipse.core.resources.prefs
diff --git a/.../.settings/org.eclipse.core.runtime.prefs → .../.settings/org.eclipse.core.runtime.prefs b/.../.settings/org.eclipse.core.runtime.prefs → .../.settings/org.eclipse.core.runtime.prefs
diff --git a/...clipse.jdt-feature-dummy/build.properties → ...clipse.jdt-feature-dummy/build.properties b/...clipse.jdt-feature-dummy/build.properties → ...clipse.jdt-feature-dummy/build.properties
diff --git a/...ipse.jdt-feature-dummy/feature.properties → ...ipse.jdt-feature-dummy/feature.properties b/...ipse.jdt-feature-dummy/feature.properties → ...ipse.jdt-feature-dummy/feature.properties
@@ -28,7 +28,7 @@ description=Dummy feature for build-time constraint.
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2021 IBM Corporation and others.\n\
+Copyright (c) 2000, 2023 IBM Corporation and others.\n\
 \n\
 This program and the accompanying materials\n\
 are made available under the terms of the Eclipse Public License 2.0\n\

diff --git a/...org.eclipse.jdt-feature-dummy/feature.xml → ...org.eclipse.jdt-feature-dummy/feature.xml b/...org.eclipse.jdt-feature-dummy/feature.xml → ...org.eclipse.jdt-feature-dummy/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jdt"
       label="%featureName"
-      version="3.19.0.v20230302-0300"
+      version="3.19.200.v20230705-1800"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

diff --git a/...dt-feature-dummy/forceQualifierUpdate.txt → ...dt-feature-dummy/forceQualifierUpdate.txt b/...dt-feature-dummy/forceQualifierUpdate.txt → ...dt-feature-dummy/forceQualifierUpdate.txt
diff --git a/...tch/org.eclipse.jdt-feature-dummy/pom.xml → ...tch/org.eclipse.jdt-feature-dummy/pom.xml b/...tch/org.eclipse.jdt-feature-dummy/pom.xml → ...tch/org.eclipse.jdt-feature-dummy/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2021 Eclipse Foundation and others.
+  Copyright (c) 2023 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt</artifactId>
-  <version>3.19.0.v20230302-0300</version>
+  <version>3.19.200.v20230705-1800</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/...ummy/.settings/org.eclipse.jdt.core.prefs → ...ummy/.settings/org.eclipse.jdt.core.prefs b/...ummy/.settings/org.eclipse.jdt.core.prefs → ...ummy/.settings/org.eclipse.jdt.core.prefs
diff --git a/...rg.eclipse.jdt.dummy/META-INF/MANIFEST.MF → ...rg.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/...rg.eclipse.jdt.dummy/META-INF/MANIFEST.MF → ...rg.eclipse.jdt.dummy/META-INF/MANIFEST.MF
diff --git a/...ch/org.eclipse.jdt.dummy/build.properties → ...ch/org.eclipse.jdt.dummy/build.properties b/...ch/org.eclipse.jdt.dummy/build.properties → ...ch/org.eclipse.jdt.dummy/build.properties
diff --git a/...java20patch/org.eclipse.jdt.dummy/pom.xml → ...java21patch/org.eclipse.jdt.dummy/pom.xml b/...java20patch/org.eclipse.jdt.dummy/pom.xml → ...java21patch/org.eclipse.jdt.dummy/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2021 Eclipse Foundation and others.
+  Copyright (c) 2023 Eclipse Foundation and others.
   All rights reserved. This program and the accompanying materials
   are made available under the terms of the Eclipse Distribution License v1.0
   which accompanies this distribution, and is available at
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java20patch</artifactId>
+    <artifactId>eclipse.platform.releng.java21patch</artifactId>
     <version>4.29.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>

diff --git a/....eclipse.jdt.java20patch/build.properties → ....eclipse.jdt.java21patch/build.properties b/....eclipse.jdt.java20patch/build.properties → ....eclipse.jdt.java21patch/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2021 IBM Corporation and others.
+# Copyright (c) 2023 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0

diff --git a/...clipse.jdt.java20patch/feature.properties → ...clipse.jdt.java21patch/feature.properties b/...clipse.jdt.java20patch/feature.properties → ...clipse.jdt.java21patch/feature.properties
@@ -18,13 +18,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse JDT (Java Development Tools) Patch with Java 20 support for 2023-03 development stream
+featureName=Eclipse JDT (Java Development Tools) Patch with Java 21 support for 2023-09 development stream
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
 # "description" property - description of the feature
-description=Eclipse Java 20 support for 2023-03 development stream.\n
+description=Eclipse Java 21 support for 2023-09 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\