Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Schreiber2015-04-08 04:45:38 -0400
committerGerrit Code Review @ Eclipse.org2015-04-17 02:16:07 -0400
commitd44d8e976b233703dedfdcbef4d05ed6c55428d5 (patch)
treeda110c8e7b70c29f3149b2126936ee9c3bedc5a9
parent90e94235981d5b6d0fe2bc8e03b4b21804a684f7 (diff)
downloadorg.eclipse.tycho-d44d8e976b233703dedfdcbef4d05ed6c55428d5.tar.gz
org.eclipse.tycho-d44d8e976b233703dedfdcbef4d05ed6c55428d5.tar.xz
org.eclipse.tycho-d44d8e976b233703dedfdcbef4d05ed6c55428d5.zip
464304 Updating default ee and source/target version to 1.7
_Updating the default execution environment to 1.7 _Updating the default source/target version to 1.7 _Changing the tests to test for the new values Bug: 464304 Change-Id: Icf3bfb003c66df5fbfe56ab6ce10a9d4c2700311 Signed-off-by: Martin Schreiber <m.schreiber@bachmann.info>
-rw-r--r--tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java4
-rw-r--r--tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java4
-rw-r--r--tycho-compiler-plugin/src/test/resources/projects/projectSettings/p001/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java2
-rw-r--r--tycho-core/src/test/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationTest.java4
-rw-r--r--tycho-its/projects/surefire.p2InstalledRuntime/productTest/META-INF/MANIFEST.MF1
6 files changed, 9 insertions, 8 deletions
diff --git a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
index 10215bfb9..928517a72 100644
--- a/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
+++ b/tycho-compiler-plugin/src/main/java/copied/org/apache/maven/plugin/AbstractCompilerMojo.java
@@ -57,9 +57,9 @@ import org.codehaus.plexus.util.StringUtils;
*/
public abstract class AbstractCompilerMojo extends AbstractMojo {
- public static final String DEFAULT_SOURCE_VERSION = "1.6";
+ public static final String DEFAULT_SOURCE_VERSION = "1.7";
- public static final String DEFAULT_TARGET_VERSION = "1.6";
+ public static final String DEFAULT_TARGET_VERSION = "1.7";
// ----------------------------------------------------------------------
// Configurables
diff --git a/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java b/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java
index 8016f2813..cb1cb5060 100644
--- a/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java
+++ b/tycho-compiler-plugin/src/test/java/org/eclipse/tycho/osgicompiler/test/OsgiCompilerTest.java
@@ -37,7 +37,7 @@ import copied.org.apache.maven.plugin.CompilationFailureException;
public class OsgiCompilerTest extends AbstractTychoMojoTestCase {
private static final int TARGET_1_4 = 48;
- private static final int TARGET_1_6 = 50;
+ private static final int TARGET_1_7 = 51;
protected File storage;
@@ -240,7 +240,7 @@ public class OsgiCompilerTest extends AbstractTychoMojoTestCase {
// source/target level == 1.6
project = projects.get(1);
getMojo(projects, project).execute();
- assertBytecodeMajorLevel(TARGET_1_6, new File(project.getBasedir(), "target/classes/Generic.class"));
+ assertBytecodeMajorLevel(TARGET_1_7, new File(project.getBasedir(), "target/classes/Generic.class"));
// project with multiple execution envs.
// Minimum source and target level must be taken
diff --git a/tycho-compiler-plugin/src/test/resources/projects/projectSettings/p001/.settings/org.eclipse.jdt.core.prefs b/tycho-compiler-plugin/src/test/resources/projects/projectSettings/p001/.settings/org.eclipse.jdt.core.prefs
index 2ae378adf..57900a796 100644
--- a/tycho-compiler-plugin/src/test/resources/projects/projectSettings/p001/.settings/org.eclipse.jdt.core.prefs
+++ b/tycho-compiler-plugin/src/test/resources/projects/projectSettings/p001/.settings/org.eclipse.jdt.core.prefs
@@ -1,3 +1,3 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.problem.autoboxing=warning
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
index 8000c93cb..54b8739d8 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
+++ b/tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationImpl.java
@@ -19,7 +19,7 @@ import org.eclipse.tycho.core.ee.shared.SystemCapability;
import org.eclipse.tycho.core.shared.BuildFailureException;
public class ExecutionEnvironmentConfigurationImpl implements ExecutionEnvironmentConfiguration {
- private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-1.6";
+ private static final String DEFAULT_EXECUTION_ENVIRONMENT = "JavaSE-1.7";
private static final int PRIMARY = 0;
private static final int SECONDARY = 1;
diff --git a/tycho-core/src/test/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationTest.java b/tycho-core/src/test/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationTest.java
index 9627f4f5f..0a2c66c40 100644
--- a/tycho-core/src/test/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationTest.java
+++ b/tycho-core/src/test/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentConfigurationTest.java
@@ -45,9 +45,9 @@ public class ExecutionEnvironmentConfigurationTest {
@Test
public void testDefaults() {
- assertThat(subject.getProfileName(), is("JavaSE-1.6"));
+ assertThat(subject.getProfileName(), is("JavaSE-1.7"));
assertThat(subject.isCustomProfile(), is(false));
- assertThat(subject.getFullSpecification().getProfileName(), is("JavaSE-1.6"));
+ assertThat(subject.getFullSpecification().getProfileName(), is("JavaSE-1.7"));
}
@Test
diff --git a/tycho-its/projects/surefire.p2InstalledRuntime/productTest/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.p2InstalledRuntime/productTest/META-INF/MANIFEST.MF
index e88a14949..38d33ef13 100644
--- a/tycho-its/projects/surefire.p2InstalledRuntime/productTest/META-INF/MANIFEST.MF
+++ b/tycho-its/projects/surefire.p2InstalledRuntime/productTest/META-INF/MANIFEST.MF
@@ -4,3 +4,4 @@ Bundle-SymbolicName: spir.productTest
Bundle-Version: 1.0.0
Require-Bundle: org.junit,
org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6

Back to the top