Bug 567050 - Cannot Setup Xtext with 2020-09 Eclipse installer
Add jdk.crypto.ec to the modules.
Use the 4.17 release for the Eclipse SDK.
Add support for building the Java 15 release.
diff --git a/releng/org.eclipse.justj.releng/Jenkinsfile b/releng/org.eclipse.justj.releng/Jenkinsfile
index 483a95e..7fabf8d 100644
--- a/releng/org.eclipse.justj.releng/Jenkinsfile
+++ b/releng/org.eclipse.justj.releng/Jenkinsfile
@@ -99,13 +99,13 @@
PUBLISH_LOCATION_PREFIX: "${testPrefix}",
JUSTJ_MANIFEST_URL: "${justjURL}/${testPrefix}/15/downloads/latest/justj.manifest",
JDK_URLS_WINDOWS: '''
- https://download.java.net/java/early_access/jdk15/26/GPL/openjdk-15-ea+26_windows-x64_bin.zip
+ https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_windows-x64_bin.zip
''',
JDK_URLS_MACOS: '''
- https://download.java.net/java/early_access/jdk15/26/GPL/openjdk-15-ea+26_osx-x64_bin.tar.gz
+ https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_osx-x64_bin.tar.gz
''',
JDK_URLS_LINUX: '''
- https://download.java.net/java/early_access/jdk15/26/GPL/openjdk-15-ea+26_linux-x64_bin.tar.gz
+ https://download.java.net/java/GA/jdk15/779bf45e88a44cbd9ea6621d33e33db1/36/GPL/openjdk-15_linux-x64_bin.tar.gz
''',
BUILD_TYPE: 'nightly',
PROMOTE: 'true'
@@ -119,10 +119,10 @@
java15
]
-def javaDefault = update(java14, [
- BUILD_DESCRIPTION: 'Build jdk.java.net Java 14',
+def javaDefault = update(java15, [
+ BUILD_DESCRIPTION: 'Build jdk.java.net Java 15',
PUBLISH_LOCATION_PREFIX: "${defaultPrefix}",
- JUSTJ_MANIFEST_URL: "${justjURL}/${defaultPrefix}/14/downloads/latest/justj.manifest"
+ JUSTJ_MANIFEST_URL: "${justjURL}/${defaultPrefix}/15/downloads/latest/justj.manifest"
])
// Use declarative syntax to run commands inside a Groovy sand-box container.
diff --git a/releng/org.eclipse.justj.releng/build-jre.sh b/releng/org.eclipse.justj.releng/build-jre.sh
index 07d572c..82fd1dc 100755
--- a/releng/org.eclipse.justj.releng/build-jre.sh
+++ b/releng/org.eclipse.justj.releng/build-jre.sh
@@ -81,7 +81,7 @@
# Download an os-specific version of Eclipse.
#
-eclipse_url="https://download.eclipse.org/eclipse/downloads/drops4/R-4.16-202006040540/eclipse-SDK-4.16$eclipse_suffix"
+eclipse_url="https://download.eclipse.org/eclipse/downloads/drops4/R-4.17-202009021800/eclipse-SDK-4.17$eclipse_suffix"
eclipse_file=${eclipse_url##*/}
if [ ! -f $eclipse_file ]; then
@@ -125,7 +125,7 @@
# Remove the incubator modules.
#
all_modules=$($jdk/$jdk_relative_bin_folder/java --list-modules | sed "s/@.*//g" | grep -v "jdk.incubator" | tr '\n' ',' | sed 's/,$//')
-simrel_modules="java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.sql.rowset,java.xml,jdk.jdi,jdk.management,jdk.unsupported,jdk.xml.dom"
+simrel_modules="java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,java.management,java.naming,java.prefs,java.rmi,java.scripting,java.security.jgss,java.security.sasl,java.sql,java.sql.rowset,java.xml,jdk.crypto.ec,jdk.jdi,jdk.management,jdk.unsupported,jdk.xml.dom"
installer_modules="java.base,java.desktop,java.logging,java.management,java.naming,java.prefs,java.security.jgss,java.sql,java.xml,jdk.xml.dom,jdk.unsupported"
