Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Keller2016-09-08 11:22:10 -0400
committerMarkus Keller2016-09-08 12:14:57 -0400
commitb4982749a45af9f2fcf06a18f401056b55ecb7f8 (patch)
treee09051100750b708fde10ec1cfd144a92aa26cc6 /org.eclipse.jdt.apt.tests
parente157b21bb74eaf6b41c3411a9206ec3f8b5f29a2 (diff)
parent939cdd38674f6d8def82d09c3784113f9d5616d7 (diff)
downloadeclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.tar.gz
eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.tar.xz
eclipse.jdt.core-b4982749a45af9f2fcf06a18f401056b55ecb7f8.zip
Merge remote-tracking branch 'origin/master' into BETA_JAVA9
Conflicts: org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NullTypeAnnotationTest.java -> resurrected testBug489674 that was lost in a previous merge org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/MethodScope.java
Diffstat (limited to 'org.eclipse.jdt.apt.tests')
-rw-r--r--org.eclipse.jdt.apt.tests/.classpath2
-rw-r--r--org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF2
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jdt.apt.tests/.classpath b/org.eclipse.jdt.apt.tests/.classpath
index e576c56c95..e0d4fb53ad 100644
--- a/org.eclipse.jdt.apt.tests/.classpath
+++ b/org.eclipse.jdt.apt.tests/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="src" output="bin-resources" path="src-resources"/>
<classpathentry kind="src" output="bin-ext" path="src-ext"/>
<classpathentry kind="src" output="bin-annotations" path="src-annotations"/>
- <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.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs
index 5c65da1c6c..eeb1622e86 100644
--- a/org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.jdt.apt.tests/.settings/org.eclipse.jdt.core.prefs
@@ -9,9 +9,9 @@ org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -20,6 +20,6 @@ org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
index d23749d316..b73d6eb98c 100644
--- a/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.apt.tests/META-INF/MANIFEST.MF
@@ -43,6 +43,6 @@ Require-Bundle: org.junit,
org.eclipse.jdt.core.tests.binaries;bundle-version="1.0.0",
org.eclipse.pde.core
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %providerName
Eclipse-BundleShape: dir

Back to the top