Merge remote-tracking branch 'origin/master' into BETA_JAVA16
Change-Id: I7d3092fb2520e1e0b348a73692d1a6865ac0a708
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
index 95d0c2c..80c975f 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ModuleOptionsTests.java
@@ -83,6 +83,18 @@
+ "jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported," // jdk.scripting.nashorn removed in 15
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";
+ private static final String ASSUMED_DEFAULT_MODULES_16 = "java.se," //
+ + "jdk.accessibility,jdk.attach,jdk.compiler,jdk.dynalink,jdk.httpserver," //
+ + "jdk.incubator.foreign,jdk.incubator.vector," // jdk.incubator.vector added in 16
+ + "jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi," //
+ + "jdk.jfr," //
+ + "jdk.jshell,jdk.jsobject,jdk.management," //
+ + "jdk.management.jfr," //
+ + "jdk.net," //
+ + "jdk.nio.mapmode," //
+ + "jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,"
+ + "jdk.unsupported.desktop," //
+ + "jdk.xml.dom";
public ModuleOptionsTests(String name) {
@@ -216,6 +228,22 @@
+ "jdk.unsupported.desktop," //
+ "jdk.xml.dom";
break;
+ case ASSUMED_DEFAULT_MODULES_16:
+ expectedModules = "java.se," //
+ + "jdk.accessibility," //
+ + "jdk.dynalink,"
+ + "jdk.httpserver," //
+ + "jdk.incubator.foreign,jdk.incubator.vector," // jdk.incubator.vector added in 16
+ + "jdk.jartool,jdk.jconsole,jdk.jshell," //
+ + "jdk.jsobject," //
+ + "jdk.management.jfr," //
+ + "jdk.net," //
+ + "jdk.nio.mapmode," //
+ + "jdk.sctp,"
+ + "jdk.security.auth,jdk.security.jgss,jdk.unsupported," //
+ + "jdk.unsupported.desktop," //
+ + "jdk.xml.dom";
+ break;
default:
fail("Unknown set of default modules " + String.join(",", defaultModules));
return;
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
index 4f7442a..de55b1f 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/EECompilationParticipant.java
@@ -7,6 +7,9 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
+ * This is an implementation of an early-draft specification developed under the Java
+ * Community Process (JCP) and is made available for testing and evaluation purposes
+ * only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
@@ -234,6 +237,8 @@
String version = vMInstall.getJavaVersion();
if (version == null) {
return null;
+ } else if (version.startsWith(JavaCore.VERSION_16)) {
+ return JavaCore.VERSION_16;
} else if (version.startsWith(JavaCore.VERSION_15)) {
return JavaCore.VERSION_15;
} else if (version.startsWith(JavaCore.VERSION_14)) {
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
index 0aac5ee..ab8994f 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/StandardVMType.java
@@ -7,6 +7,10 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
+ * This is an implementation of an early-draft specification developed under the Java
+ * Community Process (JCP) and is made available for testing and evaluation purposes
+ * only. The code is not compatible with any specification of the JCP.
+ *
* Contributors:
* IBM Corporation - initial API and implementation
* Michael Allman - Bug 211648, Bug 156343 - Standard VM not supported on MacOS
@@ -845,7 +849,10 @@
*/
public static URL getDefaultJavadocLocation(String version) {
try {
- if (version.startsWith(JavaCore.VERSION_15)) {
+ if (version.startsWith(JavaCore.VERSION_16)) {
+ // TODO: Needs an update after Java 16 release
+ return new URL("https://docs.oracle.com/en/java/javase/15/docs/api/"); //$NON-NLS-1$
+ } else if (version.startsWith(JavaCore.VERSION_15)) {
return new URL("https://docs.oracle.com/en/java/javase/15/docs/api/"); //$NON-NLS-1$
} else if (version.startsWith(JavaCore.VERSION_14)) {
return new URL("https://docs.oracle.com/en/java/javase/14/docs/api/"); //$NON-NLS-1$
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
index a00de54..3f6e8de 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/EnvironmentsManager.java
@@ -7,6 +7,9 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
+ * This is an implementation of an early-draft specification developed under the Java
+ * Community Process (JCP) and is made available for testing and evaluation purposes
+ * only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
@@ -196,7 +199,9 @@
private String getExecutionEnvironmentCompliance(IExecutionEnvironment executionEnvironment) {
String desc = executionEnvironment.getId();
- if (desc.indexOf(JavaCore.VERSION_15) != -1) {
+ if (desc.indexOf(JavaCore.VERSION_16) != -1) {
+ return JavaCore.VERSION_16;
+ } else if (desc.indexOf(JavaCore.VERSION_15) != -1) {
return JavaCore.VERSION_15;
} else if (desc.indexOf(JavaCore.VERSION_14) != -1) {
return JavaCore.VERSION_14;
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java
index 5bd502e..db58fd3 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/environments/ExecutionEnvironmentAnalyzer.java
@@ -7,6 +7,9 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
+ * This is an implementation of an early-draft specification developed under the Java
+ * Community Process (JCP) and is made available for testing and evaluation purposes
+ * only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
@@ -41,6 +44,7 @@
// XXX: Note that this string is not yet standardized by OSGi, see http://wiki.osgi.org/wiki/Execution_Environment
+ private static final String JavaSE_16 = "JavaSE-16"; //$NON-NLS-1$
private static final String JavaSE_15 = "JavaSE-15"; //$NON-NLS-1$
private static final String JavaSE_14 = "JavaSE-14"; //$NON-NLS-1$
private static final String JavaSE_13 = "JavaSE-13"; //$NON-NLS-1$
@@ -89,12 +93,13 @@
mappings.put(JavaSE_1_8, new String[] { JavaSE_1_7 });
mappings.put(JavaSE_9, new String[] { JavaSE_1_8 });
mappings.put(JavaSE_10, new String[] { JavaSE_9 });
- mappings.put(JavaSE_10_Plus, new String[] { JavaSE_15 });
+ mappings.put(JavaSE_10_Plus, new String[] { JavaSE_16 });
mappings.put(JavaSE_11, new String[] { JavaSE_10 });
mappings.put(JavaSE_12, new String[] { JavaSE_11 });
mappings.put(JavaSE_13, new String[] { JavaSE_12 });
mappings.put(JavaSE_14, new String[] { JavaSE_13 });
mappings.put(JavaSE_15, new String[] { JavaSE_14 });
+ mappings.put(JavaSE_16, new String[] { JavaSE_15 });
}
@Override
public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
@@ -120,7 +125,9 @@
types = getTypes(CDC_FOUNDATION_1_1);
}
} else {
- if (javaVersion.startsWith("15")) { //$NON-NLS-1$
+ if (javaVersion.startsWith("16")) { //$NON-NLS-1$
+ types = getTypes(JavaSE_16);
+ } else if (javaVersion.startsWith("15")) { //$NON-NLS-1$
types = getTypes(JavaSE_15);
} else if (javaVersion.startsWith("14")) { //$NON-NLS-1$
types = getTypes(JavaSE_14);
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index 29d4e21..904806f 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -7,6 +7,9 @@
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
+ * This is an implementation of an early-draft specification developed under the Java
+ * Community Process (JCP) and is made available for testing and evaluation purposes
+ * only. The code is not compatible with any specification of the JCP.
*
* Contributors:
* IBM Corporation - initial API and implementation
@@ -3337,8 +3340,11 @@
} else if (javaVersion.startsWith(JavaCore.VERSION_15)
&& (javaVersion.length() == JavaCore.VERSION_15.length() || javaVersion.charAt(JavaCore.VERSION_15.length()) == '.')) {
compliance = JavaCore.VERSION_15;
+ } else if (javaVersion.startsWith(JavaCore.VERSION_16)
+ && (javaVersion.length() == JavaCore.VERSION_16.length() || javaVersion.charAt(JavaCore.VERSION_16.length()) == '.')) {
+ compliance = JavaCore.VERSION_16;
} else {
- compliance = JavaCore.VERSION_15; // use latest by default
+ compliance = JavaCore.VERSION_16; // use latest by default
}
Hashtable<String, String> options= JavaCore.getOptions();
diff --git a/org.eclipse.jdt.launching/plugin.properties b/org.eclipse.jdt.launching/plugin.properties
index ec8aa5b..294869a 100644
--- a/org.eclipse.jdt.launching/plugin.properties
+++ b/org.eclipse.jdt.launching/plugin.properties
@@ -7,7 +7,10 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
-#
+# This is an implementation of an early-draft specification developed under the Java
+# Community Process (JCP) and is made available for testing and evaluation purposes
+# only. The code is not compatible with any specification of the JCP.
+
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
@@ -77,6 +80,7 @@
environment.description.17 = Java Platform, Standard Edition 13
environment.description.18 = Java Platform, Standard Edition 14
environment.description.19 = Java Platform, Standard Edition 15
+environment.description.20 = Java Platform, Standard Edition 16
classpathVariableInitializer.deprecated = Use the JRE System Library instead
diff --git a/org.eclipse.jdt.launching/plugin.xml b/org.eclipse.jdt.launching/plugin.xml
index 9997cfb..ad6aff0 100644
--- a/org.eclipse.jdt.launching/plugin.xml
+++ b/org.eclipse.jdt.launching/plugin.xml
@@ -8,8 +8,11 @@
which accompanies this distribution, and is available at
https://www.eclipse.org/legal/epl-2.0/
- SPDX-License-Identifier: EPL-2.0
-
+ SPDX-License-Identifier: EPL-2.0
+ This is an implementation of an early-draft specification developed under the Java
+ Community Process (JCP) and is made available for testing and evaluation purposes
+ only. The code is not compatible with any specification of the JCP.
+
Contributors:
IBM Corporation - initial API and implementation
-->
@@ -352,6 +355,11 @@
description="%environment.description.19"
id="JavaSE-15"
compliance="15">
+ </environment>
+ <environment
+ description="%environment.description.20"
+ id="JavaSE-16"
+ compliance="16">
</environment>
<analyzer
class="org.eclipse.jdt.internal.launching.environments.ExecutionEnvironmentAnalyzer"
diff --git a/pom.xml b/pom.xml
index 3dfd018..2a0aaa9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2016 Eclipse Foundation and others.
+ Copyright (c) 2012, 2020 Eclipse Foundation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
@@ -8,6 +8,9 @@
Contributors:
Igor Fedorenko - initial implementation
+ IBM Corporation - bug fixes
+
+
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -35,6 +38,10 @@
<profiles>
<profile>
<id>build-individual-bundles</id>
+ <properties>
+ <eclipse-p2-repo.url>http://download.eclipse.org/eclipse/updates/Y-builds</eclipse-p2-repo.url>
+ <skipAPIAnalysis>true</skipAPIAnalysis>
+ </properties>
<repositories>
<repository>
<releases>
