summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Herrmann2018-05-16 06:03:33 -0400
committerStephan Herrmann2018-05-16 06:03:33 -0400
commit40035f062012183a9073c6ad672b3904f4e7ba91 (patch)
tree9fe91b88410f24f475310cc671f37ac3965438c2
parent0dc84310aeaa044ab0a96afe051401506ac05b7d (diff)
downloadorg.eclipse.objectteams-40035f062012183a9073c6ad672b3904f4e7ba91.tar.gz
org.eclipse.objectteams-40035f062012183a9073c6ad672b3904f4e7ba91.tar.xz
org.eclipse.objectteams-40035f062012183a9073c6ad672b3904f4e7ba91.zip
Update jdt.core to S4_8_0_M7
- adjust new tests - adjust our tests to new warning from jdt.launching
-rw-r--r--org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java10
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7.jarbin0 -> 13452 bytes
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7src.zipbin0 -> 8269 bytes
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.classpath2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.settings/org.eclipse.jdt.core.prefs6
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/.classpath2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/META-INF/MANIFEST.MF2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/.classpath2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/META-INF/MANIFEST.MF2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a1/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a2/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132b/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154a/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b1/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b2/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/.classpath2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a2/build.properties2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a3/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/.classpath2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/META-INF/MANIFEST.MF2
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304f/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/build.properties1
-rw-r--r--testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java10
41 files changed, 60 insertions, 14 deletions
diff --git a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
index d82b17228..ed27c7968 100644
--- a/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
+++ b/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
@@ -224,7 +224,12 @@ public void test0008_not_in_class_scope() throws JavaModelException {
"expectedTypesKeys=null",
result.context);
+//{ObjectTeams: additional proposals "callin" and "team":
+/* orig:
assertProposalCount("var[KEYWORD]", 0, 21, result);
+ :giro */
+ assertProposalCount("var[KEYWORD]", 0, 23, result);
+// SH}
}
public void test0009_in_formal_param_lists() throws JavaModelException {
CompletionResult result = complete(
@@ -241,7 +246,12 @@ public void test0008_not_in_class_scope() throws JavaModelException {
"expectedTypesSignatures=null\n" +
"expectedTypesKeys=null",
result.context);
+//{ObjectTeams: additional proposals "callin" and "team":
+/* orig:
assertProposalCount("var[KEYWORD]", 0, 15, result);
+ :giro */
+ assertProposalCount("var[KEYWORD]", 0, 17, result);
+// SH}
}
public void testbug_529556_missing_type_info_on_vars() throws JavaModelException {
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7.jar b/testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7.jar
new file mode 100644
index 000000000..47bbacebf
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7.jar
Binary files differ
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7src.zip b/testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7src.zip
new file mode 100644
index 000000000..411528ee2
--- /dev/null
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/JCL/jclMin1.7src.zip
Binary files differ
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java
index 1ebf8a589..ebb3e5f9b 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/src/org/eclipse/objectteams/otdt/test/builder/OTBuilderTests.java
@@ -60,6 +60,8 @@ public class OTBuilderTests extends BuilderTests {
// some plugin.xml have a deprecated 'action' extension, just ignore those:
if (allProblems[i].getMessage().contains("deprecated"))
continue;
+ if (allProblems[i].getMessage().startsWith("The compiler compliance specified is")) // new warning from bug 533880
+ continue;
filteredProblems[j++] = allProblems[i];
}
if (j < allProblems.length)
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.classpath b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.classpath
index cee6929cf..78f20cbda 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.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/J2SE-1.5"/>
+ <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="OTRE"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.settings/org.eclipse.jdt.core.prefs b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.settings/org.eclipse.jdt.core.prefs
index b9d027f50..42dd12fa1 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.settings/org.eclipse.jdt.core.prefs
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
#Sun Aug 03 18:01:18 CEST 2008
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.objectteams.otdt.compiler.problem.binding_conventions=error
org.eclipse.objectteams.otdt.compiler.option.weaving_scheme=OTDRE
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF
index 7e63f3b74..26fd4b167 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: AccumulatedBases Plug-in
Bundle-SymbolicName: AccumulatedBases;singleton:=true
Automatic-Module-Name: AccumulatedBased
Bundle-Version: 1.0.0
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.debug.ui,
org.eclipse.objectteams.otequinox,
org.eclipse.jdt.debug.ui,
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/build.properties
index e9863e281..263ac35a6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AccumulatedBases/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/.classpath b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/.classpath
index 9b7e6c5e6..68ddec118 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <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="OTRE"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/META-INF/MANIFEST.MF
index f6c587cdd..8bb079ec0 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.objectteams.otequinox,
AspectExportBase
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportAspect/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/.classpath b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/.classpath
index 304e86186..3bc247511 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <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/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/META-INF/MANIFEST.MF
index 1d8320084..dc343d41a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Version: 1.0.0
Require-Bundle: org.eclipse.ui
Export-Package: aeb.api
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/AspectExportBase/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/build.properties
index b107977f4..b789a7eb3 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base419987/build.properties
@@ -1,3 +1,4 @@
source.. = src/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/build.properties
index b107977f4..b789a7eb3 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Base484275/build.properties
@@ -1,3 +1,4 @@
source.. = src/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/build.properties
index b107977f4..b789a7eb3 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug419987/build.properties
@@ -1,3 +1,4 @@
source.. = src/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/build.properties
index cc91072ec..33508aa58 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug484275/build.properties
@@ -2,3 +2,4 @@ source.. = src/
bin.includes = META-INF/,\
.,\
plugin.xml
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/build.properties
index cc91072ec..33508aa58 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Bug495489/build.properties
@@ -2,3 +2,4 @@ source.. = src/
bin.includes = META-INF/,\
.,\
plugin.xml
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a1/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a1/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a1/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a1/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a2/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a2/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a2/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132a2/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132b/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132b/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132b/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac132b/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154a/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154a/build.properties
index e9863e281..263ac35a6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154a/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154a/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b1/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b1/build.properties
index 0d3d3a745..596cbf8a7 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b1/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b1/build.properties
@@ -4,3 +4,4 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b2/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b2/build.properties
index 34d2e4d2d..fafa2695a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b2/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac154b2/build.properties
@@ -2,3 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/.classpath b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/.classpath
index 9b7e6c5e6..68ddec118 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <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="OTRE"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF
index 6b0552b93..6bae13605 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/META-INF/MANIFEST.MF
@@ -8,4 +8,4 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.objectteams.otequinox,
Trac18b
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a2/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a2/build.properties
index 0d3d3a745..e3a89c7ce 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a2/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a2/build.properties
@@ -4,3 +4,5 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/
+jre.compilation.profile=JavaSE-1.7
+ \ No newline at end of file
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a3/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a3/build.properties
index 0d3d3a745..596cbf8a7 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a3/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18a3/build.properties
@@ -4,3 +4,4 @@ bin.includes = plugin.xml,\
META-INF/,\
.,\
icons/
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/.classpath b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/.classpath
index 304e86186..3bc247511 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/.classpath
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <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/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/META-INF/MANIFEST.MF b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/META-INF/MANIFEST.MF
index f3b1e085c..fd0922690 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/META-INF/MANIFEST.MF
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/META-INF/MANIFEST.MF
@@ -7,4 +7,4 @@ Bundle-Version: 1.0.0
Require-Bundle: org.eclipse.ui
Export-Package: trac18b.api
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac18b/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/build.properties
index e9863e281..263ac35a6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213a/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/build.properties
index 34d2e4d2d..fafa2695a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b1/build.properties
@@ -2,3 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/build.properties
index 34d2e4d2d..fafa2695a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac213b2/build.properties
@@ -2,3 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/build.properties
index 34d2e4d2d..fafa2695a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304b/build.properties
@@ -2,3 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304f/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304f/build.properties
index 34d2e4d2d..fafa2695a 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304f/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304f/build.properties
@@ -2,3 +2,4 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/build.properties
index e9863e281..263ac35a6 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/Trac304ot/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/build.properties b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/build.properties
index 2b0d95b6b..370699bde 100644
--- a/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/build.properties
+++ b/testplugins/org.eclipse.objectteams.otdt.test.builder/workspace/UnresolvedBasePlugin/build.properties
@@ -3,3 +3,4 @@ output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.
+jre.compilation.profile=JavaSE-1.7
diff --git a/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java b/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java
index 98584c719..388251d72 100644
--- a/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java
+++ b/testplugins/org.eclipse.objectteams.otdt.tests/src/org/eclipse/objectteams/otdt/tests/AbstractJavaModelTests.java
@@ -2629,7 +2629,7 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
}
protected IJavaProject setUpJavaProject(final String projectName) throws CoreException, IOException {
//{ObjectTeams: OT/J needs at least 1.5 (was 1.4):
- IJavaProject javaProject = setUpJavaProject(projectName, "1.5");
+ IJavaProject javaProject = setUpJavaProject(projectName, "1.7");
// add OTJavaNature
IProjectDescription description = javaProject.getProject().getDescription();
@@ -2722,6 +2722,14 @@ public abstract class AbstractJavaModelTests extends SuiteOfTestCases {
new IPath[] {getExternalJCLPath(compliance), getExternalJCLSourcePath(compliance), getExternalJCLRootSourcePath()},
null);
}
+ } else if ("1.7".equals(compliance)) {
+ if (JavaCore.getClasspathVariable("JCL17_LIB") == null) {
+ setupExternalJCL("jclMin1.7");
+ JavaCore.setClasspathVariables(
+ new String[] {"JCL17_LIB", "JCL17_SRC", "JCL_SRCROOT"},
+ new IPath[] {getExternalJCLPath(compliance), getExternalJCLSourcePath(compliance), getExternalJCLRootSourcePath()},
+ null);
+ }
} else {
if (JavaCore.getClasspathVariable("JCL_LIB") == null) {
setupExternalJCL("jclMin");