diff options
| author | Markus Keller | 2016-09-08 15:22:10 +0000 |
|---|---|---|
| committer | Markus Keller | 2016-09-08 16:14:57 +0000 |
| commit | b4982749a45af9f2fcf06a18f401056b55ecb7f8 (patch) | |
| tree | e09051100750b708fde10ec1cfd144a92aa26cc6 /org.eclipse.jdt.compiler.apt.tests | |
| parent | e157b21bb74eaf6b41c3411a9206ec3f8b5f29a2 (diff) | |
| parent | 939cdd38674f6d8def82d09c3784113f9d5616d7 (diff) | |
| download | eclipse.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.compiler.apt.tests')
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jdt.compiler.apt.tests/.classpath b/org.eclipse.jdt.compiler.apt.tests/.classpath index 4fcfc9913f..6d510c6323 100644 --- a/org.eclipse.jdt.compiler.apt.tests/.classpath +++ b/org.eclipse.jdt.compiler.apt.tests/.classpath @@ -5,6 +5,6 @@ <classpathentry kind="src" output="binprocessors8" path="processors8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="lib" path="rtstubs18.jar"/> - <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="output" path="bin"/> </classpath> diff --git a/org.eclipse.jdt.compiler.apt.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jdt.compiler.apt.tests/.settings/org.eclipse.jdt.core.prefs index 6c46806510..47a7607d9f 100644 --- a/org.eclipse.jdt.compiler.apt.tests/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jdt.compiler.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 @@ -68,6 +68,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=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.compiler.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF index b09a8603df..e078971bf2 100644 --- a/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.jdt.compiler.apt.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.jdt.compiler.apt.tests;singleton:=true Bundle-Version: 1.1.100.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit, org.eclipse.jdt.core;bundle-version="3.5.0", org.eclipse.core.resources, |