49 files changed, 132 insertions, 176 deletions
diff --git a/cje-production/P-build/buildproperties.txt b/cje-production/P-build/buildproperties.txt
index e12a34ccb..f31552cbd 100644
--- a/cje-production/P-build/buildproperties.txt
+++ b/cje-production/P-build/buildproperties.txt
@@ -1,5 +1,5 @@
 #*******************************************************************************
-# Copyright (c) 2020 IBM Corporation and others.
+# Copyright (c) 2021 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/cje-production/P-build/mb300_gatherEclipseParts.sh b/cje-production/P-build/mb300_gatherEclipseParts.sh
index 6bf94fa75..7822eceef 100755
--- 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=java15patch
+PATCH_BUILD_GENERIC=java16patch
 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/mbscripts/mb300_gatherEclipseParts.sh b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
index a98e0c6ac..d5f570441 100755
--- a/cje-production/mbscripts/mb300_gatherEclipseParts.sh
+++ b/cje-production/mbscripts/mb300_gatherEclipseParts.sh
@@ -38,7 +38,7 @@ echo $PATCH_BUILD
 if [ -z $PATCH_BUILD ]; then
   REPO_DIR=$PLATFORM_REPO_DIR
 else
-  PATCH_BUILD_GENERIC=java15patch
+  PATCH_BUILD_GENERIC=java16patch
   REPO_DIR=$ECLIPSE_BUILDER_DIR/$PATCH_BUILD/eclipse.releng.repository.$PATCH_BUILD_GENERIC/target/repository
 fi
   
diff --git a/cje-production/streams/repositories_java15patch.txt b/cje-production/streams/repositories_java15patch.txt
deleted file mode 100644
index 3dabce8b1..000000000
--- a/cje-production/streams/repositories_java15patch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-eclipse.jdt.core: BETA_JAVA15
-eclipse.jdt.debug: BETA_JAVA15
-eclipse.jdt: BETA_JAVA15
-eclipse.jdt.ui: BETA_JAVA15
-eclipse.pde.build: BETA_JAVA15
-eclipse.pde.ui: BETA_JAVA15
diff --git a/cje-production/streams/repositories_java16patch.txt b/cje-production/streams/repositories_java16patch.txt
new file mode 100644
index 000000000..e9dd0543c
--- /dev/null
+++ b/cje-production/streams/repositories_java16patch.txt
@@ -0,0 +1,3 @@
+eclipse.jdt.core: BETA_JAVA16
+eclipse.jdt.ui: BETA_JAVA16
+eclipse.pde.build: BETA_JAVA16
diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
index c76282ecd..6d57fb611 100644
--- a/eclipse-platform-parent/pom.xml
+++ b/eclipse-platform-parent/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2012, 2020 Eclipse Foundation and others.
+  Copyright (c) 2012, 2021 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
@@ -560,9 +560,9 @@
   </build>
   <profiles>
    <profile>
-        <id>java15patch</id>
+      <id>java16patch</id>
       <properties>
-        <qualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA15'</qualifier.format>
+        <qualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA16'</qualifier.format>
  
         <featureToPatch>org.eclipse.jdt</featureToPatch>
         <featureToPatchPDE>org.eclipse.pde</featureToPatchPDE>
@@ -570,29 +570,29 @@
         <!--
           For future versions, in addition to changing this value of "featureToPatchVersion",
           the same value needs to be edited in
-          .../java15patch/org.eclipse.jdt.java15patch/feature.xml
+          .../java16patch/org.eclipse.jdt.java16patch/feature.xml
           and
-          .../java15patch/org.eclipse.jdt-feature-dummy/feature.xml
+          .../java16patch/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-java15patch p2 repository, as well as the lower
+          a few lines below, as the eclipse-p2-repo-java16patch p2 repository, as well as the lower
           bound, in 'versionRangeForPatch'.
  
           Also, when new patch created, should update the wiki at
-          https://wiki.eclipse.org/Java15
+          https://wiki.eclipse.org/Java16
         -->
         <!-- This needs the version of the feature to be patched. -->
-        <featureToPatchVersion>3.18.500.v20200826-1800</featureToPatchVersion>
-        <featureToPatchVersionPDE>3.14.500.v20200826-1800</featureToPatchVersionPDE>
+        <featureToPatchVersion>3.18.700.v20210129-1800</featureToPatchVersion>
+        <featureToPatchVersionPDE>3.14.700.v20210129-1800</featureToPatchVersionPDE>
         <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
