Revert "Merge Master to Beta Java 21 (#286)" (#287)

This reverts commit a0d53fa.

Author: SarikaSinha

org.eclipse.jdt.debug.jdi.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: JDI Tests
 Bundle-SymbolicName: org.eclipse.jdt.debug.jdi.tests; singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse
 Require-Bundle: org.junit,

org.eclipse.jdt.debug.jdi.tests/pom.xml

@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.jdi.tests</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ClassTypeTest.java

@@ -200,7 +200,7 @@ public void testJDIInvokeMethodFail() {
 		Exception good = null;
 		Exception oops = null;
 		try {
-			fType.invokeMethod(thread, inv2, new ArrayList<>(), 0);
+			fType.invokeMethod(thread, inv2, new ArrayList<Value>(), 0);
 		} catch (InvocationException exc) {
 			good = exc;
 		} catch (Exception exc) {

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/HeapWalkingTests.java

@@ -75,15 +75,15 @@ public void testGetInstanceCountsNullAttrib() {
 	public void testGetInstanceCountsUnsupported() {
 		if(is16OrGreater()) {
 			try {
-				fVM.instanceCounts(new ArrayList<>());
+				fVM.instanceCounts(new ArrayList<ReferenceType>());
 			}
 			catch(UnsupportedOperationException uoe) {
 				fail("Threw unsupported exception in 1.6 VM");
 			}
 		}
 		else {
 			try {
-				fVM.instanceCounts(new ArrayList<>());
+				fVM.instanceCounts(new ArrayList<ReferenceType>());
 				fail("No exception for non 1.6 VM");
 			}
 			catch(UnsupportedOperationException uoe) {}

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ObjectReferenceTest.java

@@ -260,7 +260,7 @@ public void testJDIInvokeMethodFail() {
 		Method inv = ct.concreteMethodByName("invoke4", "()J");
 		Exception good = null, oops = null;
 		try {
-			fObject.invokeMethod(thread, inv, new ArrayList<>(), 0);
+			fObject.invokeMethod(thread, inv, new ArrayList<Value>(), 0);
 		} catch (ClassNotLoadedException exc) {
 			oops = exc;
 		} catch (IncompatibleThreadStateException exc) {

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/ThreadReferenceTest.java

@@ -26,6 +26,7 @@
 import com.sun.jdi.ReferenceType;
 import com.sun.jdi.StackFrame;
 import com.sun.jdi.ThreadReference;
+import com.sun.jdi.Value;
 import com.sun.jdi.event.ThreadDeathEvent;
 import com.sun.jdi.event.ThreadStartEvent;
 import com.sun.jdi.request.ThreadDeathRequest;
@@ -193,7 +194,7 @@ public void testJDIStop() {
 				threadDeathClass.newInstance(
 					thread,
 					constructor,
-					new java.util.LinkedList<>(),
+					new java.util.LinkedList<Value>(),
 					ClassType.INVOKE_SINGLE_THREADED);
 			threadDeath.disableCollection();
 			// This object is going to be used for the lifetime of the VM.

org.eclipse.jdt.debug.jdi.tests/tests/org/eclipse/debug/jdi/tests/WatchpointEventTest.java

@@ -20,6 +20,7 @@
 import com.sun.jdi.event.AccessWatchpointEvent;
 import com.sun.jdi.event.ModificationWatchpointEvent;
 import com.sun.jdi.event.WatchpointEvent;
+import com.sun.jdi.request.EventRequest;
 import com.sun.jdi.request.EventRequestManager;
 
 /**
@@ -79,9 +80,9 @@ public void localTearDown() {
 		// Delete the event requests we created in this test
 		EventRequestManager requestManager = fVM.eventRequestManager();
 		requestManager.deleteEventRequests(
-			new ArrayList<>(requestManager.accessWatchpointRequests()));
+			new ArrayList<EventRequest>(requestManager.accessWatchpointRequests()));
 		requestManager.deleteEventRequests(
-			new ArrayList<>(requestManager.modificationWatchpointRequests()));
+			new ArrayList<EventRequest>(requestManager.modificationWatchpointRequests()));
 
 		// Set the value of the "fBool" field back to its original value
 		resetField();

org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.12.100.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-ClassPath: javadebugtests.jar
 Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
 Bundle-Vendor: %providerName

org.eclipse.jdt.debug.tests/forceQualifierUpdate.txt

@@ -1,3 +1,2 @@
 # To force a version qualifier update, add the bug here
 Bug 530709 - Comparator errors in jdt debug and jdt ui in I20180204-2000
-https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/issues/1184