Merge pull request #11784 from keithc-ca/dead

Remove code related to unsupported Java versions
eclipse-openj9 · Jan 26, 2021 · fb8c08c · fb8c08c
2 parents 653858e + 5b173f9
commit fb8c08c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 46 deletions.
diff --git a/jcl/jpp_configuration.xml b/jcl/jpp_configuration.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE configurationreg SYSTEM "http://home.ottawa.ibm.com/teams/bluebird/web/eclipse_site/jpp.dtd">
 <!--
 /*******************************************************************************
- * Copyright (c) 2002, 2020 IBM Corp. and others
+ * Copyright (c) 2002, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -125,37 +125,10 @@
 		<parameter name="jxerules:outputdir" value="java/lang"/>
 	</configuration>
 
-	<configuration
-		  label="JAVA15"
-		  outputpath="JAVA15/src"
-		  dependencies="JAVA11"
-		  jdkcompliance="1.8">
-		<classpathentry kind="src" path="src/java.base/share/classes"/>
-		<classpathentry kind="src" path="src/java.management/share/classes"/>
-		<classpathentry kind="src" path="src/jdk.attach/share/classes"/>
-		<classpathentry kind="src" path="src/jdk.jcmd/share/classes"/>
-		<classpathentry kind="src" path="src/jdk.management/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.cuda/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.dataaccess/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.dtfj/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.dtfjview/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.gpu/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.jvm/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.sharedclasses/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.traceformat/share/classes"/>
-		<classpathentry kind="src" path="src/openj9.zosconditionhandling/share/classes"/>
-		<classpathentry kind="lib" path="/binaries/common/ibm/ibmjzos.jar"/>
-		<classpathentry kind="lib" path="/binaries/vm/third/rt-compressed.sunJava15.jar"/>
-		<source path="src"/>
-		<parameter name="macro:define" value="JAVA_SPEC_VERSION=15"/>
-		<parameter name="msg:outputdir" value="java.base/share/classes/com/ibm/oti/util"/>
-		<parameter name="jxerules:outputdir" value="java/lang"/>
-	</configuration>
-
 	<configuration
 		  label="JAVA16"
 		  outputpath="JAVA16/src"
-		  dependencies="JAVA15"
+		  dependencies="JAVA11"
 		  jdkcompliance="1.8">
 		<classpathentry kind="src" path="src/java.base/share/classes"/>
 		<classpathentry kind="src" path="src/java.management/share/classes"/>

diff --git a/jcl/src/java.base/share/classes/java/lang/Thread.java b/jcl/src/java.base/share/classes/java/lang/Thread.java
@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 1998, 2020 IBM Corp. and others
+ * Copyright (c) 1998, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -552,11 +552,6 @@ public final void checkAccess() {
  * 
 /*[IF JAVA_SPEC_VERSION >= 14]
  * @exception	UnsupportedOperationException
-/*[ELSE] JAVA_SPEC_VERSION >= 14
-/*[IF JAVA_SPEC_VERSION >= 13]
- * @exception	IllegalThreadStateException
- *					if this thread has not been suspended.
-/*[ENDIF] JAVA_SPEC_VERSION >= 13
 /*[ENDIF] JAVA_SPEC_VERSION >= 14
  *
  * @deprecated	The semantics of this method are poorly defined and it uses the deprecated suspend() method.

diff --git a/....management/share/classes/com/ibm/java/lang/management/internal/BufferPoolMXBeanImpl.java b/....management/share/classes/com/ibm/java/lang/management/internal/BufferPoolMXBeanImpl.java
@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar17]*/
 /*******************************************************************************
- * Copyright (c) 2005, 2020 IBM Corp. and others
+ * Copyright (c) 2005, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -32,18 +32,13 @@
 import jdk.internal.misc.VM.BufferPool;
 import jdk.internal.access.SharedSecrets;
 /*[ELSE]
-/*[IF JAVA_SPEC_VERSION >= 12]
-import jdk.internal.access.JavaNioAccess.BufferPool;
-import jdk.internal.access.SharedSecrets;
-/*[ELSE] JAVA_SPEC_VERSION >= 12
 /*[IF Sidecar19-SE]
 import jdk.internal.misc.JavaNioAccess.BufferPool;
 import jdk.internal.misc.SharedSecrets;
 /*[ELSE]
 import sun.misc.JavaNioAccess.BufferPool;
 import sun.misc.SharedSecrets;
 /*[ENDIF] Sidecar19-SE */
-/*[ENDIF] JAVA_SPEC_VERSION >= 12 */
 /*[ENDIF] JAVA_SPEC_VERSION >= 15 */
 
 /**

diff --git a/...c/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/ClassScanner.java b/...c/openj9.dtfj/share/classes/com/ibm/java/diagnostics/utils/plugins/impl/ClassScanner.java
@@ -1,6 +1,6 @@
 /*[INCLUDE-IF Sidecar18-SE]*/
 /*******************************************************************************
- * Copyright (c) 2012, 2020 IBM Corp. and others
+ * Copyright (c) 2012, 2021 IBM Corp. and others
  *
  * This program and the accompanying materials are made available under
  * the terms of the Eclipse Public License 2.0 which accompanies this
@@ -47,15 +47,11 @@ public ClassScanner(URL url, Set<ClassListener> listeners) {
 		/*[IF JAVA_SPEC_VERSION >= 15]*/
 		super(Opcodes.ASM8, null);
 		/*[ELSE]*/
-		/*[IF JAVA_SPEC_VERSION >= 14]*/
-		super(Opcodes.ASM7, null);
-		/*[ELSE]*/
 		/*[IF JAVA_SPEC_VERSION >= 11]*/
 		super(Opcodes.ASM6, null);
 		/*[ELSE]*/
 		super(Opcodes.ASM5, null);
 		/*[ENDIF] JAVA_SPEC_VERSION >= 11 */
-		/*[ENDIF] JAVA_SPEC_VERSION >= 14 */
 		/*[ENDIF] JAVA_SPEC_VERSION >= 15 */
 		this.url = url;
 		this.listeners = listeners;