Updates for PBuild Java22 (#1821)

1. Created java22patch maven profile. 2. Targeted RC1 repository with jdt feature version from RC1 (https://www.eclipse.org/downloads/download.php?file=/eclipse/updates/4.31-I-builds/I20240221-1800/plugins/org.eclipse.jdt_3.19.400.v20240221-1800.jar) 3. Updated patch version range. 4. Used RC1 repository for the targeted build. Tracked in #1820
eclipse-platform · Feb 23, 2024 · 0a4e735 · 0a4e735
1 parent 2c1b3f0
commit 0a4e735
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 48 deletions.
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
@@ -744,36 +744,36 @@
   </build>
   <profiles>
    <profile>
-      <id>java21patch</id>
+      <id>java22patch</id>
       <properties>
-        <tycho.buildqualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA21'</tycho.buildqualifier.format>
+        <tycho.buildqualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA22'</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
-          .../java21patch/org.eclipse.jdt.java21patch/feature.xml
+          .../java22patch/org.eclipse.jdt.java22patch/feature.xml
           and
-          .../java21patch/org.eclipse.jdt-feature-dummy/feature.xml
+          .../java22patch/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/Java21
+          https://wiki.eclipse.org/Java22
         -->
         <!-- This needs the version of the feature to be patched. -->
-        <featureToPatchVersion>3.19.200.v20230705-1800</featureToPatchVersion>
+        <featureToPatchVersion>3.19.400.v20240221-1800</featureToPatchVersion>
         <!-- 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>
+        <versionRangeForPatch>[3.19.400.v20240221-1800,3.19.449.v20240612-1800)</versionRangeForPatch>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240221-1800/</comparator.repo>
       </properties>
       <repositories>
        <repository>
-         <id>eclipse-p2-repo-java21patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/</url>
+         <id>eclipse-p2-repo-java22patch</id>
+         <url>https://download.eclipse.org/eclipse/updates/4.31-I-builds/I20240221-1800/</url>
          <layout>p2</layout>
        </repository>
      </repositories>

diff --git a/...releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml b/...releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml
diff --git a/...ng.repository.java21patch/antrunbuild.xml → ...ng.repository.java22patch/antrunbuild.xml b/...ng.repository.java21patch/antrunbuild.xml → ...ng.repository.java22patch/antrunbuild.xml
diff --git a/...releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml b/...releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.jdt.java22patch" version="0.0.0" patch="true">
+      <category name="Eclipse Java 22 support for 2024-03 development stream"/>
+   </feature>
+   <feature id="org.eclipse.jdt.java22patch.source" version="0.0.0" patch="true">
+      <category name="Eclipse Java 22 support for 2024-03 development stream"/>
+   </feature>
+   <category-def name="Eclipse Java 22 support for 2024-03 development stream" label="Eclipse Java 22 support for 2024-03 development stream">
+      <description>
+         Eclipse Java 22 support for 2024-03 development stream.
+      </description>
+   </category-def>
+</site>
diff --git a/...ository.java21patch/patchMatchVersion.xsl → ...ository.java22patch/patchMatchVersion.xsl b/...ository.java21patch/patchMatchVersion.xsl → ...ository.java22patch/patchMatchVersion.xsl
diff --git a/...pse.releng.repository.java21patch/pom.xml → ...pse.releng.repository.java22patch/pom.xml b/...pse.releng.repository.java21patch/pom.xml → ...pse.releng.repository.java22patch/pom.xml
@@ -16,13 +16,13 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java21patch</artifactId>
+    <artifactId>eclipse.platform.releng.java22patch</artifactId>
     <version>4.31.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.releng</groupId>
-  <artifactId>eclipse.releng.repository.java21patch</artifactId>
+  <artifactId>eclipse.releng.repository.java22patch</artifactId>
   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
@@ -158,7 +158,7 @@
         <version>${tycho.version}</version>
         <executions>
           <execution>
-            <id>categories-java21patch</id>
+            <id>categories-java22patch</id>
             <phase>package</phase>
             <goals>
               <goal>publish-categories</goal>
@@ -175,22 +175,22 @@
         </configuration>
         <executions>
           <execution>
-            <id>assemble-java21patch</id>
+            <id>assemble-java22patch</id>
             <phase>package</phase>
             <configuration>
-              <repositoryName>Java 21 support</repositoryName>
-              <finalName>Java21PatchRepo</finalName>
+              <repositoryName>Java 22 support</repositoryName>
+              <finalName>Java22PatchRepo</finalName>
             </configuration>
             <goals>
               <goal>assemble-repository</goal>
             </goals>
           </execution>
           <execution>
-            <id>archive-java21patch</id>
+            <id>archive-java22patch</id>
             <phase>pre-integration-test</phase>
             <configuration>
-              <repositoryName>Java 21 support</repositoryName>
-              <finalName>Java21PatchRepo</finalName>
+              <repositoryName>Java 22 support</repositoryName>
+              <finalName>Java22PatchRepo</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, 2023 IBM Corporation and others.\n\
+Copyright (c) 2000, 2024 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.200.v20230705-1800"
+      version="3.19.400.v20240221-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
@@ -13,12 +13,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java21patch</artifactId>
+    <artifactId>eclipse.platform.releng.java22patch</artifactId>
     <version>4.31.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt</artifactId>
-  <version>3.19.200.v20230705-1800</version>
+  <version>3.19.400.v20240221-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/...java21patch/org.eclipse.jdt.dummy/pom.xml → ...java22patch/org.eclipse.jdt.dummy/pom.xml b/...java21patch/org.eclipse.jdt.dummy/pom.xml → ...java22patch/org.eclipse.jdt.dummy/pom.xml
@@ -13,7 +13,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java21patch</artifactId>
+    <artifactId>eclipse.platform.releng.java22patch</artifactId>
     <version>4.31.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>

diff --git a/....eclipse.jdt.java21patch/build.properties → ....eclipse.jdt.java22patch/build.properties b/....eclipse.jdt.java21patch/build.properties → ....eclipse.jdt.java22patch/build.properties
diff --git a/...clipse.jdt.java21patch/feature.properties → ...clipse.jdt.java22patch/feature.properties b/...clipse.jdt.java21patch/feature.properties → ...clipse.jdt.java22patch/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2023 IBM Corporation and others.
+# Copyright (c) 2024 IBM Corporation and others.
 #
 # This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License 2.0
@@ -18,17 +18,17 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse JDT (Java Development Tools) Patch with Java 21 support for 2023-09 development stream
+featureName=Eclipse JDT (Java Development Tools) Patch with Java 22 support for 2024-03 development stream
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
 # "description" property - description of the feature
-description=Eclipse Java 21 support for 2023-09 development stream.\n
+description=Eclipse Java 22 support for 2024-03 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2023 IBM Corporation and others.\n\
+Copyright (c) 2000, 2024 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/...h/org.eclipse.jdt.java21patch/feature.xml → ...h/org.eclipse.jdt.java22patch/feature.xml b/...h/org.eclipse.jdt.java21patch/feature.xml → ...h/org.eclipse.jdt.java22patch/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.jdt.java21patch"
+      id="org.eclipse.jdt.java22patch"
       label="%featureName"
       version="1.2.300.qualifier"
       provider-name="%providerName"
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.19.200.v20230705-1800" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.19.400.v20240221-1800" patch="true"/>
    </requires>
 
    <plugin

diff --git a/....jdt.java21patch/forceQualifierUpdate.txt → ....jdt.java22patch/forceQualifierUpdate.txt b/....jdt.java21patch/forceQualifierUpdate.txt → ....jdt.java22patch/forceQualifierUpdate.txt
diff --git a/...patch/org.eclipse.jdt.java21patch/pom.xml → ...patch/org.eclipse.jdt.java22patch/pom.xml b/...patch/org.eclipse.jdt.java21patch/pom.xml → ...patch/org.eclipse.jdt.java22patch/pom.xml
@@ -20,7 +20,7 @@
     <version>4.31.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
-  <artifactId>org.eclipse.jdt.java21patch</artifactId>
+  <artifactId>org.eclipse.jdt.java22patch</artifactId>
   <version>1.2.300-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 

diff --git a/.../sourceTemplateFeature/feature.properties → .../sourceTemplateFeature/feature.properties b/.../sourceTemplateFeature/feature.properties → .../sourceTemplateFeature/feature.properties
@@ -18,17 +18,17 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 21 support for 2023-12 development stream
+featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 22 support for 2024-03 development stream
 
 # "providerName" property - name of the company that provides the feature
 providerName=Eclipse.org
 
 # "description" property - description of the feature
-description=Eclipse Java 21 support for 2023-12 development stream.\n
+description=Eclipse Java 22 support for 2024-03 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2023 IBM Corporation and others.\n\
+Copyright (c) 2000, 2024 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/....java21patch/sourceTemplateFeature/p2.inf → ....java22patch/sourceTemplateFeature/p2.inf b/....java21patch/sourceTemplateFeature/p2.inf → ....java22patch/sourceTemplateFeature/p2.inf
diff --git a/...g.tychoeclipsebuilder/java21patch/pom.xml → ...g.tychoeclipsebuilder/java22patch/pom.xml b/...g.tychoeclipsebuilder/java21patch/pom.xml → ...g.tychoeclipsebuilder/java22patch/pom.xml