-        <versionRangeForPatch>[3.18.500.v20200826-1800,3.18.549.v20210708-1800)</versionRangeForPatch>
-        <versionRangeForPatchPDE>[3.14.500.v20200826-1800,3.14.549.v20210708-1800)</versionRangeForPatchPDE>
+        <versionRangeForPatch>[3.18.700.v20210129-1800,3.18.749.v20210429-1800)</versionRangeForPatch>
+        <versionRangeForPatchPDE>[3.14.700.v20210129-1800,3.14.749.v20210429-1800)</versionRangeForPatchPDE>
         <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.19milestones/</comparator.repo>
+        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/</comparator.repo>
       </properties>
       <repositories>
        <repository>
-         <id>eclipse-p2-repo-java15patch</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.19milestones/</url>
+         <id>eclipse-p2-repo-java16patch</id>
+         <url>https://download.eclipse.org/eclipse/updates/4.19-I-builds/I20210129-1800/</url>
          <layout>p2</layout>
        </repository>
      </repositories>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/category.xml
deleted file mode 100644
index 33fba9c81..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/category.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature id="org.eclipse.jdt.java15patch" version="0.0.0" patch="true">
-      <category name="Eclipse Java 15 support for 2020-12 development stream"/>
-   </feature>
-   <feature id="org.eclipse.jdt.java15patch.source" version="0.0.0" patch="true">
-      <category name="Eclipse Java 15 support for 2020-12 development stream"/>
-   </feature>
-      <feature id="org.eclipse.pde.java15patch" version="0.0.0" patch="true">
-      <category name="Eclipse Java 15 support for 2020-12 development stream"/>
-   </feature>
-   <feature id="org.eclipse.pde.java15patch.source" version="0.0.0" patch="true">
-      <category name="Eclipse Java 15 support for 2020-12 development stream"/>
-   </feature>
-   <category-def name="Eclipse Java 15 support for 2020-12 development stream" label="Eclipse Java 15 support for 2020-12 development stream">
-      <description>
-         Eclipse Java 15 support for 2020-12 development stream.
-      </description>
-   </category-def>
-</site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/feature.xml
deleted file mode 100644
index 7a3790e23..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/feature.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jdt.java15patch"
-      label="%featureName"
-      version="1.2.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jdt" version="3.18.500.v20200826-1800" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jdt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.eclipse.jdt.compiler.tool"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.eclipse.jdt.compiler.apt"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-   <plugin
-         id="org.eclipse.jdt.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/> 
-    <plugin
-         id="org.eclipse.jdt.core.manipulation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-    <plugin
-         id="org.eclipse.jdt.junit.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-    <plugin
-         id="org.eclipse.jdt.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>       
-</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/antrunbuild.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/antrunbuild.xml
index eb4be335e..eb4be335e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/antrunbuild.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/antrunbuild.xml
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/category.xml
new file mode 100644
index 000000000..85fe7e686
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/category.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature id="org.eclipse.jdt.java16patch" version="0.0.0" patch="true">
+      <category name="Eclipse Java 16 support for 2021-03 development stream"/>
+   </feature>
+   <feature id="org.eclipse.jdt.java16patch.source" version="0.0.0" patch="true">
+      <category name="Eclipse Java 16 support for 2021-03 development stream"/>
+   </feature>
+      <feature id="org.eclipse.pde.java16patch" version="0.0.0" patch="true">
+      <category name="Eclipse Java 16 support for 2021-03 development stream"/>
+   </feature>
+   <feature id="org.eclipse.pde.java16patch.source" version="0.0.0" patch="true">
+      <category name="Eclipse Java 16 support for 2021-03 development stream"/>
+   </feature>
+   <category-def name="Eclipse Java 16 support for 2021-03 development stream" label="Eclipse Java 16 support for 2021-03 development stream">
+      <description>
+         Eclipse Java 16 support for 2021-03 development stream.
+      </description>
+   </category-def>
+</site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/patchMatchVersion.xsl b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/patchMatchVersion.xsl
index 112838c13..112838c13 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/patchMatchVersion.xsl
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/patchMatchVersion.xsl
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/pom.xml
index f3285896f..cc47111b7 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/eclipse.releng.repository.java15patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/eclipse.releng.repository.java16patch/pom.xml
@@ -16,14 +16,14 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../</relativePath>
   </parent>
 
   <groupId>eclipse.platform.releng</groupId>
-  <artifactId>eclipse.releng.repository.java15patch</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <artifactId>eclipse.releng.repository.java16patch</artifactId>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-repository</packaging>
 
   <!-- 
@@ -163,7 +163,7 @@
         <version>${tycho.version}</version>
         <executions>
           <execution>
-            <id>categories-java15patch</id>
+            <id>categories-java16patch</id>
             <phase>package</phase>
             <goals>
               <goal>publish-categories</goal>
@@ -180,22 +180,22 @@
         </configuration>
         <executions>
           <execution>
-            <id>assemble-java15patch</id>
+            <id>assemble-java16patch</id>
             <phase>package</phase>
             <configuration>
