Bug 578533 - Move Platform Ant Remote jars to JavaSE 11
Change-Id: Ibc2425b09b633e279f0b3d95b4c75fbf123bd82f
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform/+/190579
Tested-by: Sarika Sinha <sarika.sinha@in.ibm.com>
Reviewed-by: Sarika Sinha <sarika.sinha@in.ibm.com>
diff --git "a/ant/org.eclipse.ant.launching/.externalToolBuilders/build common debug \133Builder\135.launch" "b/ant/org.eclipse.ant.launching/.externalToolBuilders/build common debug \133Builder\135.launch"
index 989e651..b8e598d 100644
--- "a/ant/org.eclipse.ant.launching/.externalToolBuilders/build common debug \133Builder\135.launch"
+++ "b/ant/org.eclipse.ant.launching/.externalToolBuilders/build common debug \133Builder\135.launch"
@@ -19,4 +19,5 @@
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</launchConfiguration>
diff --git "a/ant/org.eclipse.ant.launching/.externalToolBuilders/build loggers \133Builder\135.launch" "b/ant/org.eclipse.ant.launching/.externalToolBuilders/build loggers \133Builder\135.launch"
index ec718d8..42321a1 100644
--- "a/ant/org.eclipse.ant.launching/.externalToolBuilders/build loggers \133Builder\135.launch"
+++ "b/ant/org.eclipse.ant.launching/.externalToolBuilders/build loggers \133Builder\135.launch"
@@ -19,4 +19,5 @@
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</launchConfiguration>
diff --git "a/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support \133Builder\135.launch" "b/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support \133Builder\135.launch"
index 86669f2..33e8346 100644
--- "a/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support \133Builder\135.launch"
+++ "b/ant/org.eclipse.ant.launching/.externalToolBuilders/build remote support \133Builder\135.launch"
@@ -12,7 +12,7 @@
</listAttribute>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
- <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.ant.launching"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
diff --git a/ant/org.eclipse.ant.launching/buildfiles/buildCommonDebug.xml b/ant/org.eclipse.ant.launching/buildfiles/buildCommonDebug.xml
index ea71eaa..d7ac9d8 100644
--- a/ant/org.eclipse.ant.launching/buildfiles/buildCommonDebug.xml
+++ b/ant/org.eclipse.ant.launching/buildfiles/buildCommonDebug.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2005, 2016 IBM Corporation and others.
+ Copyright (c) 2005, 2021 IBM Corporation and others.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
@@ -30,7 +30,7 @@
<property name="destdir" value="${temp.folder}/lib/antdebug.jar.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
- <javac target="1.6" source="1.6" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
+ <javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
classpath="${basedir}/bin">
<src path="${basedir}/common"/>
<compilerarg value="-Xlint"/>
diff --git a/ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml b/ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml
index ea9950a..7ee4487 100644
--- a/ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml
+++ b/ant/org.eclipse.ant.launching/buildfiles/buildRemote.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2005, 2016 IBM Corporation and others.
+ Copyright (c) 2005, 2021 IBM Corporation and others.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
@@ -30,7 +30,7 @@
<property name="destdir" value="${temp.folder}/lib/remote.jar.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
- <javac target="1.6" source="1.6" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
+ <javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes"
classpath="${basedir}/bin">
<src path="${basedir}/remote"/>
<compilerarg value="-Xlint"/>
diff --git a/ant/org.eclipse.ant.launching/lib/antdebug.jar b/ant/org.eclipse.ant.launching/lib/antdebug.jar
index 487b83a..867d712 100644
--- a/ant/org.eclipse.ant.launching/lib/antdebug.jar
+++ b/ant/org.eclipse.ant.launching/lib/antdebug.jar
Binary files differ
diff --git a/ant/org.eclipse.ant.launching/lib/remote.jar b/ant/org.eclipse.ant.launching/lib/remote.jar
index cf78240..a5072d8 100644
--- a/ant/org.eclipse.ant.launching/lib/remote.jar
+++ b/ant/org.eclipse.ant.launching/lib/remote.jar
Binary files differ
diff --git a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch b/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
index 076779d..ec85f8e 100644
--- a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
+++ b/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Ant Runner Support JAR.launch
@@ -14,4 +14,5 @@
<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.ui/buildfiles/buildExtraJAR.xml}"/>
<booleanAttribute key="org.eclipse.debug.ui.ATTR_RUN_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</launchConfiguration>
diff --git a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch b/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch
index 8b82f53..f281e2e 100644
--- a/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch
+++ b/ant/org.eclipse.ant.ui/.externalToolBuilders/Build Remote Ant JAR.launch
@@ -13,4 +13,5 @@
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</launchConfiguration>
diff --git a/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml b/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml
index ede6807..cf4c10f 100644
--- a/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml
+++ b/ant/org.eclipse.ant.ui/buildfiles/buildRemoteExtraJAR.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2005, 2016 IBM Corporation and others.
+ Copyright (c) 2005, 2021 IBM Corporation and others.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
@@ -30,7 +30,7 @@
<property name="destdir" value="${temp.folder}/lib/remoteAnt.jar.bin"/>
<delete dir="${destdir}"/>
<mkdir dir="${destdir}"/>
- <javac target="1.6" source="1.6" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes">
+ <javac source="11" target="11" destdir="${destdir}" failonerror="true" verbose="false" debug="on" includeAntRuntime="yes">
<src path="${basedir}/Remote Ant Support"/>
<compilerarg value="-Xlint"/>
<classpath>
diff --git a/ant/org.eclipse.ant.ui/lib/remoteAnt.jar b/ant/org.eclipse.ant.ui/lib/remoteAnt.jar
index 34e0d18..a504765 100644
--- a/ant/org.eclipse.ant.ui/lib/remoteAnt.jar
+++ b/ant/org.eclipse.ant.ui/lib/remoteAnt.jar
Binary files differ
