[582204] Update BREE from Java 1.5 for build infra compatibility Change-Id: I7ec3ad0c4cadbec0b7b406306f8fe353f4475fd3
diff --git a/tests/org.eclipse.jst.ejb.ui.tests/.classpath b/tests/org.eclipse.jst.ejb.ui.tests/.classpath index 64c5e31..3e5654f 100644 --- a/tests/org.eclipse.jst.ejb.ui.tests/.classpath +++ b/tests/org.eclipse.jst.ejb.ui.tests/.classpath
@@ -1,7 +1,11 @@ <?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.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/tests/org.eclipse.jst.ejb.ui.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ejb.ui.tests/.settings/org.eclipse.jdt.core.prefs index 19c7dd3..b9c016a 100644 --- a/tests/org.eclipse.jst.ejb.ui.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.jst.ejb.ui.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,8 @@ -#Wed May 26 14:42:09 EEST 2010 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.5 +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 @@ -71,4 +70,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
diff --git a/tests/org.eclipse.jst.ejb.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ejb.ui.tests/META-INF/MANIFEST.MF index 33b4666..d33b269 100644 --- a/tests/org.eclipse.jst.ejb.ui.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.ejb.ui.tests/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.ejb.ui.tests -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.jst.ejb.ui.tests.Activator Require-Bundle: org.eclipse.core.runtime, - org.eclipse.jst.ejb.ui;bundle-version="[1.1.201,1.2.0)", + org.eclipse.jst.ejb.ui;bundle-version="[1.2.0,2.0.0)", org.junit, org.eclipse.jdt.ui;bundle-version="[3.2.0,4.0.0)" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.jst.ejb.ui.tests/pom.xml b/tests/org.eclipse.jst.ejb.ui.tests/pom.xml index f83201f..7af7197 100644 --- a/tests/org.eclipse.jst.ejb.ui.tests/pom.xml +++ b/tests/org.eclipse.jst.ejb.ui.tests/pom.xml
@@ -21,7 +21,7 @@ <groupId>org.eclipse.webtools.ejb</groupId> <artifactId>org.eclipse.jst.ejb.ui.tests</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> <properties>
diff --git a/tests/org.eclipse.jst.j2ee.tests/.classpath b/tests/org.eclipse.jst.j2ee.tests/.classpath index 560e3d1..8c0d5f2 100644 --- a/tests/org.eclipse.jst.j2ee.tests/.classpath +++ b/tests/org.eclipse.jst.j2ee.tests/.classpath
@@ -1,13 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="defect-tests"/> - <classpathentry kind="src" path="all"/> - <classpathentry kind="src" path="webmodule-tests"/> - <classpathentry kind="src" path="savestrategy-tests"/> - <classpathentry kind="src" path="j2ee-tests"/> - <classpathentry kind="src" path="j2ee-verifiers"/> - <classpathentry kind="src" path="exportmodel-tests"/> - <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.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="defect-tests"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="all"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="webmodule-tests"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="savestrategy-tests"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="j2ee-tests"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="j2ee-verifiers"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="exportmodel-tests"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs index 2a57aff..e208ed6 100644 --- a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,7 @@ -#Thu May 10 18:35:31 EDT 2007 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -56,4 +55,5 @@ 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.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
diff --git a/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF index 7ba4505..47fdab3 100644 --- a/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF
@@ -1,8 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 +Automatic-Module-Name: org.eclipse.jst.j2ee.tests Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.jst.j2ee.tests; singleton:=true -Bundle-Version: 1.1.800.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-ClassPath: j2ee-tests.jar Bundle-Activator: org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin Bundle-Localization: plugin @@ -17,22 +18,33 @@ org.eclipse.jst.j2ee.flexible.project.fvtests, org.eclipse.jst.j2ee.flexible.project.tests, org.eclipse.jst.j2ee.project.facet.tests, + org.eclipse.jst.j2ee.tests, org.eclipse.jst.j2ee.tests.bvt, org.eclipse.jst.j2ee.tests.modulecore, + org.eclipse.jst.jee.model.ejb.tests, + org.eclipse.jst.jee.model.mergers.tests, org.eclipse.jst.jee.model.tests, + org.eclipse.jst.jee.model.web.tests, org.eclipse.wtp.headless.tests.savestrategy, org.eclipse.wtp.j2ee.headless.tests.appclient.operations, org.eclipse.wtp.j2ee.headless.tests.ear.operations, org.eclipse.wtp.j2ee.headless.tests.ejb.operations, org.eclipse.wtp.j2ee.headless.tests.ejb.verifiers, + org.eclipse.wtp.j2ee.headless.tests.exportmodel, + org.eclipse.wtp.j2ee.headless.tests.j2ee.headers, org.eclipse.wtp.j2ee.headless.tests.j2ee.operations, org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers, org.eclipse.wtp.j2ee.headless.tests.jca.operations, org.eclipse.wtp.j2ee.headless.tests.jca.verifiers, org.eclipse.wtp.j2ee.headless.tests.plugin, + org.eclipse.wtp.j2ee.headless.tests.utility.operations, + org.eclipse.wtp.j2ee.headless.tests.utility.verifiers, org.eclipse.wtp.j2ee.headless.tests.web.container, org.eclipse.wtp.j2ee.headless.tests.web.operations, - org.eclipse.wtp.j2ee.headless.tests.web.verifiers + org.eclipse.wtp.j2ee.headless.tests.web.verifiers, + org.eclipse.wtp.j2ee.headless.tests.webfragment.operations, + org.eclipse.wtp.j2ee.headless.tets.appclient.verifiers, + org.eclipse.wtp.j2ee.headless.tets.ear.verifiers Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.core.commands, @@ -71,5 +83,5 @@ org.eclipse.wst.sse.core Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %Bundle-Vendor.0
diff --git a/tests/org.eclipse.jst.j2ee.tests/pom.xml b/tests/org.eclipse.jst.j2ee.tests/pom.xml index a4d0f94..f7b6eb4 100644 --- a/tests/org.eclipse.jst.j2ee.tests/pom.xml +++ b/tests/org.eclipse.jst.j2ee.tests/pom.xml
@@ -22,7 +22,7 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.j2ee.tests</artifactId> - <version>1.1.800-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <!-- temporarily disable runing these tests by switching to packaging = eclipse-plugin instead of eclipse-test-plugin --> <packaging>eclipse-plugin</packaging> <build>
diff --git a/tests/org.eclipse.jst.validation.test/.classpath b/tests/org.eclipse.jst.validation.test/.classpath index 7c27a9c..c617042 100644 --- a/tests/org.eclipse.jst.validation.test/.classpath +++ b/tests/org.eclipse.jst.validation.test/.classpath
@@ -1,9 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="jUnitWrapper/"/> - <classpathentry kind="src" path="test/"/> - <classpathentry kind="src" path="testFwk/"/> - <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.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="jUnitWrapper/"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="test/"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="testFwk/"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="output" path="bin"/> </classpath>
diff --git a/tests/org.eclipse.jst.validation.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.validation.test/.settings/org.eclipse.jdt.core.prefs index 8c71ba3..e96495d 100644 --- a/tests/org.eclipse.jst.validation.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.eclipse.jst.validation.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@ -#Fri Feb 15 05:43:08 EST 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.codeComplete.argumentPrefixes= org.eclipse.jdt.core.codeComplete.argumentSuffixes= @@ -8,8 +7,9 @@ org.eclipse.jdt.core.codeComplete.localSuffixes= org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=_ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes= -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -59,4 +59,5 @@ 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.5 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8
diff --git a/tests/org.eclipse.jst.validation.test/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.validation.test/META-INF/MANIFEST.MF index 7f15415..333c632 100644 --- a/tests/org.eclipse.jst.validation.test/META-INF/MANIFEST.MF +++ b/tests/org.eclipse.jst.validation.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.eclipse.jst.validation.test;singleton:=true -Bundle-Version: 1.1.300.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Localization: plugin Bundle-Activator: org.eclipse.jst.validation.test.BVTValidationPlugin Require-Bundle: org.eclipse.core.runtime, @@ -29,4 +29,4 @@ org.eclipse.jst.validation.test.junit, org.eclipse.jst.validation.test.setup Bundle-ClassPath: validationtest.jar -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/tests/org.eclipse.jst.validation.test/pom.xml b/tests/org.eclipse.jst.validation.test/pom.xml index 1a87973..5bd3b6d 100644 --- a/tests/org.eclipse.jst.validation.test/pom.xml +++ b/tests/org.eclipse.jst.validation.test/pom.xml
@@ -21,6 +21,6 @@ <groupId>org.eclipse.webtools.javaee</groupId> <artifactId>org.eclipse.jst.validation.test</artifactId> - <version>1.1.300-SNAPSHOT</version> + <version>1.2.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project>