-              <repositoryName>Early Access of Java 15 support</repositoryName>
-              <finalName>Java15EarlyAccessPatchRepo</finalName>
+              <repositoryName>Early Access of Java 16 support</repositoryName>
+              <finalName>Java16EarlyAccessPatchRepo</finalName>
             </configuration>
             <goals>
               <goal>assemble-repository</goal>
             </goals>
           </execution>
           <execution>
-            <id>archive-java15patch</id>
+            <id>archive-java16patch</id>
             <phase>pre-integration-test</phase>
             <configuration>
-              <repositoryName>Early Access of Java 15 support</repositoryName>
-              <finalName>Java15EarlyAccessPatchRepo</finalName>
+              <repositoryName>Early Access of Java 16 support</repositoryName>
+              <finalName>Java16EarlyAccessPatchRepo</finalName>
             </configuration>
             <goals>
               <goal>archive-repository</goal>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
index 99f26c020..99f26c020 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/build.properties
index 157e85950..157e85950 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/feature.properties
index 4b9e2643b..4b9e2643b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/feature.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/feature.xml
index 943ef45fc..9ce4fc0bd 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jdt"
       label="%featureName"
-      version="3.18.500.v20200826-1800"
+      version="3.18.700.v20210129-1800"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
index 9d4f218a3..9d4f218a3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt-feature-dummy/pom.xml
index 471df3097..9b4162b01 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt-feature-dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/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.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
   <artifactId>org.eclipse.jdt</artifactId>
-  <version>3.18.500.v20200826-1800</version>
+  <version>3.18.700.v20210129-1800</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dc..0c68a61dc 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
index ab83f8fa0..a3f25a940 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dummy
 Bundle-SymbolicName: org.eclipse.jdt.dummy
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/build.properties
index 34d2e4d2d..34d2e4d2d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/pom.xml
index 93ed89643..6ff9a8c16 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.dummy/pom.xml
@@ -13,12 +13,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.dummy</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/build.properties
index 34345aa9c..103b2cbff 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
+# Copyright (c) 2021 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/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/feature.properties
index c357a0482..56d9a74a6 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/feature.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
+# Copyright (c) 2021 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 15 support for 2020-03 development stream
+featureName=Eclipse JDT (Java Development Tools) Patch with Java 16 support for 2021-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 15 support for 2020-03 development stream.\n
+description=Eclipse Java 16 support for 2021-03 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
+Copyright (c) 2000, 2021 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/java15patch/org.eclipse.pde.java15patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/feature.xml
index 2917bc4df..c66110ae9 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/feature.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="org.eclipse.pde.java15patch"
+      id="org.eclipse.jdt.java16patch"
       label="%featureName"
-      version="1.2.0.qualifier"
+      version="1.2.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,20 +20,21 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.pde" version="3.14.500.v20200826-1800" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.700.v20210129-1800" patch="true"/>
    </requires>
 
    <plugin
-         id="org.eclipse.pde.api.tools"
+         id="org.eclipse.jdt.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.pde.build"
+         id="org.eclipse.jdt.ui"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/forceQualifierUpdate.txt
index e69de29bb..e69de29bb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/forceQualifierUpdate.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/forceQualifierUpdate.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/pom.xml
index 05baea2e3..742b8583b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/pom.xml
@@ -16,12 +16,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt.feature</groupId>
-  <artifactId>org.eclipse.jdt.java15patch</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <artifactId>org.eclipse.jdt.java16patch</artifactId>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/sourceTemplateFeature/feature.properties
index 580b826cd..da6f47fcd 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/sourceTemplateFeature/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/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 15 support for 2020-03 development stream
+featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 16 support for 2021-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 15 support for 2020-03 development stream.\n
+description=Eclipse Java 16 support for 2021-03 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
+Copyright (c) 2000, 2021 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/java15patch/org.eclipse.jdt.java15patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/sourceTemplateFeature/p2.inf
index d4191713a..d4191713a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/sourceTemplateFeature/p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.jdt.java16patch/sourceTemplateFeature/p2.inf
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs
index 99f26c020..99f26c020 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs
index 5a0ad22d2..5a0ad22d2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/build.properties
index 157e85950..157e85950 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/feature.properties
index 4b9e2643b..4b9e2643b 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/feature.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/feature.xml
index 6aabd8e93..020aa4e28 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/feature.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.pde"
       label="%featureName"
-      version="3.14.500.v20200826-1800"
+      version="3.14.700.v20210129-1800"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt
index 9d4f218a3..9d4f218a3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/pom.xml
index e1ad8cbc4..51bf9508e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde-feature-dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde-feature-dummy/pom.xml
@@ -13,12 +13,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.pde.feature</groupId>
   <artifactId>org.eclipse.pde</artifactId>
