diff --git a/.github/workflows/eclipse-2018-09-java8.yml b/.github/workflows/eclipse-2018-09-java8.yml
index a0ba8ddd8c..6e73762bb8 100644
--- a/.github/workflows/eclipse-2018-09-java8.yml
+++ b/.github/workflows/eclipse-2018-09-java8.yml
@@ -18,9 +18,19 @@ 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
+ - 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,9 @@ 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 \
+ --toolchains=.github/workflows/toolchains.xml \
+ -Dtycho.toolchains=BREE -Dtycho.testToolchains=BREE \
-Derrorprone -Dci-build -Declipse-target=${{ env.ECLIPSE_TARGET }} \
clean verify
diff --git a/.github/workflows/eclipse-latest-java17.yml b/.github/workflows/eclipse-latest-java17.yml
new file mode 100644
index 0000000000..57fc2d0f84
--- /dev/null
+++ b/.github/workflows/eclipse-latest-java17.yml
@@ -0,0 +1,66 @@
+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: 17
+ - name: Set JDK 17 toolchain
+ run: |
+ sed -i.bak \
+ -e "s,JDK_11_HOME,${JAVA_HOME}," \
+ -e "s,JavaSE-11,JavaSE-17," \
+ -e "s,11,17," \
+ .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/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 @@
-
+
@@ -27,11 +27,11 @@
-
+
-
+
@@ -42,7 +42,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
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 @@
-
+
@@ -27,11 +27,11 @@
-
+
-
+
@@ -42,7 +42,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
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 @@
-
+
@@ -31,7 +31,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
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 @@
-
+
@@ -31,7 +31,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
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 @@
-
+
@@ -31,7 +31,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -50,7 +50,7 @@
-
+
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
}
diff --git a/kokoro/windows/continuous.bat b/kokoro/windows/continuous.bat
index a5ed8ba797..c6db1557a7 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-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-17.0.2+8-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%
@@ -17,8 +23,8 @@ 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
-call mvnw.cmd -V -B --fail-at-end -Pci-build verify
+mvn -V -B -N io.takari:maven:wrapper -Dmaven=3.8.4
+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..6923681a5f
--- /dev/null
+++ b/kokoro/windows/toolchains.xml
@@ -0,0 +1,26 @@
+
+
+
+
+ jdk
+
+ JavaSE-1.8
+ 1.8
+ openjdk
+
+
+ c:/Program Files/Java/jdk1.8.0_152/jre
+
+
+
+ jdk
+
+ JavaSE-11
+ 17
+ openjdk
+
+
+ c:/Program Files/openjdk/jdk-17.0.2+8-jre
+
+
+
diff --git a/pom.xml b/pom.xml
index f2fc351320..2edc01f2e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,11 +39,11 @@
JavaSE-1.8
- 1.5.0
- 1.5.0
+ 2.5.0
+ 2.5.0
UTF-8
- 2018-09
+
1.8
1.8
@@ -66,6 +66,7 @@
the Bundle-RequiredExecutionEnvironment. See `README.md` for details.
-->
SYSTEM
+ SYSTEM
@@ -330,6 +331,7 @@
hourly
600
false
+ ${tycho.testToolchains}
- build-eclipse-2018-09
+ build-latest-release
!eclipse.target
-
+
+
+
+
+ 9.4
+ 99
+
+
+
+ eclipse-latest-release
+ Eclipse latest release
+ https://download.eclipse.org/releases/latest/
+ p2
+
+
+ orbit
+ https://download.eclipse.org/tools/orbit/downloads/latest-R/
+ p2
+
+
+ yedit
+ http://dadacoalition.org/yedit
+ p2
+
+
+
+
+
+ build-eclipse-2018-09
+
+
+ eclipse.target 2018-09