Bug 577682 - [18] Release Activities
Merge remote-tracking branch 'origin/BETA_JAVA18'
Conflicts:
org.eclipse.jdt.launching/META-INF/MANIFEST.MF
org.eclipse.jdt.launching/pom.xml
Change-Id: Ib156ab75c4ee01c90fa9a91d8e19a93390fb362e
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 560006d..3c058b8 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2021 IBM Corporation and others.
+ * Copyright (c) 2008, 2022 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -234,6 +234,8 @@
String version = vMInstall.getJavaVersion();
if (version == null) {
return null;
+ } else if (version.startsWith(JavaCore.VERSION_18)) {
+ return JavaCore.VERSION_18;
} else if (version.startsWith(JavaCore.VERSION_17)) {
return JavaCore.VERSION_17;
} else if (version.startsWith(JavaCore.VERSION_16)) {
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 d2db66f..6af52d7 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2021 IBM Corporation and others.
+ * Copyright (c) 2000, 2022 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -846,7 +846,9 @@
*/
public static URL getDefaultJavadocLocation(String version) {
try {
- if (version.startsWith(JavaCore.VERSION_17)) {
+ if (version.startsWith(JavaCore.VERSION_18)) {
+ return new URL("https://docs.oracle.com/en/java/javase/18/docs/api/"); //$NON-NLS-1$
+ } else if (version.startsWith(JavaCore.VERSION_17)) {
return new URL("https://docs.oracle.com/en/java/javase/17/docs/api/"); //$NON-NLS-1$
} else if (version.startsWith(JavaCore.VERSION_16)) {
return new URL("https://docs.oracle.com/en/java/javase/16/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 61d52ca..aae151c 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2021 IBM Corporation and others.
+ * Copyright (c) 2005, 2022 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -196,7 +196,9 @@
private String getExecutionEnvironmentCompliance(IExecutionEnvironment executionEnvironment) {
String desc = executionEnvironment.getId();
- if (desc.indexOf(JavaCore.VERSION_17) != -1) {
+ if (desc.indexOf(JavaCore.VERSION_18) != -1) {
+ return JavaCore.VERSION_18;
+ } else if (desc.indexOf(JavaCore.VERSION_17) != -1) {
return JavaCore.VERSION_17;
} else if (desc.indexOf(JavaCore.VERSION_16) != -1) {
return JavaCore.VERSION_16;
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 9a42539..4fe1cd7 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2021 IBM Corporation and others.
+ * Copyright (c) 2006, 2022 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -41,6 +41,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_18 = "JavaSE-18"; //$NON-NLS-1$
private static final String JavaSE_17 = "JavaSE-17"; //$NON-NLS-1$
private static final String JavaSE_16 = "JavaSE-16"; //$NON-NLS-1$
private static final String JavaSE_15 = "JavaSE-15"; //$NON-NLS-1$
@@ -91,7 +92,7 @@
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_17 });
+ mappings.put(JavaSE_10_Plus, new String[] { JavaSE_18 });
mappings.put(JavaSE_11, new String[] { JavaSE_10 });
mappings.put(JavaSE_12, new String[] { JavaSE_11 });
mappings.put(JavaSE_13, new String[] { JavaSE_12 });
@@ -99,6 +100,7 @@
mappings.put(JavaSE_15, new String[] { JavaSE_14 });
mappings.put(JavaSE_16, new String[] { JavaSE_15 });
mappings.put(JavaSE_17, new String[] { JavaSE_16 });
+ mappings.put(JavaSE_18, new String[] { JavaSE_17 });
}
@Override
public CompatibleEnvironment[] analyze(IVMInstall vm, IProgressMonitor monitor) throws CoreException {
@@ -124,7 +126,9 @@
types = getTypes(CDC_FOUNDATION_1_1);
}
} else {
- if (javaVersion.startsWith("17")) { //$NON-NLS-1$
+ if (javaVersion.startsWith("18")) { //$NON-NLS-1$
+ types = getTypes(JavaSE_18);
+ } else if (javaVersion.startsWith("17")) { //$NON-NLS-1$
types = getTypes(JavaSE_17);
} else if (javaVersion.startsWith("16")) { //$NON-NLS-1$
types = getTypes(JavaSE_16);
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 8319cdb..5335b72 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2021 IBM Corporation and others.
+ * Copyright (c) 2000, 2022 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -3361,8 +3361,11 @@
} else if (javaVersion.startsWith(JavaCore.VERSION_17)
&& (javaVersion.length() == JavaCore.VERSION_17.length() || javaVersion.charAt(JavaCore.VERSION_17.length()) == '.')) {
compliance = JavaCore.VERSION_17;
+ } else if (javaVersion.startsWith(JavaCore.VERSION_18)
+ && (javaVersion.length() == JavaCore.VERSION_18.length() || javaVersion.charAt(JavaCore.VERSION_18.length()) == '.')) {
+ compliance = JavaCore.VERSION_18;
} else {
- compliance = JavaCore.VERSION_17; // use latest by default
+ compliance = JavaCore.VERSION_18; // 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 7a1835d..2b5b673 100644
--- a/org.eclipse.jdt.launching/plugin.properties
+++ b/org.eclipse.jdt.launching/plugin.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2021 IBM Corporation and others.
+# Copyright (c) 2000, 2022 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
@@ -7,6 +7,7 @@
# https://www.eclipse.org/legal/epl-2.0/
#
# SPDX-License-Identifier: EPL-2.0
+#
# Contributors:
# IBM Corporation - initial API and implementation
###############################################################################
@@ -78,6 +79,7 @@
environment.description.19 = Java Platform, Standard Edition 15
environment.description.20 = Java Platform, Standard Edition 16
environment.description.21 = Java Platform, Standard Edition 17
+environment.description.22 = Java Platform, Standard Edition 18
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 8e6850f..3229eb8 100644
--- a/org.eclipse.jdt.launching/plugin.xml
+++ b/org.eclipse.jdt.launching/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.0"?>
<!--
- Copyright (c) 2005, 2021 IBM Corporation and others.
+ Copyright (c) 2005, 2022 IBM Corporation and others.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
@@ -362,6 +362,11 @@
description="%environment.description.21"
id="JavaSE-17"
compliance="17">
+ </environment>
+ <environment
+ description="%environment.description.22"
+ id="JavaSE-18"
+ compliance="18">
</environment>
<analyzer
class="org.eclipse.jdt.internal.launching.environments.ExecutionEnvironmentAnalyzer"
