Try Java 7 as main build VM (still use Java 6 for unpack test).
diff --git a/.classpath b/.classpath
index bc74aab..67e2a52 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
index c537b63..f42de36 100644
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index deabb6f..da6d5ec 100644
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
diff --git a/addRepoProperties-release.sh b/addRepoProperties-release.sh
index 8b6b84e..92ca708 100644
--- a/addRepoProperties-release.sh
+++ b/addRepoProperties-release.sh
@@ -26,7 +26,7 @@
devworkspace="${BUILD_HOME}"/addRepoPropertiesWorkspace
-devJRE=${JAVA_6_HOME}/jre/bin/java
+devJRE=${JAVA_7_HOME}/jre/bin/java
ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
diff --git a/addRepoProperties-staging.sh b/addRepoProperties-staging.sh
index 371e0a0..c458af8 100644
--- a/addRepoProperties-staging.sh
+++ b/addRepoProperties-staging.sh
@@ -20,7 +20,7 @@
devworkspace="${BUILD_HOME}"/addRepoPropertiesWorkspace
-devJRE=${JAVA_6_HOME}/jre/bin/java
+devJRE=${JAVA_7_HOME}/jre/bin/java
ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
diff --git a/aggr.properties b/aggr.properties
index bfc3209..999fd89 100644
--- a/aggr.properties
+++ b/aggr.properties
@@ -44,7 +44,7 @@
BUILD_TESTS_DIR=${BUILD_HOME}/${RELENG_TESTS}
# we use Java 6 by default. https://bugs.eclipse.org/bugs/show_bug.cgi?id=340267
-JAVA_HOME=${JAVA_6_HOME}
+JAVA_HOME=${JAVA_7_HOME}
JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin
JAVA_CMD=${JAVA_EXEC_DIR}/java
@@ -96,7 +96,7 @@
# -Declipse.p2.mirrors=false
# note that -Dhttp.noProxyHosts is probably not needed, but see bug 347103
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=347103
-BUILDER_VM_ARGS=-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin
+BUILDER_VM_ARGS=-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin
#-Dhttp.noProxyHosts="localhost|download.eclipse.org"
# We use this redirection, so scripts only need to use "full_filename", but exact version controlled by properties
diff --git a/aggr_properties.shsource b/aggr_properties.shsource
index 4723587..063a2ed 100644
--- a/aggr_properties.shsource
+++ b/aggr_properties.shsource
@@ -43,7 +43,7 @@
BUILD_TESTS_DIR=${BUILD_HOME}/${RELENG_TESTS}
# we use Java 6 by default. https://bugs.eclipse.org/bugs/show_bug.cgi?id=340267
-JAVA_HOME=${JAVA_6_HOME}
+JAVA_HOME=${JAVA_7_HOME}
JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin
JAVA_CMD=${JAVA_EXEC_DIR}/java
@@ -92,7 +92,7 @@
# NOTE: quotes needed in bash scripts ... NOT in ant properties!
# -Declipse.p2.mirrors=false
-BUILDER_VM_ARGS="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin"
+BUILDER_VM_ARGS="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin"
# We use this redirection, so scripts only need to use "full_filename", but exact version controlled by properties
FULL_FILENAME=${FULL_FILENAME_430}
diff --git a/antRunner.sh b/antRunner.sh
index be70b44..7e3c6a9 100644
--- a/antRunner.sh
+++ b/antRunner.sh
@@ -29,7 +29,7 @@
fi
# we MUST use java 5, when using process/pack artifacts!
-devJRE=${JAVA_6_HOME}/jre/bin/java
+devJRE=${JAVA_7_HOME}/jre/bin/java
ibmDevArgs="-Xms128M -Xmx256M -Dosgi.ws=gtk -Dosgi.os=linux -Dosgi.arch=x86"
diff --git a/build.xml b/build.xml
index 66de536..249b141 100644
--- a/build.xml
+++ b/build.xml
@@ -241,7 +241,7 @@
for example, bug 244603 and bug 279596. -->
<property
name="BUILDER_VM_ARGS"
- value="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin" />
+ value="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin" />
<echo message="AGGREGATOR_APP_ARGS: ${AGGREGATOR_APP_ARGS}" />
<!-- we will clean the aggregation directory ourselves, as work around for bug 354321
@@ -260,7 +260,7 @@
<arg value="-debug" />
<arg value="-nosplash" />
<arg line="-data ${eclipseWorkspace}" />
- <arg line="-vm ${JAVA_6_HOME}/jre/bin" />
+ <arg line="-vm ${JAVA_7_HOME}/jre/bin" />
<arg value="--launcher.suppressErrors" />
<arg line="-application org.eclipse.b3.cli.headless" />
<arg value="aggregate" />
@@ -293,7 +293,7 @@
for example, bug 244603 and bug 279596. -->
<property
name="BUILDER_VM_ARGS"
- value="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin" />
+ value="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin" />
<echo message="AGG_APP_ARGS: ${AGG_APP_ARGS}" />
<exec
executable="${eclipseExecutable}"
@@ -302,7 +302,7 @@
<arg value="-debug" />
<arg value="-nosplash" />
<arg line="-data ${eclipseWorkspace}" />
- <arg line="-vm ${JAVA_6_HOME}/jre/bin" />
+ <arg line="-vm ${JAVA_7_HOME}/jre/bin" />
<arg value="--launcher.suppressErrors" />
<arg line="-application org.eclipse.b3.cli.headless" />
<arg value="aggregate" />
@@ -345,7 +345,7 @@
<arg value="-debug" />
<arg value="-nosplash" />
<arg line="-data ${eclipseWorkspace}" />
- <arg line="-vm ${JAVA_6_HOME}/jre/bin" />
+ <arg line="-vm ${JAVA_7_HOME}/jre/bin" />
<arg value="--launcher.suppressErrors" />
<arg line="-application org.eclipse.b3.cli.headless" />
<arg value="aggregate" />
@@ -391,7 +391,7 @@
<arg value="-debug" />
<arg value="-nosplash" />
<arg line="-data ${eclipseWorkspace}" />
- <arg line="-vm ${JAVA_6_HOME}/jre/bin" />
+ <arg line="-vm ${JAVA_7_HOME}/jre/bin" />
<arg value="--launcher.suppressErrors" />
<arg line="-application org.eclipse.b3.cli.headless" />
<arg value="aggregate" />
diff --git a/production.properties b/production.properties
index 98f588e..186a1ef 100644
--- a/production.properties
+++ b/production.properties
@@ -44,7 +44,7 @@
BUILD_TESTS_DIR=${BUILD_HOME}/${RELENG_TESTS}
# we use Java 6 by default. https://bugs.eclipse.org/bugs/show_bug.cgi?id=340267
-JAVA_HOME=${JAVA_6_HOME}
+JAVA_HOME=${JAVA_7_HOME}
JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin
JAVA_CMD=${JAVA_EXEC_DIR}/java
@@ -99,7 +99,7 @@
# note that -Dhttp.noProxyHosts is probably not needed, but see bug 347103
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=347103
# -Dhttp.noProxyHosts="localhost|download.eclipse.org"
-BUILDER_VM_ARGS=-vmargs -Xmx1024m -Declipse.p2.mirrors=false -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin
+BUILDER_VM_ARGS=-vmargs -Xmx1024m -Declipse.p2.mirrors=false -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin
# We use this redirection, so scripts only need to use "full_filename", but exact version controlled by properties
diff --git a/sampleLocalOverrides/aggr.properties b/sampleLocalOverrides/aggr.properties
index b1e014f..fb8288d 100755
--- a/sampleLocalOverrides/aggr.properties
+++ b/sampleLocalOverrides/aggr.properties
@@ -45,7 +45,7 @@
BUILD_TESTS_DIR=${BUILD_HOME}/${RELENG_TESTS}
# we use Java 6 by default. https://bugs.eclipse.org/bugs/show_bug.cgi?id=340267
-JAVA_HOME=${JAVA_6_HOME}
+JAVA_HOME=${JAVA_7_HOME}
JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin
JAVA_CMD=${JAVA_EXEC_DIR}/java
@@ -97,7 +97,7 @@
# -Declipse.p2.mirrors=false
# note that -Dhttp.noProxyHosts is probably not needed, but see bug 347103
# https://bugs.eclipse.org/bugs/show_bug.cgi?id=347103
-BUILDER_VM_ARGS=-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin
+BUILDER_VM_ARGS=-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin
#-Dhttp.noProxyHosts="localhost|download.eclipse.org"
# We use this redirection, so scripts only need to use "full_filename", but exact version controlled by properties
diff --git a/sampleLocalOverrides/aggr_properties.shsource b/sampleLocalOverrides/aggr_properties.shsource
index de21cf6..f161156 100755
--- a/sampleLocalOverrides/aggr_properties.shsource
+++ b/sampleLocalOverrides/aggr_properties.shsource
@@ -43,7 +43,7 @@
BUILD_TESTS_DIR=${BUILD_HOME}/${RELENG_TESTS}
# we use Java 6 by default. https://bugs.eclipse.org/bugs/show_bug.cgi?id=340267
-JAVA_HOME=${JAVA_6_HOME}
+JAVA_HOME=${JAVA_7_HOME}
JAVA_EXEC_DIR=${JAVA_HOME}/jre/bin
JAVA_CMD=${JAVA_EXEC_DIR}/java
@@ -92,7 +92,7 @@
# NOTE: quotes needed in bash scripts ... NOT in ant properties!
# -Declipse.p2.mirrors=false
-BUILDER_VM_ARGS="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_6_HOME}/jre/bin"
+BUILDER_VM_ARGS="-vmargs -Xmx1024m -Dorg.eclipse.update.jarprocessor.pack200=${JAVA_7_HOME}/jre/bin"
# We use this redirection, so scripts only need to use "full_filename", but exact version controlled by properties
FULL_FILENAME=${FULL_FILENAME_430}
