From 174567b6d042603138232028b2756e8d3966e251 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 2 Feb 2022 10:14:27 -0500
Subject: [PATCH 01/22] test: fix breakages in tests found during update to
 Tycho 2.5.0

---
 .../appengine/compat/gpe/GpeClassicMigratorTest.java        | 4 +++-
 .../facets/ui/navigator/model/ModelRefreshTests.java        | 6 ++----
 .../eclipse/appengine/standard/java8/ConversionTests.java   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.compat.test/src/com/google/cloud/tools/eclipse/appengine/compat/gpe/GpeClassicMigratorTest.java b/plugins/com.google.cloud.tools.eclipse.appengine.compat.test/src/com/google/cloud/tools/eclipse/appengine/compat/gpe/GpeClassicMigratorTest.java
index 626044fff8..f2727e66b8 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.compat.test/src/com/google/cloud/tools/eclipse/appengine/compat/gpe/GpeClassicMigratorTest.java
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.compat.test/src/com/google/cloud/tools/eclipse/appengine/compat/gpe/GpeClassicMigratorTest.java
@@ -57,7 +57,9 @@ public void setUp() throws IOException, CoreException {
 
   @After
   public void tearDown() throws CoreException {
-    gpeProject.delete(true /* force */,  monitor);
+    if (gpeProject != null) {
+      gpeProject.delete(true /* force */,  monitor);
+    }
   }
 
   @Test
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.facets.test/src/com/google/cloud/tools/eclipse/appengine/facets/ui/navigator/model/ModelRefreshTests.java b/plugins/com.google.cloud.tools.eclipse.appengine.facets.test/src/com/google/cloud/tools/eclipse/appengine/facets/ui/navigator/model/ModelRefreshTests.java
index c78368ab99..61f5839973 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.facets.test/src/com/google/cloud/tools/eclipse/appengine/facets/ui/navigator/model/ModelRefreshTests.java
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.facets.test/src/com/google/cloud/tools/eclipse/appengine/facets/ui/navigator/model/ModelRefreshTests.java
@@ -311,10 +311,8 @@ public void testRejigDeploymentAssembly() throws AppEngineException, CoreExcepti
                   webroot, newWebRoot.getProjectRelativePath(), null);
               ProjectUtils.waitForProjects(project);
             });
