From 0a4e735cb3362f1b78ff7c0767b62620f80de2ef Mon Sep 17 00:00:00 2001
From: Rahul Mohanan <121536011+MohananRahul@users.noreply.github.com>
Date: Fri, 23 Feb 2024 16:28:46 +0530
Subject: [PATCH] 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
https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1820
---
 eclipse-platform-parent/pom.xml               | 20 +++++++++----------
 .../category.xml                              | 14 -------------
 .../antrunbuild.xml                           |  0
 .../category.xml                              | 14 +++++++++++++
 .../patchMatchVersion.xsl                     |  0
 .../pom.xml                                   | 18 ++++++++---------
 .../org.eclipse.core.resources.prefs          |  0
 .../.settings/org.eclipse.core.runtime.prefs  |  0
 .../build.properties                          |  0
 .../feature.properties                        |  2 +-
 .../org.eclipse.jdt-feature-dummy/feature.xml |  2 +-
 .../forceQualifierUpdate.txt                  |  0
 .../org.eclipse.jdt-feature-dummy/pom.xml     |  4 ++--
 .../.settings/org.eclipse.jdt.core.prefs      |  0
 .../META-INF/MANIFEST.MF                      |  0
 .../org.eclipse.jdt.dummy/build.properties    |  0
 .../org.eclipse.jdt.dummy/pom.xml             |  2 +-
 .../build.properties                          |  0
 .../feature.properties                        |  8 ++++----
 .../org.eclipse.jdt.java22patch}/feature.xml  |  4 ++--
 .../forceQualifierUpdate.txt                  |  0
 .../org.eclipse.jdt.java22patch}/pom.xml      |  2 +-
 .../sourceTemplateFeature/feature.properties  |  6 +++---
 .../sourceTemplateFeature/p2.inf              |  0
 .../{java21patch => java22patch}/pom.xml      |  0
 25 files changed, 48 insertions(+), 48 deletions(-)
 delete mode 100644 eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/eclipse.releng.repository.java21patch => java22patch/eclipse.releng.repository.java22patch}/antrunbuild.xml (100%)
 create mode 100644 eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/eclipse.releng.repository.java21patch => java22patch/eclipse.releng.repository.java22patch}/patchMatchVersion.xsl (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/eclipse.releng.repository.java21patch => java22patch/eclipse.releng.repository.java22patch}/pom.xml (92%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/build.properties (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/feature.properties (96%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/feature.xml (92%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt-feature-dummy/pom.xml (89%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt.dummy/build.properties (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/org.eclipse.jdt.dummy/pom.xml (95%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/build.properties (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/feature.properties (87%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/feature.xml (86%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/forceQualifierUpdate.txt (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/pom.xml (97%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/sourceTemplateFeature/feature.properties (90%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch/org.eclipse.jdt.java21patch => java22patch/org.eclipse.jdt.java22patch}/sourceTemplateFeature/p2.inf (100%)
 rename eclipse.platform.releng.tychoeclipsebuilder/{java21patch => java22patch}/pom.xml (100%)

diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index 12fd432bd88..524dcaf3f6f 100644
--- 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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml
deleted file mode 100644
index 1685dbd4e46..00000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/category.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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-12 development stream"/>
-   </feature>
-   <feature id="org.eclipse.jdt.java21patch.source" version="0.0.0" patch="true">
-      <category name="Eclipse Java 21 support for 2023-12 development stream"/>
-   </feature>
-   <category-def name="Eclipse Java 21 support for 2023-12 development stream" label="Eclipse Java 21 support for 2023-12 development stream">
-      <description>
-         Eclipse Java 21 support for 2023-12 development stream.
-      </description>
-   </category-def>
-</site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/antrunbuild.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/antrunbuild.xml
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/antrunbuild.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/antrunbuild.xml
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/category.xml
new file mode 100644
index 00000000000..dc009852b12
--- /dev/null
+++ b/eclipse.platform.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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/patchMatchVersion.xsl b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/patchMatchVersion.xsl
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/patchMatchVersion.xsl
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/patchMatchVersion.xsl
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/pom.xml
similarity index 92%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.releng.repository.java22patch/pom.xml
index 4c0475db066..b9824af51ba 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/eclipse.releng.repository.java21patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/eclipse.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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/build.properties
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/build.properties
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.properties
similarity index 96%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.properties
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.properties
index c845deb3b2f..b6988a9c87d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.xml
similarity index 92%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/feature.xml
index ecc16a0c8a3..a43365fe622 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/pom.xml
similarity index 89%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt-feature-dummy/pom.xml
index fc9abad52a3..c82f4b733de 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt-feature-dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/build.properties
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/build.properties
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/pom.xml
similarity index 95%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.dummy/pom.xml
index a3b9dcf3c66..11887254947 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/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.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/build.properties
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/build.properties
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.properties
similarity index 87%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.properties
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.properties
index 9c1c533ae23..9b616c0726e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.xml
similarity index 86%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/feature.xml
index c25bb516d2b..114f4ae238c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/forceQualifierUpdate.txt
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/forceQualifierUpdate.txt
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/forceQualifierUpdate.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/pom.xml
similarity index 97%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/pom.xml
index b1981ec1acd..0a5110cea60 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/feature.properties
similarity index 90%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/feature.properties
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/feature.properties
index 07f28714b14..6cdd8830bc8 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/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/eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/p2.inf
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/org.eclipse.jdt.java21patch/sourceTemplateFeature/p2.inf
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/org.eclipse.jdt.java22patch/sourceTemplateFeature/p2.inf
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java21patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java22patch/pom.xml
similarity index 100%
rename from eclipse.platform.releng.tychoeclipsebuilder/java21patch/pom.xml
rename to eclipse.platform.releng.tychoeclipsebuilder/java22patch/pom.xml