-  <version>3.14.500.v20200826-1800</version>
+  <version>3.14.700.v20210129-1800</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs
index 0c68a61dc..0c68a61dc 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/META-INF/MANIFEST.MF
index 8bf71d625..649878930 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/META-INF/MANIFEST.MF
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dummy
 Bundle-SymbolicName: org.eclipse.pde.dummy
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/build.properties
index 34d2e4d2d..34d2e4d2d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/pom.xml
index af0bab77e..8fd73f131 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.dummy/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.dummy/pom.xml
@@ -13,12 +13,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.pde</groupId>
   <artifactId>org.eclipse.pde.dummy</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/build.properties
index 34345aa9c..34345aa9c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.jdt.java15patch/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/build.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/feature.properties
index 40ee31fe3..2449d8721 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/feature.properties
@@ -18,13 +18,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse PDE Patch with Java 15 support for 2020-03 development stream
+featureName=Eclipse PDE Patch with Java 16 support for 2021-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 15 support for 2020-03 development stream.\n
+description=Eclipse Java 16 support for 2021-03 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/feature.xml
new file mode 100644
index 000000000..3ff4b8dd1
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/feature.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.pde.java16patch"
+      label="%featureName"
+      version="1.2.100.qualifier"
+      provider-name="%providerName"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import feature="org.eclipse.pde" version="3.14.700.v20210129-1800" patch="true"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.pde.build"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/forceQualifierUpdate.txt
index e69de29bb..e69de29bb 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/forceQualifierUpdate.txt
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/forceQualifierUpdate.txt
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/pom.xml
index 5b87cf287..b467cd878 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/pom.xml
@@ -16,12 +16,12 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java15patch</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <artifactId>eclipse.platform.releng.java16patch</artifactId>
+    <version>4.19.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.pde.feature</groupId>
-  <artifactId>org.eclipse.pde.java15patch</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <artifactId>org.eclipse.pde.java16patch</artifactId>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/sourceTemplateFeature/feature.properties
index eafff3ad9..5c8959f23 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/sourceTemplateFeature/feature.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/sourceTemplateFeature/feature.properties
@@ -18,13 +18,13 @@
 # This file should be translated.
 
 # "featureName" property - name of the feature
-featureName=Eclipse PDE Source Patch with Java 15 support for 2020-03 development stream
+featureName=Eclipse PDE Source Patch with Java 16 support for 2021-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 15 support for 2020-03 development stream.\n
+description=Eclipse Java 16 support for 2021-03 development stream.\n
 
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/sourceTemplateFeature/p2.inf
index d4191713a..d4191713a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/org.eclipse.pde.java15patch/sourceTemplateFeature/p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/org.eclipse.pde.java16patch/sourceTemplateFeature/p2.inf
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/pom.xml
index 1bdc70a93..50017df0d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/java15patch/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/java16patch/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.18.0-SNAPSHOT</version>
+    <version>4.19.0-SNAPSHOT</version>
     <relativePath>../../eclipse-platform-parent</relativePath>
   </parent>
 
   <groupId>eclipse.platform.releng</groupId>
-  <artifactId>eclipse.platform.releng.java15patch</artifactId>
-  <version>4.18.0-SNAPSHOT</version>
+  <artifactId>eclipse.platform.releng.java16patch</artifactId>
+  <version>4.19.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -39,16 +39,10 @@
     <module>org.eclipse.pde.dummy</module>
     <module>org.eclipse.pde-feature-dummy</module>
     <module>../../eclipse.jdt.core/org.eclipse.jdt.core</module>
-    <module>../../eclipse.jdt.core/org.eclipse.jdt.compiler.tool</module>
-    <module>../../eclipse.jdt.core/org.eclipse.jdt.compiler.apt</module>
-    <module>../../eclipse.jdt.debug/org.eclipse.jdt.launching</module>
-    <module>../../eclipse.jdt.ui/org.eclipse.jdt.core.manipulation</module>
-    <module>../../eclipse.jdt.ui/org.eclipse.jdt.junit.core</module>
     <module>../../eclipse.jdt.ui/org.eclipse.jdt.ui</module>
-    <module>../../eclipse.pde.ui/apitools/org.eclipse.pde.api.tools</module>
     <module>../../eclipse.pde.build/org.eclipse.pde.build</module>
-    <module>org.eclipse.jdt.java15patch</module>
-    <module>org.eclipse.pde.java15patch</module>
-    <module>eclipse.releng.repository.java15patch</module>
+    <module>org.eclipse.jdt.java16patch</module>
+    <module>org.eclipse.pde.java16patch</module>
+    <module>eclipse.releng.repository.java16patch</module>
   </modules>
 </project>