-    assertEquals(1, changed.size());
-    assertEquals(
-        project.getFile(".settings/org.eclipse.wst.common.component"),
-        Iterables.getOnlyElement(changed));
+    assertThat(changed,
+        Matchers.hasItem(project.getFile(".settings/org.eclipse.wst.common.component")));
     assertTrue(projectElement.resourcesChanged(changed));
 
     AppEngineResourceElement[] newElements = projectElement.getConfigurations();
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8.test/src/com/google/cloud/tools/eclipse/appengine/standard/java8/ConversionTests.java b/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8.test/src/com/google/cloud/tools/eclipse/appengine/standard/java8/ConversionTests.java
index 280a64c8c5..952b58b8e6 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8.test/src/com/google/cloud/tools/eclipse/appengine/standard/java8/ConversionTests.java
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.standard.java8.test/src/com/google/cloud/tools/eclipse/appengine/standard/java8/ConversionTests.java
@@ -126,7 +126,7 @@ public void bare_Java8_Web31()
   @Test
   public void appEngineWebWithNoRuntime()
       throws CoreException, IOException, InterruptedException, SAXException, AppEngineException {
-    IFacetedProject project = projectCreator.getFacetedProject();
+    IFacetedProject project = projectCreator.withFacets().getFacetedProject();
     createAppEngineWebWithNoRuntime(project);
 
     Job conversionJob = new AppEngineStandardProjectConvertJob(project);
@@ -244,7 +244,7 @@ public void appEngineWebWithNoRuntime_Java8_Web31()
   @Test
   public void appEngineWebWithJava8Runtime()
       throws CoreException, IOException, InterruptedException, SAXException, AppEngineException {
-    IFacetedProject project = projectCreator.getFacetedProject();
+    IFacetedProject project = projectCreator.withFacets().getFacetedProject();
     createAppEngineWebWithJava8Runtime(project);
 
     Job conversionJob = new AppEngineStandardProjectConvertJob(project);

From 3ae88002f0df32a09cde32d7a97f3ebfd0b74c13 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 14 Dec 2021 22:37:54 -0500
Subject: [PATCH 02/22] chore: http -> https for download.eclipse.org

---
 README.md                                          |  2 +-
 eclipse/common-dependencies.tpd                    |  4 ++--
 eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target | 10 +++++-----
 eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd    | 12 ++++++------
 eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target | 10 +++++-----
 eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd    | 12 ++++++------
 eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target |  8 ++++----
 eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd    | 10 +++++-----
 eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target |  8 ++++----
 eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd    |  8 ++++----
 eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target |  8 ++++----
 eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd    |  8 ++++----
 12 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 932e95b9d6..4738244e83 100644
--- a/README.md
+++ b/README.md
@@ -277,7 +277,7 @@ which resolves the specified dependencies and creates a `.target`.
 The process is:
 
    1. Install the TPD Editor, if necessary
-      - Use _Help > Install New Software_ and specify `http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/`
+      - Use _Help > Install New Software_ and specify `https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/`
         as the location.
       - Restart Eclipse when prompted
    2. Open the `.tpd` file in Eclipse.
diff --git a/eclipse/common-dependencies.tpd b/eclipse/common-dependencies.tpd
index b8a71c87a3..b8140e43a4 100644
--- a/eclipse/common-dependencies.tpd
+++ b/eclipse/common-dependencies.tpd
@@ -3,7 +3,7 @@
  */
 target "Cloud Tools for Eclipse: Common Dependencies"
 
-location "http://download.eclipse.org/tools/orbit/downloads/latest-R/" {
+location "https://download.eclipse.org/tools/orbit/downloads/latest-R/" {
   org.hamcrest.core [1.3.0,1.3.1)
   org.hamcrest.integration [1.3.0,1.3.1)
   org.hamcrest.library [1.3.0,1.3.1)
@@ -19,6 +19,6 @@ location "http://dadacoalition.org/yedit/" {
 }
 
 // SWTBot 2.8.0 supports Oxygen and later (https://wiki.eclipse.org/SWTBot#Latest_Release)
-location "http://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
+location "https://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
   org.eclipse.swtbot.eclipse.feature.group
 }
diff --git a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
index 88a9f7a1ed..6761ac353b 100644
--- a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
+++ b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
       <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
       <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
-      <repository location="http://download.eclipse.org/releases/2018-09/201809191002/"/>
+      <repository location="https://download.eclipse.org/releases/2018-09/201809191002/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201802202154"/>
@@ -27,11 +27,11 @@
       <unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.11.0.v201807251925"/>
       <unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.1.v201802202154"/>
       <unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.601.v201802152148"/>
-      <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository"/>
+      <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.0.1.201809121533"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2018-09-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2018-09-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
index 9b0afad9ae..f4a90a401f 100644
--- a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
+++ b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,8 +13,8 @@ target "GCP for Eclipse 2018-09" with source requirements
 // Eclipse Platform 4.9
 // Eclipse WTP 3.11
 
-// Eclipse 2018-09 (composite at http://download.eclipse.org/releases/2018-09/)
-location "http://download.eclipse.org/releases/2018-09/201809191002/" {
+// Eclipse 2018-09 (composite at https://download.eclipse.org/releases/2018-09/)
+location "https://download.eclipse.org/releases/2018-09/201809191002/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -33,8 +33,8 @@ location "http://download.eclipse.org/releases/2018-09/201809191002/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2018-09)
-location "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository" {
+// (composite at https://download.eclipse.org/webtools/repository/2018-09)
+location "https://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
     org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
@@ -44,7 +44,7 @@ location "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2018-09-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2018-09-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
index 87eba5f8ab..fe0baafca1 100644
--- a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
+++ b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181113"/>
       <unit id="org.eclipse.jetty.server" version="9.4.14.v20181113"/>
       <unit id="org.eclipse.jetty.util" version="9.4.14.v20181113"/>
-      <repository location="http://download.eclipse.org/releases/2018-12/201812191000"/>
+      <repository location="https://download.eclipse.org/releases/2018-12/201812191000"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201802202154"/>
@@ -27,11 +27,11 @@
       <unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.11.0.v201807251925"/>
       <unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.1.v201802202154"/>
       <unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.601.v201802152148"/>
-      <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository"/>
+      <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.1.0.201812121718"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2018-12-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2018-12-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
index 49837a245e..fb00b10844 100644
--- a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
+++ b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,8 +13,8 @@ target "GCP for Eclipse 2018-12" with source requirements
 // Eclipse Platform 4.10
 // Eclipse WTP 3.12
 
-// Eclipse 2018-12 RC2 (composite at http://download.eclipse.org/releases/2018-12/)
-location "http://download.eclipse.org/releases/2018-12/201812191000" {
+// Eclipse 2018-12 RC2 (composite at https://download.eclipse.org/releases/2018-12/)
+location "https://download.eclipse.org/releases/2018-12/201812191000" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -33,8 +33,8 @@ location "http://download.eclipse.org/releases/2018-12/201812191000" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2018-12/)
-location "http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository" {
+// (composite at https://download.eclipse.org/webtools/repository/2018-12/)
+location "https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
     org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
@@ -44,7 +44,7 @@ location "http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2018-12-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2018-12-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
index 5421203d76..0e15e0830f 100644
--- a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
+++ b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.20.v20190813"/>
       <unit id="org.eclipse.jetty.server" version="9.4.20.v20190813"/>
       <unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
-      <repository location="http://download.eclipse.org/releases/2019-09/"/>
+      <repository location="https://download.eclipse.org/releases/2019-09/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
@@ -31,7 +31,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.4.0.201909110158"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2019-09-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2019-09-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
index 8a4453aea9..46a511bd2f 100644
--- a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
+++ b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,8 +13,8 @@ target "GCP for Eclipse 2019-09" with source requirements
 // Eclipse Platform 4.13
 // Eclipse WTP 3.15
 
-// Eclipse 2019-09 RC2 (composite at http://download.eclipse.org/releases/2019-09/)
-location "http://download.eclipse.org/releases/2019-09/" {
+// Eclipse 2019-09 RC2 (composite at https://download.eclipse.org/releases/2019-09/)
+location "https://download.eclipse.org/releases/2019-09/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -33,7 +33,7 @@ location "http://download.eclipse.org/releases/2019-09/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2019-09/)
+// (composite at https://download.eclipse.org/webtools/repository/2019-09/)
 location "https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
@@ -44,7 +44,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2019-09-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2019-09-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target
index e32eda460a..a5ceaadf36 100644
--- a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target
+++ b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.server" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.util" version="9.4.24.v20191120"/>
-      <repository location="http://download.eclipse.org/releases/2019-12/"/>
+      <repository location="https://download.eclipse.org/releases/2019-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
@@ -31,7 +31,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.5.0.201912091550"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd
index 2302ff2ba7..d0065ceb43 100644
--- a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd
+++ b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,7 +13,7 @@ target "GCP for Eclipse 2019-12" with source requirements
 // Eclipse Platform 4.14
 // Eclipse WTP 3.16
 
-location "http://download.eclipse.org/releases/2019-12/" {
+location "https://download.eclipse.org/releases/2019-12/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -32,7 +32,7 @@ location "http://download.eclipse.org/releases/2019-12/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2019-12/)
+// (composite at https://download.eclipse.org/webtools/repository/2019-12/)
 location "https://download.eclipse.org/webtools/downloads/drops/R3.16.0/R-3.16.0-20191210070716/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
@@ -43,7 +43,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.16.0/R-3.16.0
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2019-12-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2019-12-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target
index 3b62158784..3324bc43c9 100644
--- a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target
+++ b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.server" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.util" version="9.4.24.v20191120"/>
-      <repository location="http://download.eclipse.org/releases/2019-12/"/>
+      <repository location="https://download.eclipse.org/releases/2019-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
@@ -31,7 +31,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.5.0.201912091550"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd
index edafe45543..0f0ca9b6fb 100644
--- a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd
+++ b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,7 +13,7 @@ target "GCP for Eclipse 2020-03" with source requirements
 // Eclipse Platform 4.15
 // Eclipse WTP 3.17
 
-location "http://download.eclipse.org/releases/2020-03/" {
+location "https://download.eclipse.org/releases/2020-03/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -32,7 +32,7 @@ location "http://download.eclipse.org/releases/2020-03/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2020-03/)
+// (composite at https://download.eclipse.org/webtools/repository/2020-03/)
 location "https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0-20200306035042/repository/" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
@@ -43,7 +43,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2020-03-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2020-03-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 

From 586ef1e8801c3d4570fb6a26d0136a113857900f Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 09:22:52 -0500
Subject: [PATCH 03/22] try with maven 3.8.4

---
 kokoro/windows/continuous.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index a5ed8ba797..72637eaead 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -17,7 +17,7 @@ call gcloud.cmd components update --quiet
 call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
-mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.5.0
+mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
 call mvnw.cmd -V -B --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on

From 14be20a20115aa7f115f40fe8e1e599b13d0ccb8 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 09:28:22 -0500
Subject: [PATCH 04/22] show stacktrace on build error

---
 .github/workflows/eclipse-2018-09-java11.yml | 2 +-
 .github/workflows/eclipse-2018-09-java8.yml  | 2 +-
 .github/workflows/eclipse-2018-12-java11.yml | 2 +-
 .github/workflows/eclipse-2019-09-java11.yml | 2 +-
 .github/workflows/eclipse-2019-12-java11.yml | 2 +-
 .github/workflows/eclipse-2020-03-java11.yml | 2 +-
 kokoro/ubuntu/release.sh                     | 2 +-
 kokoro/windows/continuous.bat                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/eclipse-2018-09-java11.yml b/.github/workflows/eclipse-2018-09-java11.yml
index 5fdcdae558..2c9addb19c 100644
--- a/.github/workflows/eclipse-2018-09-java11.yml
+++ b/.github/workflows/eclipse-2018-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index a0ba8ddd8c..0468d6ccf3 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -47,6 +47,6 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-12-java11.yml b/.github/workflows/eclipse-2018-12-java11.yml
index 9ef5a04695..a9d607d4f7 100644
--- a/.github/workflows/eclipse-2018-12-java11.yml
+++ b/.github/workflows/eclipse-2018-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-09-java11.yml b/.github/workflows/eclipse-2019-09-java11.yml
index 0ec567d643..22a1dddfc1 100644
--- a/.github/workflows/eclipse-2019-09-java11.yml
+++ b/.github/workflows/eclipse-2019-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-12-java11.yml b/.github/workflows/eclipse-2019-12-java11.yml
index b5a02e17c7..b62bdd5978 100644
--- a/.github/workflows/eclipse-2019-12-java11.yml
+++ b/.github/workflows/eclipse-2019-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2020-03-java11.yml b/.github/workflows/eclipse-2020-03-java11.yml
index 15475e5dd0..f99ccdf9b7 100644
--- a/.github/workflows/eclipse-2020-03-java11.yml
+++ b/.github/workflows/eclipse-2020-03-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/kokoro/ubuntu/release.sh b/kokoro/ubuntu/release.sh
index b392abdaba..85bc7b6064 100755
--- a/kokoro/ubuntu/release.sh
+++ b/kokoro/ubuntu/release.sh
@@ -38,7 +38,7 @@ cd github/google-cloud-eclipse
 #    - Single-quotes are necessary for `-Dproduct.version.qualifier.suffix`,
 #      since it should be appended as a constant string in a date format.
 TMPDIR= xvfb-run \
-  mvn -V -B \
+  mvn -V -B -e \
       -Doauth.client.id="${OAUTH_CLIENT_ID}" \
       -Doauth.client.secret="${OAUTH_CLIENT_SECRET}" \
       -Dfirelog.api.key="${FIRELOG_API_KEY}" \
diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index 72637eaead..e346576e0a 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -18,7 +18,7 @@ call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
 mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
-call mvnw.cmd -V -B --fail-at-end -Pci-build verify
+call mvnw.cmd -V -B -e --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on
 

From 4fdc1b1482b2e5d08bae52e1dabf2b8683307248 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 14 Dec 2021 22:31:58 -0500
Subject: [PATCH 05/22] chore: update to Tycho 2.5.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2fc351320..86c1498dcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
     <!-- Execution environment supported by Cloud Tools for Eclipse -->
     <requiredExecutionEnvironment>JavaSE-1.8</requiredExecutionEnvironment>
 
-    <tycho.version>1.5.0</tycho.version>
-    <tycho-extras.version>1.5.0</tycho-extras.version>
+    <tycho.version>2.5.0</tycho.version>
+    <tycho-extras.version>2.5.0</tycho-extras.version>
     <product.version.qualifier.suffix/>  <!-- 0-length string by default -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <eclipse.target>2018-09</eclipse.target> <!-- the default build -->

From 1c9603dedda98ca49279998acfbcdc19086bcb3b Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 10:29:04 -0500
Subject: [PATCH 06/22] add useJDK for tycho-surefire

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 86c1498dcc..fee711bfc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
       the Bundle-RequiredExecutionEnvironment. See `README.md` for details.
     -->
     <tycho.toolchains>SYSTEM</tycho.toolchains>
+    <tycho.testToolchains>SYSTEM</tycho.testToolchains>
 
     <!-- OS-specific JVM flags, empty for the default case but redefined below -->
     <os-jvm-flags/>
@@ -330,6 +331,7 @@
             <runOrder>hourly</runOrder>
             <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
             <trimStackTrace>false</trimStackTrace>
+            <useJDK>${tycho.testToolchains}</useJDK>
             <!--
               - maven.artifact.threads=1 to workaround repository corruption seen in
                 https://github.com/GoogleCloudPlatform/google-cloud-eclipse/issues/2284
@@ -427,6 +429,8 @@
       <properties>
          <jettyMinVersion>9.4</jettyMinVersion>
          <jettyMaxVersion>9.5</jettyMaxVersion>
+         <!-- 2018-09 was the last release to work on Java 8 -->
+         <tycho.testToolchains>BREE</tycho.testToolchains>
       </properties>
       <!-- build against a known target platform -->
       <modules>

From 0e35fd72e9605d7be9e361fc5bbd4f70cb8d4a97 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 22:55:33 -0500
Subject: [PATCH 07/22] tycho 2.5.0 requires Java 11+ so must use BREE for Java
 8

---
 .github/workflows/eclipse-2018-09-java8.yml | 14 +++++++++++++-
 pom.xml                                     |  2 --
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index 0468d6ccf3..4686d88d52 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -20,7 +20,17 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 8  # Java 8 required for compilation.
+      - name: Set JDK 8 toolchain
+        run: |
+          sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Set JDK 11 toolchain
+        run: |
+          sed -i.bak -e "s,JDK_11_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
 
       - uses: google-github-actions/setup-gcloud@v0.2.0
 
@@ -47,6 +57,8 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
+         # 2018-09 was the last release to work on Java 8
           xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+            -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/pom.xml b/pom.xml
index fee711bfc4..33ff51d0eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,8 +429,6 @@
       <properties>
          <jettyMinVersion>9.4</jettyMinVersion>
          <jettyMaxVersion>9.5</jettyMaxVersion>
-         <!-- 2018-09 was the last release to work on Java 8 -->
-         <tycho.testToolchains>BREE</tycho.testToolchains>
       </properties>
       <!-- build against a known target platform -->
       <modules>

From 07ac6a8cba52301d49cb2d10aad2eae983ada905 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 2 Feb 2022 10:11:27 -0500
Subject: [PATCH 08/22] remove unneeded `mvn -e`

---
 .github/workflows/eclipse-2018-09-java11.yml | 2 +-
 .github/workflows/eclipse-2018-09-java8.yml  | 6 +++---
 .github/workflows/eclipse-2018-12-java11.yml | 2 +-
 .github/workflows/eclipse-2019-09-java11.yml | 2 +-
 .github/workflows/eclipse-2019-12-java11.yml | 2 +-
 .github/workflows/eclipse-2020-03-java11.yml | 2 +-
 kokoro/ubuntu/release.sh                     | 2 +-
 kokoro/windows/continuous.bat                | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/eclipse-2018-09-java11.yml b/.github/workflows/eclipse-2018-09-java11.yml
index 2c9addb19c..5fdcdae558 100644
--- a/.github/workflows/eclipse-2018-09-java11.yml
+++ b/.github/workflows/eclipse-2018-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index 4686d88d52..92c76284ee 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -18,13 +18,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # Java 8 required for compilation, but Java 11 required by Tycho 2.5+
       - uses: actions/setup-java@v1
         with:
-          java-version: 8  # Java 8 required for compilation.
+          java-version: 8
       - name: Set JDK 8 toolchain
         run: |
           sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
-
       - uses: actions/setup-java@v1
         with:
           java-version: 11
@@ -58,7 +58,7 @@ jobs:
           gcloud components install app-engine-java --quiet
 
          # 2018-09 was the last release to work on Java 8
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-12-java11.yml b/.github/workflows/eclipse-2018-12-java11.yml
index a9d607d4f7..9ef5a04695 100644
--- a/.github/workflows/eclipse-2018-12-java11.yml
+++ b/.github/workflows/eclipse-2018-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-09-java11.yml b/.github/workflows/eclipse-2019-09-java11.yml
index 22a1dddfc1..0ec567d643 100644
--- a/.github/workflows/eclipse-2019-09-java11.yml
+++ b/.github/workflows/eclipse-2019-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-12-java11.yml b/.github/workflows/eclipse-2019-12-java11.yml
index b62bdd5978..b5a02e17c7 100644
--- a/.github/workflows/eclipse-2019-12-java11.yml
+++ b/.github/workflows/eclipse-2019-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2020-03-java11.yml b/.github/workflows/eclipse-2020-03-java11.yml
index f99ccdf9b7..15475e5dd0 100644
--- a/.github/workflows/eclipse-2020-03-java11.yml
+++ b/.github/workflows/eclipse-2020-03-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/kokoro/ubuntu/release.sh b/kokoro/ubuntu/release.sh
index 85bc7b6064..b392abdaba 100755
--- a/kokoro/ubuntu/release.sh
+++ b/kokoro/ubuntu/release.sh
@@ -38,7 +38,7 @@ cd github/google-cloud-eclipse
 #    - Single-quotes are necessary for `-Dproduct.version.qualifier.suffix`,
 #      since it should be appended as a constant string in a date format.
 TMPDIR= xvfb-run \
-  mvn -V -B -e \
+  mvn -V -B \
       -Doauth.client.id="${OAUTH_CLIENT_ID}" \
       -Doauth.client.secret="${OAUTH_CLIENT_SECRET}" \
       -Dfirelog.api.key="${FIRELOG_API_KEY}" \
diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index e346576e0a..72637eaead 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -18,7 +18,7 @@ call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
 mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
-call mvnw.cmd -V -B -e --fail-at-end -Pci-build verify
+call mvnw.cmd -V -B --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on
 

From f93783666c74b4067ad0c87796d19c012624d837 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Mon, 13 Dec 2021 23:35:21 -0500
Subject: [PATCH 09/22] ci: add tests for latest release of Eclipse

---
 .github/workflows/eclipse-latest-java11.yml   | 62 +++++++++++++++++++
 .../META-INF/MANIFEST.MF                      |  1 +
 .../META-INF/MANIFEST.MF                      |  1 +
 .../META-INF/MANIFEST.MF                      |  1 +
 pom.xml                                       | 37 ++++++++++-
 5 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 .github/workflows/eclipse-latest-java11.yml

diff --git a/.github/workflows/eclipse-latest-java11.yml b/.github/workflows/eclipse-latest-java11.yml
new file mode 100644
index 0000000000..a9b621c7dc
--- /dev/null
+++ b/.github/workflows/eclipse-latest-java11.yml
@@ -0,0 +1,62 @@
+name: Eclipse latest release on Java 11
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:  # Allows you to run this workflow manually from the Actions tab
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    env:
+      CLOUDSDK_CORE_DISABLE_USAGE_REPORTING: true
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 8  # Java 8 required for compilation.
+      - name: Set JDK 8 toolchain
+        run: |
+          sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Set JDK 11 toolchain
+        run: |
+          sed -i.bak -e "s,JDK_11_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
+
+      - uses: google-github-actions/setup-gcloud@v0.2.0
+
+      - uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-${{ env.ECLIPSE_TARGET }}
+
+      - name: Run tests
+        env:
+          MAVEN_OPTS: '-Xmx700m -Dorg.slf4j.simpleLogger.showDateTime=true'
+        run: |
+          # google-github-actions/setup-gcloud@v0.2.0 sets up gcloud at, e.g,.
+          # "/opt/hostedtoolcache/gcloud/325.0.0/x64". appengine-plugins-core
+          # fails to find it, since the directory doesn't end with
+          # "google-cloud-sdk". Instead, appengine-plugins-core picks up the SDK
+          # at "/usr/lib/google-cloud-sdk" managed by a package manager. As a
+          # workaround, create a symlink at $HOME and add it to $PATH.
+          ln -s "$( dirname "$( dirname "$( which gcloud )")")" \
+            "${HOME}"/google-cloud-sdk
+          ls -ld "${HOME}"/google-cloud-sdk
+          export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
+          gcloud components install app-engine-java --quiet
+
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+            --toolchains=.github/workflows/toolchains.xml \
+            -Derrorprone -Dci-build \
+            clean verify
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
index 1f954ca9b8..ea6acf4296 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
@@ -35,6 +35,7 @@ Import-Package: com.google.cloud.tools.appengine.operations;version="0.8.1",
  com.google.common.collect;version="[30.0.0,31.0.0)",
  com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  com.google.gson;version="[2.8.2,3.0)",
+ javax.inject;version="1.0.0",
  javax.json;version="[1.0,1.1)",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
index 49781b2f2d..c8c80251dd 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
@@ -65,6 +65,7 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.25.0,1.26.0)",
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status,
+ javax.inject;version="1.0.0",
  org.eclipse.compare,
  org.eclipse.compare.structuremergeviewer,
  org.eclipse.core.filesystem,
diff --git a/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF
index 379a1051be..cd3dc5efbe 100644
--- a/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF
@@ -11,6 +11,7 @@ Require-Bundle: com.google.cloud.tools.eclipse.test.dependencies
 Import-Package: com.google.cloud.tools.eclipse.test.util,
  com.google.cloud.tools.eclipse.test.util.http,
  com.google.cloud.tools.eclipse.test.util.project,
+ javax.inject;version="1.0.0",
  org.eclipse.jdt.core,
  org.eclipse.jst.common.project.facet.core
 Require-Capability: com.google.cloud.tools.facets.appengine;filter:="(type=jre8)"
diff --git a/pom.xml b/pom.xml
index 33ff51d0eb..2edc01f2e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
     <tycho-extras.version>2.5.0</tycho-extras.version>
     <product.version.qualifier.suffix/>  <!-- 0-length string by default -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <eclipse.target>2018-09</eclipse.target> <!-- the default build -->
+    <!-- <eclipse.target>latest-release</eclipse.target> --> <!-- the default build -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 
@@ -419,11 +419,42 @@
 
     <profile>
       <!-- Default target if no eclipse.target specified. -->
-      <id>build-eclipse-2018-09</id>
+      <id>build-latest-release</id>
       <activation>
         <property>
           <name>!eclipse.target</name>
-          <!-- when no longer the default: <name>eclipse.target</name> <value>2018-09</value> -->
+          <!-- <name>eclipse.target</name> <value>latest-release</value> -->
+        </property>
+      </activation>
+      <properties>
+         <jettyMinVersion>9.4</jettyMinVersion>
+         <jettyMaxVersion>99</jettyMaxVersion>
+      </properties>
+      <repositories>
+        <repository>
+          <id>eclipse-latest-release</id>
+          <name>Eclipse latest release</name>
+          <url>https://download.eclipse.org/releases/latest/</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>orbit</id>
+          <url>https://download.eclipse.org/tools/orbit/downloads/latest-R/</url>
+          <layout>p2</layout>
+        </repository>
+        <repository>
+          <id>yedit</id>
+          <url>http://dadacoalition.org/yedit</url>
+          <layout>p2</layout>
+        </repository>
+      </repositories>
+    </profile>
+
+    <profile>
+      <id>build-eclipse-2018-09</id>
+      <activation>
+        <property>
+          <name>eclipse.target</name> <value>2018-09</value>
         </property>
       </activation>
       <properties>

From 7568506e4f923ce1d6550ae457166a22590e43f1 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 2 Feb 2022 11:51:22 -0500
Subject: [PATCH 10/22] Eclipse latest uses Java 17

---
 ...pse-latest-java11.yml => eclipse-latest-java17.yml} | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
 rename .github/workflows/{eclipse-latest-java11.yml => eclipse-latest-java17.yml} (87%)

diff --git a/.github/workflows/eclipse-latest-java11.yml b/.github/workflows/eclipse-latest-java17.yml
similarity index 87%
rename from .github/workflows/eclipse-latest-java11.yml
rename to .github/workflows/eclipse-latest-java17.yml
index a9b621c7dc..57fc2d0f84 100644
--- a/.github/workflows/eclipse-latest-java11.yml
+++ b/.github/workflows/eclipse-latest-java17.yml
@@ -26,10 +26,14 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
-      - name: Set JDK 11 toolchain
+          java-version: 17
+      - name: Set JDK 17 toolchain
         run: |
-          sed -i.bak -e "s,JDK_11_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
+          sed -i.bak \
+            -e "s,JDK_11_HOME,${JAVA_HOME}," \
+            -e "s,<id>JavaSE-11</id>,<id>JavaSE-17</id>," \
+            -e "s,<version>11</version>,<version>17</version>," \
+            .github/workflows/toolchains.xml
 
       - uses: google-github-actions/setup-gcloud@v0.2.0
 

From 3339b0f874245579f44ed7329b670364fb15ead7 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 14 Dec 2021 22:37:54 -0500
Subject: [PATCH 11/22] chore: http -> https for download.eclipse.org

---
 README.md                                          |  2 +-
 eclipse/common-dependencies.tpd                    |  4 ++--
 eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target | 10 +++++-----
 eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd    | 12 ++++++------
 eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target | 10 +++++-----
 eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd    | 12 ++++++------
 eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target |  8 ++++----
 eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd    | 10 +++++-----
 eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target |  8 ++++----
 eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd    |  8 ++++----
 eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target |  8 ++++----
 eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd    |  8 ++++----
 12 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 932e95b9d6..4738244e83 100644
--- a/README.md
+++ b/README.md
@@ -277,7 +277,7 @@ which resolves the specified dependencies and creates a `.target`.
 The process is:
 
    1. Install the TPD Editor, if necessary
-      - Use _Help > Install New Software_ and specify `http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/`
+      - Use _Help > Install New Software_ and specify `https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/`
         as the location.
       - Restart Eclipse when prompted
    2. Open the `.tpd` file in Eclipse.
diff --git a/eclipse/common-dependencies.tpd b/eclipse/common-dependencies.tpd
index b8a71c87a3..b8140e43a4 100644
--- a/eclipse/common-dependencies.tpd
+++ b/eclipse/common-dependencies.tpd
@@ -3,7 +3,7 @@
  */
 target "Cloud Tools for Eclipse: Common Dependencies"
 
-location "http://download.eclipse.org/tools/orbit/downloads/latest-R/" {
+location "https://download.eclipse.org/tools/orbit/downloads/latest-R/" {
   org.hamcrest.core [1.3.0,1.3.1)
   org.hamcrest.integration [1.3.0,1.3.1)
   org.hamcrest.library [1.3.0,1.3.1)
@@ -19,6 +19,6 @@ location "http://dadacoalition.org/yedit/" {
 }
 
 // SWTBot 2.8.0 supports Oxygen and later (https://wiki.eclipse.org/SWTBot#Latest_Release)
-location "http://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
+location "https://download.eclipse.org/technology/swtbot/releases/2.8.0/" {
   org.eclipse.swtbot.eclipse.feature.group
 }
diff --git a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
index 88a9f7a1ed..6761ac353b 100644
--- a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
+++ b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.11.v20180605"/>
       <unit id="org.eclipse.jetty.server" version="9.4.11.v20180605"/>
       <unit id="org.eclipse.jetty.util" version="9.4.11.v20180605"/>
-      <repository location="http://download.eclipse.org/releases/2018-09/201809191002/"/>
+      <repository location="https://download.eclipse.org/releases/2018-09/201809191002/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201802202154"/>
@@ -27,11 +27,11 @@
       <unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.11.0.v201807251925"/>
       <unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.1.v201802202154"/>
       <unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.601.v201802152148"/>
-      <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository"/>
+      <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.0.1.201809121533"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2018-09-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2018-09-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
index 9b0afad9ae..f4a90a401f 100644
--- a/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
+++ b/eclipse/eclipse-2018-09/gcp-eclipse-2018-09.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,8 +13,8 @@ target "GCP for Eclipse 2018-09" with source requirements
 // Eclipse Platform 4.9
 // Eclipse WTP 3.11
 
-// Eclipse 2018-09 (composite at http://download.eclipse.org/releases/2018-09/)
-location "http://download.eclipse.org/releases/2018-09/201809191002/" {
+// Eclipse 2018-09 (composite at https://download.eclipse.org/releases/2018-09/)
+location "https://download.eclipse.org/releases/2018-09/201809191002/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -33,8 +33,8 @@ location "http://download.eclipse.org/releases/2018-09/201809191002/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2018-09)
-location "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository" {
+// (composite at https://download.eclipse.org/webtools/repository/2018-09)
+location "https://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-20180910170749/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
     org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
@@ -44,7 +44,7 @@ location "http://download.eclipse.org/webtools/downloads/drops/R3.11.0/R-3.11.0-
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2018-09-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2018-09-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
index 87eba5f8ab..fe0baafca1 100644
--- a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
+++ b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.14.v20181113"/>
       <unit id="org.eclipse.jetty.server" version="9.4.14.v20181113"/>
       <unit id="org.eclipse.jetty.util" version="9.4.14.v20181113"/>
-      <repository location="http://download.eclipse.org/releases/2018-12/201812191000"/>
+      <repository location="https://download.eclipse.org/releases/2018-12/201812191000"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.8.0.v201802202154"/>
@@ -27,11 +27,11 @@
       <unit id="org.eclipse.wst.web_sdk.feature.feature.group" version="3.11.0.v201807251925"/>
       <unit id="org.eclipse.jst.enterprise_sdk.feature.feature.group" version="3.8.1.v201802202154"/>
       <unit id="org.eclipse.wst.server_adapters.sdk.feature.feature.group" version="3.2.601.v201802152148"/>
-      <repository location="http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository"/>
+      <repository location="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.1.0.201812121718"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2018-12-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2018-12-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
index 49837a245e..fb00b10844 100644
--- a/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
+++ b/eclipse/eclipse-2018-12/gcp-eclipse-2018-12.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,8 +13,8 @@ target "GCP for Eclipse 2018-12" with source requirements
 // Eclipse Platform 4.10
 // Eclipse WTP 3.12
 
-// Eclipse 2018-12 RC2 (composite at http://download.eclipse.org/releases/2018-12/)
-location "http://download.eclipse.org/releases/2018-12/201812191000" {
+// Eclipse 2018-12 RC2 (composite at https://download.eclipse.org/releases/2018-12/)
+location "https://download.eclipse.org/releases/2018-12/201812191000" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -33,8 +33,8 @@ location "http://download.eclipse.org/releases/2018-12/201812191000" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2018-12/)
-location "http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository" {
+// (composite at https://download.eclipse.org/webtools/repository/2018-12/)
+location "https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
     org.eclipse.jst.common.fproj.enablement.jdt.sdk.feature.group
@@ -44,7 +44,7 @@ location "http://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2018-12-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2018-12-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
index 5421203d76..0e15e0830f 100644
--- a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
+++ b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.20.v20190813"/>
       <unit id="org.eclipse.jetty.server" version="9.4.20.v20190813"/>
       <unit id="org.eclipse.jetty.util" version="9.4.20.v20190813"/>
-      <repository location="http://download.eclipse.org/releases/2019-09/"/>
+      <repository location="https://download.eclipse.org/releases/2019-09/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
@@ -31,7 +31,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.4.0.201909110158"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2019-09-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2019-09-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
index 8a4453aea9..46a511bd2f 100644
--- a/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
+++ b/eclipse/eclipse-2019-09/gcp-eclipse-2019-09.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,8 +13,8 @@ target "GCP for Eclipse 2019-09" with source requirements
 // Eclipse Platform 4.13
 // Eclipse WTP 3.15
 
-// Eclipse 2019-09 RC2 (composite at http://download.eclipse.org/releases/2019-09/)
-location "http://download.eclipse.org/releases/2019-09/" {
+// Eclipse 2019-09 RC2 (composite at https://download.eclipse.org/releases/2019-09/)
+location "https://download.eclipse.org/releases/2019-09/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -33,7 +33,7 @@ location "http://download.eclipse.org/releases/2019-09/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2019-09/)
+// (composite at https://download.eclipse.org/webtools/repository/2019-09/)
 location "https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
@@ -44,7 +44,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2019-09-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2019-09-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target
index e32eda460a..a5ceaadf36 100644
--- a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target
+++ b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.server" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.util" version="9.4.24.v20191120"/>
-      <repository location="http://download.eclipse.org/releases/2019-12/"/>
+      <repository location="https://download.eclipse.org/releases/2019-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
@@ -31,7 +31,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.5.0.201912091550"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd
index 2302ff2ba7..d0065ceb43 100644
--- a/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd
+++ b/eclipse/eclipse-2019-12/gcp-eclipse-2019-12.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,7 +13,7 @@ target "GCP for Eclipse 2019-12" with source requirements
 // Eclipse Platform 4.14
 // Eclipse WTP 3.16
 
-location "http://download.eclipse.org/releases/2019-12/" {
+location "https://download.eclipse.org/releases/2019-12/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -32,7 +32,7 @@ location "http://download.eclipse.org/releases/2019-12/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2019-12/)
+// (composite at https://download.eclipse.org/webtools/repository/2019-12/)
 location "https://download.eclipse.org/webtools/downloads/drops/R3.16.0/R-3.16.0-20191210070716/repository" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
@@ -43,7 +43,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.16.0/R-3.16.0
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2019-12-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2019-12-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 
diff --git a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target
index 3b62158784..3324bc43c9 100644
--- a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target
+++ b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.target
@@ -17,7 +17,7 @@
       <unit id="org.eclipse.jetty.servlet" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.server" version="9.4.24.v20191120"/>
       <unit id="org.eclipse.jetty.util" version="9.4.24.v20191120"/>
-      <repository location="http://download.eclipse.org/releases/2019-12/"/>
+      <repository location="https://download.eclipse.org/releases/2019-12/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.jst.web_sdk.feature.feature.group" version="3.15.0.v201908261515"/>
@@ -31,7 +31,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="4.5.0.201912091550"/>
-      <repository location="http://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
+      <repository location="https://download.eclipse.org/linuxtools/update-2019-12-docker/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
@@ -42,7 +42,7 @@
       <unit id="org.slf4j.apis.log4j" version="1.7.30.v20200204-2150"/>
       <unit id="org.slf4j.bridge.jul" version="1.7.30.v20200204-2150"/>
       <unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
-      <repository location="http://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
+      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-R/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.dadacoalition.yedit.feature.feature.group" version="1.0.20.201509041456-RELEASE"/>
@@ -50,7 +50,7 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
-      <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
+      <repository location="https://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
     </location>
   </locations>
 </target>
diff --git a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd
index edafe45543..0f0ca9b6fb 100644
--- a/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd
+++ b/eclipse/eclipse-2020-03/gcp-eclipse-2020-03.tpd
@@ -1,6 +1,6 @@
 /*
  * Target Platform Definition created using Eclipse TPD editor
- * (http://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
+ * (https://download.eclipse.org/cbi/tpd/3.0.0-SNAPSHOT/).
  *
  * If you make changes to this file, either:
  *
@@ -13,7 +13,7 @@ target "GCP for Eclipse 2020-03" with source requirements
 // Eclipse Platform 4.15
 // Eclipse WTP 3.17
 
-location "http://download.eclipse.org/releases/2020-03/" {
+location "https://download.eclipse.org/releases/2020-03/" {
     org.eclipse.sdk.feature.group
     org.eclipse.jdt.feature.group
     org.eclipse.m2e.feature.feature.group
@@ -32,7 +32,7 @@ location "http://download.eclipse.org/releases/2020-03/" {
 }
 
 // WTP SDKs aren't exposed through the main release links
-// (composite at http://download.eclipse.org/webtools/repository/2020-03/)
+// (composite at https://download.eclipse.org/webtools/repository/2020-03/)
 location "https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0-20200306035042/repository/" {
     org.eclipse.jst.web_sdk.feature.feature.group
     org.eclipse.jst.server_sdk.feature.feature.group
@@ -43,7 +43,7 @@ location "https://download.eclipse.org/webtools/downloads/drops/R3.17.0/R-3.17.0
     org.eclipse.wst.server_adapters.sdk.feature.feature.group
 }
 
-location "http://download.eclipse.org/linuxtools/update-2020-03-docker/" {
+location "https://download.eclipse.org/linuxtools/update-2020-03-docker/" {
     org.eclipse.linuxtools.docker.feature.feature.group
 }
 

From d3de300388ab5bbfd6dad496fbe614063f445d7d Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 09:22:52 -0500
Subject: [PATCH 12/22] try with maven 3.8.4

---
 kokoro/windows/continuous.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index a5ed8ba797..72637eaead 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -17,7 +17,7 @@ call gcloud.cmd components update --quiet
 call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
-mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.5.0
+mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
 call mvnw.cmd -V -B --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on

From cb6b5ce6c5d5f23e8da5c23a346f02f19461b1c6 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 09:28:22 -0500
Subject: [PATCH 13/22] show stacktrace on build error

---
 .github/workflows/eclipse-2018-09-java11.yml | 2 +-
 .github/workflows/eclipse-2018-09-java8.yml  | 2 +-
 .github/workflows/eclipse-2018-12-java11.yml | 2 +-
 .github/workflows/eclipse-2019-09-java11.yml | 2 +-
 .github/workflows/eclipse-2019-12-java11.yml | 2 +-
 .github/workflows/eclipse-2020-03-java11.yml | 2 +-
 kokoro/ubuntu/release.sh                     | 2 +-
 kokoro/windows/continuous.bat                | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/eclipse-2018-09-java11.yml b/.github/workflows/eclipse-2018-09-java11.yml
index 5fdcdae558..2c9addb19c 100644
--- a/.github/workflows/eclipse-2018-09-java11.yml
+++ b/.github/workflows/eclipse-2018-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index a0ba8ddd8c..0468d6ccf3 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -47,6 +47,6 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-12-java11.yml b/.github/workflows/eclipse-2018-12-java11.yml
index 9ef5a04695..a9d607d4f7 100644
--- a/.github/workflows/eclipse-2018-12-java11.yml
+++ b/.github/workflows/eclipse-2018-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-09-java11.yml b/.github/workflows/eclipse-2019-09-java11.yml
index 0ec567d643..22a1dddfc1 100644
--- a/.github/workflows/eclipse-2019-09-java11.yml
+++ b/.github/workflows/eclipse-2019-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-12-java11.yml b/.github/workflows/eclipse-2019-12-java11.yml
index b5a02e17c7..b62bdd5978 100644
--- a/.github/workflows/eclipse-2019-12-java11.yml
+++ b/.github/workflows/eclipse-2019-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2020-03-java11.yml b/.github/workflows/eclipse-2020-03-java11.yml
index 15475e5dd0..f99ccdf9b7 100644
--- a/.github/workflows/eclipse-2020-03-java11.yml
+++ b/.github/workflows/eclipse-2020-03-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/kokoro/ubuntu/release.sh b/kokoro/ubuntu/release.sh
index b392abdaba..85bc7b6064 100755
--- a/kokoro/ubuntu/release.sh
+++ b/kokoro/ubuntu/release.sh
@@ -38,7 +38,7 @@ cd github/google-cloud-eclipse
 #    - Single-quotes are necessary for `-Dproduct.version.qualifier.suffix`,
 #      since it should be appended as a constant string in a date format.
 TMPDIR= xvfb-run \
-  mvn -V -B \
+  mvn -V -B -e \
       -Doauth.client.id="${OAUTH_CLIENT_ID}" \
       -Doauth.client.secret="${OAUTH_CLIENT_SECRET}" \
       -Dfirelog.api.key="${FIRELOG_API_KEY}" \
diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index 72637eaead..e346576e0a 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -18,7 +18,7 @@ call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
 mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
-call mvnw.cmd -V -B --fail-at-end -Pci-build verify
+call mvnw.cmd -V -B -e --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on
 

From ab74eba9ecfd6377f0adb9c489e52255a05e1b2a Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 14 Dec 2021 22:31:58 -0500
Subject: [PATCH 14/22] chore: update to Tycho 2.5.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f2fc351320..86c1498dcc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,8 +39,8 @@
     <!-- Execution environment supported by Cloud Tools for Eclipse -->
     <requiredExecutionEnvironment>JavaSE-1.8</requiredExecutionEnvironment>
 
-    <tycho.version>1.5.0</tycho.version>
-    <tycho-extras.version>1.5.0</tycho-extras.version>
+    <tycho.version>2.5.0</tycho.version>
+    <tycho-extras.version>2.5.0</tycho-extras.version>
     <product.version.qualifier.suffix/>  <!-- 0-length string by default -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <eclipse.target>2018-09</eclipse.target> <!-- the default build -->

From be7797dd1154ad89a721c88bc7784216ec8d4552 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 10:29:04 -0500
Subject: [PATCH 15/22] add useJDK for tycho-surefire

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 86c1498dcc..fee711bfc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
       the Bundle-RequiredExecutionEnvironment. See `README.md` for details.
     -->
     <tycho.toolchains>SYSTEM</tycho.toolchains>
+    <tycho.testToolchains>SYSTEM</tycho.testToolchains>
 
     <!-- OS-specific JVM flags, empty for the default case but redefined below -->
     <os-jvm-flags/>
@@ -330,6 +331,7 @@
             <runOrder>hourly</runOrder>
             <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
             <trimStackTrace>false</trimStackTrace>
+            <useJDK>${tycho.testToolchains}</useJDK>
             <!--
               - maven.artifact.threads=1 to workaround repository corruption seen in
                 https://github.com/GoogleCloudPlatform/google-cloud-eclipse/issues/2284
@@ -427,6 +429,8 @@
       <properties>
          <jettyMinVersion>9.4</jettyMinVersion>
          <jettyMaxVersion>9.5</jettyMaxVersion>
+         <!-- 2018-09 was the last release to work on Java 8 -->
+         <tycho.testToolchains>BREE</tycho.testToolchains>
       </properties>
       <!-- build against a known target platform -->
       <modules>

From 67f83efed50959f6bc57eed70211d30e21762c45 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 15 Dec 2021 22:55:33 -0500
Subject: [PATCH 16/22] tycho 2.5.0 requires Java 11+ so must use BREE for Java
 8

---
 .github/workflows/eclipse-2018-09-java8.yml | 14 +++++++++++++-
 pom.xml                                     |  2 --
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index 0468d6ccf3..4686d88d52 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -20,7 +20,17 @@ jobs:
 
       - uses: actions/setup-java@v1
         with:
-          java-version: 8
+          java-version: 8  # Java 8 required for compilation.
+      - name: Set JDK 8 toolchain
+        run: |
+          sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
+
+      - uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Set JDK 11 toolchain
+        run: |
+          sed -i.bak -e "s,JDK_11_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
 
       - uses: google-github-actions/setup-gcloud@v0.2.0
 
@@ -47,6 +57,8 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
+         # 2018-09 was the last release to work on Java 8
           xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+            -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/pom.xml b/pom.xml
index fee711bfc4..33ff51d0eb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,8 +429,6 @@
       <properties>
          <jettyMinVersion>9.4</jettyMinVersion>
          <jettyMaxVersion>9.5</jettyMaxVersion>
-         <!-- 2018-09 was the last release to work on Java 8 -->
-         <tycho.testToolchains>BREE</tycho.testToolchains>
       </properties>
       <!-- build against a known target platform -->
       <modules>

From fb60b7966709cebfd05130da0d3bc208461143a6 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Wed, 2 Feb 2022 10:11:27 -0500
Subject: [PATCH 17/22] remove unneeded `mvn -e`

---
 .github/workflows/eclipse-2018-09-java11.yml | 2 +-
 .github/workflows/eclipse-2018-09-java8.yml  | 6 +++---
 .github/workflows/eclipse-2018-12-java11.yml | 2 +-
 .github/workflows/eclipse-2019-09-java11.yml | 2 +-
 .github/workflows/eclipse-2019-12-java11.yml | 2 +-
 .github/workflows/eclipse-2020-03-java11.yml | 2 +-
 kokoro/ubuntu/release.sh                     | 2 +-
 kokoro/windows/continuous.bat                | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/eclipse-2018-09-java11.yml b/.github/workflows/eclipse-2018-09-java11.yml
index 2c9addb19c..5fdcdae558 100644
--- a/.github/workflows/eclipse-2018-09-java11.yml
+++ b/.github/workflows/eclipse-2018-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index 4686d88d52..92c76284ee 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -18,13 +18,13 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      # Java 8 required for compilation, but Java 11 required by Tycho 2.5+
       - uses: actions/setup-java@v1
         with:
-          java-version: 8  # Java 8 required for compilation.
+          java-version: 8
       - name: Set JDK 8 toolchain
         run: |
           sed -i.bak -e "s,JDK_8_HOME,${JAVA_HOME}," .github/workflows/toolchains.xml
-
       - uses: actions/setup-java@v1
         with:
           java-version: 11
@@ -58,7 +58,7 @@ jobs:
           gcloud components install app-engine-java --quiet
 
          # 2018-09 was the last release to work on Java 8
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2018-12-java11.yml b/.github/workflows/eclipse-2018-12-java11.yml
index a9d607d4f7..9ef5a04695 100644
--- a/.github/workflows/eclipse-2018-12-java11.yml
+++ b/.github/workflows/eclipse-2018-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-09-java11.yml b/.github/workflows/eclipse-2019-09-java11.yml
index 22a1dddfc1..0ec567d643 100644
--- a/.github/workflows/eclipse-2019-09-java11.yml
+++ b/.github/workflows/eclipse-2019-09-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2019-12-java11.yml b/.github/workflows/eclipse-2019-12-java11.yml
index b62bdd5978..b5a02e17c7 100644
--- a/.github/workflows/eclipse-2019-12-java11.yml
+++ b/.github/workflows/eclipse-2019-12-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/.github/workflows/eclipse-2020-03-java11.yml b/.github/workflows/eclipse-2020-03-java11.yml
index f99ccdf9b7..15475e5dd0 100644
--- a/.github/workflows/eclipse-2020-03-java11.yml
+++ b/.github/workflows/eclipse-2020-03-java11.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-          xvfb-run mvn --show-version --batch-mode --fail-at-end -e \
+          xvfb-run mvn --show-version --batch-mode --fail-at-end \
             --toolchains=.github/workflows/toolchains.xml \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify
diff --git a/kokoro/ubuntu/release.sh b/kokoro/ubuntu/release.sh
index 85bc7b6064..b392abdaba 100755
--- a/kokoro/ubuntu/release.sh
+++ b/kokoro/ubuntu/release.sh
@@ -38,7 +38,7 @@ cd github/google-cloud-eclipse
 #    - Single-quotes are necessary for `-Dproduct.version.qualifier.suffix`,
 #      since it should be appended as a constant string in a date format.
 TMPDIR= xvfb-run \
-  mvn -V -B -e \
+  mvn -V -B \
       -Doauth.client.id="${OAUTH_CLIENT_ID}" \
       -Doauth.client.secret="${OAUTH_CLIENT_SECRET}" \
       -Dfirelog.api.key="${FIRELOG_API_KEY}" \
diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index e346576e0a..72637eaead 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -18,7 +18,7 @@ call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
 mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
-call mvnw.cmd -V -B -e --fail-at-end -Pci-build verify
+call mvnw.cmd -V -B --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on
 

From d92903ba9b0fb7813d55ce411a59a334e49af18e Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Sun, 13 Mar 2022 22:42:00 -0400
Subject: [PATCH 18/22] kokoro: install Java 11, and configure toolchains

---
 kokoro/windows/continuous.bat | 12 +++++++++---
 kokoro/windows/toolchains.xml | 26 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 kokoro/windows/toolchains.xml

diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index 72637eaead..e0155fea3d 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -1,6 +1,12 @@
 @echo on
-rem Tycho 1.0.0 does not support Java 9
-set "JAVA_HOME=C:\Program Files\Java\jdk1.8.0_152"
+rem Tycho 2.5.0+ requires Java 11+
+curl --silent --show-error --location --output openjdk-11.zip "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1+1/OpenJDK11U-jre_x64_windows_hotspot_11.0.14.1_1.zip"
+unzip -q -d "c:\Program Files\openjdk" openjdk-11.zip
+@rem need to update toolchains.xml with JRE path
+set "JAVA_HOME=c:\Program Files\openjdk\jdk-11.0.14.1+1-jre"
+set "PATH=%JAVA_HOME%\bin;%PATH%"
+@echo JAVA_HOME: %JAVA_HOME%
+java -version
 
 rem To speed up build, download and unpack an M2 repo cache.
 pushd %USERPROFILE%
@@ -18,7 +24,7 @@ call gcloud.cmd components install app-engine-java --quiet
 @echo on
 
 mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
-call mvnw.cmd -V -B --fail-at-end -Pci-build verify
+call mvnw.cmd --toolchains=kokoro/windows/toolchains.xml -V -B --fail-at-end -Pci-build verify
 set MAVEN_BUILD_EXIT=%ERRORLEVEL%
 @echo on
 
diff --git a/kokoro/windows/toolchains.xml b/kokoro/windows/toolchains.xml
new file mode 100644
index 0000000000..8223d57a2b
--- /dev/null
+++ b/kokoro/windows/toolchains.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF8"?>
+<toolchains>
+  <!-- JDK toolchains -->
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <id>JavaSE-1.8</id>
+      <version>1.8</version>
+      <vendor>openjdk</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>c:/Program Files/Java/jdk1.8.0_152/jre</jdkHome>
+    </configuration>
+  </toolchain>
+  <toolchain>
+    <type>jdk</type>
+    <provides>
+      <id>JavaSE-11</id>
+      <version>11</version>
+      <vendor>openjdk</vendor>
+    </provides>
+    <configuration>
+      <jdkHome>c:/Program Files/openjdk/jdk-11.0.14.1+1-jre</jdkHome>
+    </configuration>
+  </toolchain>
+</toolchains>

From 3a8f6ee664e7b405bf9cf7d8e53b9de9a2502779 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Mon, 14 Mar 2022 22:55:16 -0400
Subject: [PATCH 19/22] fix yaml indentation

---
 .github/workflows/eclipse-2018-09-java8.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index 92c76284ee..a42a705854 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -57,7 +57,7 @@ jobs:
           export PATH="${HOME}/google-cloud-sdk/bin:${PATH}"
           gcloud components install app-engine-java --quiet
 
-         # 2018-09 was the last release to work on Java 8
+          # 2018-09 was the last release to work on Java 8
           xvfb-run mvn --show-version --batch-mode --fail-at-end \
             -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \

From 94d47284283adf7b22a111bcb744a15d729c217f Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Mon, 14 Mar 2022 23:01:52 -0400
Subject: [PATCH 20/22] with tycho 2.5.0, we must use toolchains

---
 .github/workflows/eclipse-2018-09-java8.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index a42a705854..6e73762bb8 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -59,6 +59,7 @@ jobs:
 
           # 2018-09 was the last release to work on Java 8
           xvfb-run mvn --show-version --batch-mode --fail-at-end \
+            --toolchains=.github/workflows/toolchains.xml \
             -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
             -Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
             clean verify

From be3cca1753f32373947b030c913fcc2089afab1e Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 15 Mar 2022 22:25:00 -0400
Subject: [PATCH 21/22] install Java 17 as is required for Eclipse 2021
 releases

---
 kokoro/windows/continuous.bat | 6 +++---
 kokoro/windows/toolchains.xml | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index e0155fea3d..c6db1557a7 100644
--- a/kokoro/windows/continuous.bat
+++ b/kokoro/windows/continuous.bat
@@ -1,9 +1,9 @@
 @echo on
 rem Tycho 2.5.0+ requires Java 11+
-curl --silent --show-error --location --output openjdk-11.zip "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.14.1+1/OpenJDK11U-jre_x64_windows_hotspot_11.0.14.1_1.zip"
-unzip -q -d "c:\Program Files\openjdk" openjdk-11.zip
+curl --silent --show-error --location --output openjdk-17.zip "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.2+8/OpenJDK17U-jre_x64_windows_hotspot_17.0.2_8.zip"
+unzip -q -d "c:\Program Files\openjdk" openjdk-17.zip
 @rem need to update toolchains.xml with JRE path
-set "JAVA_HOME=c:\Program Files\openjdk\jdk-11.0.14.1+1-jre"
+set "JAVA_HOME=c:\Program Files\openjdk\jdk-17.0.2+8-jre"
 set "PATH=%JAVA_HOME%\bin;%PATH%"
 @echo JAVA_HOME: %JAVA_HOME%
 java -version
diff --git a/kokoro/windows/toolchains.xml b/kokoro/windows/toolchains.xml
index 8223d57a2b..6923681a5f 100644
--- a/kokoro/windows/toolchains.xml
+++ b/kokoro/windows/toolchains.xml
@@ -16,11 +16,11 @@
     <type>jdk</type>
     <provides>
       <id>JavaSE-11</id>
-      <version>11</version>
+      <version>17</version>
       <vendor>openjdk</vendor>
     </provides>
     <configuration>
-      <jdkHome>c:/Program Files/openjdk/jdk-11.0.14.1+1-jre</jdkHome>
+      <jdkHome>c:/Program Files/openjdk/jdk-17.0.2+8-jre</jdkHome>
     </configuration>
   </toolchain>
 </toolchains>

From 1951eef9485c97dace052efa74807fb09b3f6479 Mon Sep 17 00:00:00 2001
From: Brian de Alwis <bdealwis@google.com>
Date: Tue, 15 Mar 2022 23:30:55 -0400
Subject: [PATCH 22/22] back out javax.inject change

---
 .../META-INF/MANIFEST.MF                                         | 1 -
 .../META-INF/MANIFEST.MF                                         | 1 -
 .../META-INF/MANIFEST.MF                                         | 1 -
 3 files changed, 3 deletions(-)

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
index ea6acf4296..1f954ca9b8 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.libraries/META-INF/MANIFEST.MF
@@ -35,7 +35,6 @@ Import-Package: com.google.cloud.tools.appengine.operations;version="0.8.1",
  com.google.common.collect;version="[30.0.0,31.0.0)",
  com.google.common.util.concurrent;version="[30.0.0,31.0.0)",
  com.google.gson;version="[2.8.2,3.0)",
- javax.inject;version="1.0.0",
  javax.json;version="[1.0,1.1)",
  org.eclipse.core.resources,
  org.eclipse.core.runtime;version="3.5.0",
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
index c8c80251dd..49781b2f2d 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.localserver/META-INF/MANIFEST.MF
@@ -65,7 +65,6 @@ Import-Package: com.google.api.client.auth.oauth2;version="[1.25.0,1.26.0)",
  com.google.cloud.tools.eclipse.util.jobs,
  com.google.cloud.tools.eclipse.util.service,
  com.google.cloud.tools.eclipse.util.status,
- javax.inject;version="1.0.0",
  org.eclipse.compare,
  org.eclipse.compare.structuremergeviewer,
  org.eclipse.core.filesystem,
diff --git a/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF b/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF
index cd3dc5efbe..379a1051be 100644
--- a/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF
+++ b/plugins/com.google.cloud.tools.eclipse.util.test/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Require-Bundle: com.google.cloud.tools.eclipse.test.dependencies
 Import-Package: com.google.cloud.tools.eclipse.test.util,
  com.google.cloud.tools.eclipse.test.util.http,
  com.google.cloud.tools.eclipse.test.util.project,
- javax.inject;version="1.0.0",
  org.eclipse.jdt.core,
  org.eclipse.jst.common.project.facet.core
 Require-Capability: com.google.cloud.tools.facets.appengine;filter:="(type=jre8)"