From fa3e5519929e90acc230a6add9b90ec68be43666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Tue, 10 Sep 2024 12:14:16 +0300 Subject: [PATCH] Bump tests to newer Java as ecj no longer compiles to pre 1.8 target Using 17 as preferred target in non compiler specific tests to prevent having to do similar update soon. Updates o.e.jdt.core to the version signed with same certificate. --- .../bundle.tests/META-INF/MANIFEST.MF | 2 +- .../MNGECLIPSE937/bundle/META-INF/MANIFEST.MF | 2 +- .../build01.bundle01/META-INF/MANIFEST.MF | 2 +- .../build01.bundle02/META-INF/MANIFEST.MF | 2 +- .../build01.bundle03/META-INF/MANIFEST.MF | 2 +- .../build01/pom.xml | 3 --- .../build02.bundle02/META-INF/MANIFEST.MF | 2 +- .../build02/pom.xml | 4 --- .../build03.bundle01/META-INF/MANIFEST.MF | 2 +- .../build03/pom.xml | 3 --- .../bundle01/META-INF/MANIFEST.MF | 2 +- .../bundle01/pom.xml | 3 --- .../bundle02/META-INF/MANIFEST.MF | 2 +- .../bundle02/pom.xml | 3 --- .../featureDotQualifier/pom.xml | 1 - .../productDotQualifier/pom.xml | 1 - .../META-INF/MANIFEST.MF | 2 +- .../bundle/META-INF/MANIFEST.MF | 2 +- .../extra/pom.xml | 2 +- .../pom.xml | 1 - .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 3 --- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 3 --- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 3 --- .../projects/TYCHO476/META-INF/MANIFEST.MF | 2 +- .../compiler.mavenCompilerPlugin/pom.xml | 2 +- .../test1/bundle1/META-INF/MANIFEST.MF | 2 +- .../test1/docbundle1/pom.xml | 9 ------- .../test1/doclet/pom.xml | 3 +-- .../build/bundle.test/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 3 +-- .../META-INF/MANIFEST.MF | 2 +- .../ee-from-bree/META-INF/MANIFEST.MF | 3 +-- .../ee-from-pom/META-INF/MANIFEST.MF | 3 +-- .../projects/eeProfile/ee-from-pom/pom.xml | 2 +- .../plugin/META-INF/MANIFEST.MF | 2 +- .../jar-signing/plugin/META-INF/MANIFEST.MF | 2 +- tycho-its/projects/jar-signing/pom.xml | 2 +- .../consumer/META-INF/MANIFEST.MF | 2 +- .../fragment-linux64/META-INF/MANIFEST.MF | 2 +- .../host/META-INF/MANIFEST.MF | 2 +- .../bundle.test/META-INF/MANIFEST.MF | 2 +- .../bundle/META-INF/MANIFEST.MF | 2 +- .../touchpoint/META-INF/MANIFEST.MF | 2 +- .../artificial/META-INF/MANIFEST.MF | 2 +- .../bundle.tests/META-INF/MANIFEST.MF | 2 +- .../bundle/META-INF/MANIFEST.MF | 2 +- .../bundle.tests/META-INF/MANIFEST.MF | 2 +- .../bundle/META-INF/MANIFEST.MF | 2 +- .../fragment/META-INF/MANIFEST.MF | 2 +- .../bundle.tests/META-INF/MANIFEST.MF | 2 +- .../bundle/META-INF/MANIFEST.MF | 2 +- .../fragment/META-INF/MANIFEST.MF | 2 +- .../bundle.tests/META-INF/MANIFEST.MF | 2 +- .../bundleA/META-INF/MANIFEST.MF | 2 +- .../bundleB/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../projects/surefire.bundleResources/pom.xml | 1 - .../META-INF/MANIFEST.MF | 2 +- .../reactorbundle/META-INF/MANIFEST.MF | 2 +- .../testbundle/META-INF/MANIFEST.MF | 2 +- .../surefire.runorder/META-INF/MANIFEST.MF | 2 +- .../p1.test/META-INF/MANIFEST.MF | 2 +- .../p1/META-INF/MANIFEST.MF | 2 +- .../bundle.test/META-INF/MANIFEST.MF | 2 +- .../bundle.testGroups/META-INF/MANIFEST.MF | 2 +- .../bundle.testSuites/META-INF/MANIFEST.MF | 2 +- .../testng.bundle/META-INF/MANIFEST.MF | 2 +- .../bundle.tests/META-INF/MANIFEST.MF | 2 +- .../tycho476/ExecutionEnvironmentTest.java | 26 +++++++++---------- 72 files changed, 71 insertions(+), 113 deletions(-) diff --git a/tycho-its/projects/MNGECLIPSE937/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/MNGECLIPSE937/bundle.tests/META-INF/MANIFEST.MF index be665b2b87..6c96cdf1d8 100644 --- a/tycho-its/projects/MNGECLIPSE937/bundle.tests/META-INF/MANIFEST.MF +++ b/tycho-its/projects/MNGECLIPSE937/bundle.tests/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tests Plug-in Bundle-SymbolicName: bundle.tests Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: bundle;bundle-version="0.0.1", org.junit;bundle-version="3.8.0" diff --git a/tycho-its/projects/MNGECLIPSE937/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/MNGECLIPSE937/bundle/META-INF/MANIFEST.MF index f933879b7b..37ddac19b8 100644 --- a/tycho-its/projects/MNGECLIPSE937/bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/MNGECLIPSE937/bundle/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle Plug-in Bundle-SymbolicName: bundle Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: bundle diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/META-INF/MANIFEST.MF index d680fecd80..6c3bf3f813 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle01 Plug-in Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build01.bundle01 Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: bundle01 Require-Bundle: org.eclipse.osgi;bundle-version="3.2.0" Bundle-Activator: bundle01.Bundle01Activator diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/META-INF/MANIFEST.MF index 9fc8adf906..be0325585f 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle02 Plug-in Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build01.bundle02 Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/META-INF/MANIFEST.MF index e1b9957cf2..9ea8243918 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle02 Plug-in Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build01.bundle03 Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="3.8.2" diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/pom.xml index 93e8bab5b6..965894ff1c 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build01/pom.xml @@ -38,9 +38,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/META-INF/MANIFEST.MF index 7053a74ced..00d4ce84f2 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle02 Plug-in Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build02.bundle02 Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: bundle02.Bundle02Activator Require-Bundle: org.eclipse.osgi;bundle-version="3.2.0", org.codehaus.tycho.tychoits.tycho0209.build01.bundle01, diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/pom.xml index 0277664564..93c968da97 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build02/pom.xml @@ -40,10 +40,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - false - diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/META-INF/MANIFEST.MF index b9b302cddc..3e72b87841 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/META-INF/MANIFEST.MF @@ -4,5 +4,5 @@ Bundle-Name: Bundle01 Bundle-SymbolicName: org.codehaus.tycho.tychoits.tycho0209.build03.bundle01 Bundle-Version: 0.0.1.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.codehaus.tycho.tychoits.tycho0209.build01.bundle02 diff --git a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/pom.xml b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/pom.xml index a861d96b82..7711e0006b 100644 --- a/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/pom.xml +++ b/tycho-its/projects/TYCHO0209tychoRepositoryRoundtrip/build03/pom.xml @@ -22,9 +22,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/META-INF/MANIFEST.MF index b272de4502..194feba0ea 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: TYCHO0367localRepositoryCrosstalk.bundle01;singleton:=true Bundle-Version: 1.0.0.qualifier Require-Bundle: org.eclipse.osgi, org.junit;bundle-version="3.8.2" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: TYCHO0367localRepositoryCrosstalk.bundle01.Activator Bundle-ActivationPolicy: lazy diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml index 8adcff0191..e03830e48a 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle01/pom.xml @@ -20,9 +20,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/META-INF/MANIFEST.MF index 1ef3a12708..77e1199da6 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/META-INF/MANIFEST.MF @@ -5,6 +5,6 @@ Bundle-SymbolicName: TYCHO0367localRepositoryCrosstalk.bundle02;singleton:=true Bundle-Version: 1.0.0.qualifier Require-Bundle: org.eclipse.osgi, org.junit;bundle-version="3.8.2" -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Activator: TYCHO0367localRepositoryCrosstalk.bundle02.Activator Bundle-ActivationPolicy: lazy diff --git a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml index feca347a1e..0a2de7e8e0 100644 --- a/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml +++ b/tycho-its/projects/TYCHO0367localRepositoryCrosstalk/bundle02/pom.xml @@ -20,9 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml b/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml index c62a0f93c7..4d2d6f8ca1 100644 --- a/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml +++ b/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml @@ -53,7 +53,6 @@ target-platform-configuration ${tycho-version} - p2 linux diff --git a/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/pom.xml b/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/pom.xml index 0768ec4704..1d281f0b12 100644 --- a/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/pom.xml +++ b/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/pom.xml @@ -35,7 +35,6 @@ target-platform-configuration ${tycho-version} - p2 linux diff --git a/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/productDotQualifier.plugin/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/productDotQualifier.plugin/META-INF/MANIFEST.MF index b97900b0a3..92c1ddd250 100644 --- a/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/productDotQualifier.plugin/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/productDotQualifier.plugin/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Plugin Bundle-SymbolicName: productDotQualifier.plugin;singleton:=true Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.equinox.app diff --git a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/bundle/META-INF/MANIFEST.MF index 334291ab55..74c5843b1a 100644 --- a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/bundle/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle Bundle-SymbolicName: bundle Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/extra/pom.xml b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/extra/pom.xml index 7587e3b0f8..fad6bbb1be 100644 --- a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/extra/pom.xml +++ b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/extra/pom.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 diff --git a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/pom.xml b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/pom.xml index a7bef593bf..89493699e8 100644 --- a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/pom.xml +++ b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/pom.xml @@ -22,7 +22,6 @@ target-platform-configuration ${tycho-version} - p2 consider diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/META-INF/MANIFEST.MF index 477f7927bd..9e735b1ceb 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.sonatype.tycho.testextraclasspathtest1.Activator Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml index 1a5004f135..940695000d 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml @@ -40,9 +40,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/META-INF/MANIFEST.MF index 03eeb5f017..8cd5b2adb2 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.sonatype.tycho.testextraclasspathtest2.Activator Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml index b53e2b74b5..04d307f290 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml @@ -40,9 +40,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/META-INF/MANIFEST.MF index e4499ccb9a..d97faea4e2 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.sonatype.tycho.testextraclasspathtest3.Activator Require-Bundle: org.eclipse.core.runtime Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml index 76d3bcdae2..b43cff6d04 100644 --- a/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml +++ b/tycho-its/projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml @@ -40,9 +40,6 @@ org.eclipse.tycho target-platform-configuration ${tycho-version} - - p2 - diff --git a/tycho-its/projects/TYCHO476/META-INF/MANIFEST.MF b/tycho-its/projects/TYCHO476/META-INF/MANIFEST.MF index 49fe816996..c049b90ef3 100644 --- a/tycho-its/projects/TYCHO476/META-INF/MANIFEST.MF +++ b/tycho-its/projects/TYCHO476/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: ExecutionEnvironments Test Bundle-SymbolicName: executionEnvironments Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/compiler.mavenCompilerPlugin/pom.xml b/tycho-its/projects/compiler.mavenCompilerPlugin/pom.xml index 406e9f1add..a23f551aaa 100644 --- a/tycho-its/projects/compiler.mavenCompilerPlugin/pom.xml +++ b/tycho-its/projects/compiler.mavenCompilerPlugin/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.13.0 jdt -err:unused diff --git a/tycho-its/projects/document-bundle-plugin/test1/bundle1/META-INF/MANIFEST.MF b/tycho-its/projects/document-bundle-plugin/test1/bundle1/META-INF/MANIFEST.MF index 0d6892574b..962d8f66ef 100644 --- a/tycho-its/projects/document-bundle-plugin/test1/bundle1/META-INF/MANIFEST.MF +++ b/tycho-its/projects/document-bundle-plugin/test1/bundle1/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle1 Bundle-SymbolicName: bundle1 Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: bundle1;version="1.0.0" diff --git a/tycho-its/projects/document-bundle-plugin/test1/docbundle1/pom.xml b/tycho-its/projects/document-bundle-plugin/test1/docbundle1/pom.xml index 4ef4622a42..effea5deb9 100644 --- a/tycho-its/projects/document-bundle-plugin/test1/docbundle1/pom.xml +++ b/tycho-its/projects/document-bundle-plugin/test1/docbundle1/pom.xml @@ -66,15 +66,6 @@ The custom main label custom-overview.html - - - -Xms8m - -Xmx48m - - -Dfoo=bar - - - diff --git a/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml b/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml index cd72daa1ad..e024383d21 100644 --- a/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml +++ b/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml @@ -12,8 +12,7 @@ jar - 1.8 - 1.8 + 17 diff --git a/tycho-its/projects/eeProfile.custom/build/bundle.test/META-INF/MANIFEST.MF b/tycho-its/projects/eeProfile.custom/build/bundle.test/META-INF/MANIFEST.MF index 0589e52d69..cb7b895da8 100644 --- a/tycho-its/projects/eeProfile.custom/build/bundle.test/META-INF/MANIFEST.MF +++ b/tycho-its/projects/eeProfile.custom/build/bundle.test/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle Bundle-SymbolicName: epc.bundle.test Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: javax.activation;version="1.1.0" Require-Bundle: org.junit diff --git a/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.jface.databinding/META-INF/MANIFEST.MF b/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.jface.databinding/META-INF/MANIFEST.MF index 08ac66e4f2..dfc031e07c 100644 --- a/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.jface.databinding/META-INF/MANIFEST.MF +++ b/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.jface.databinding/META-INF/MANIFEST.MF @@ -7,5 +7,4 @@ Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)" -Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, - J2SE-1.3 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF b/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF index 88c5749f94..4b948946b6 100644 --- a/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF +++ b/tycho-its/projects/eeProfile.resolution.fragments/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF @@ -8,4 +8,4 @@ Bundle-ManifestVersion: 2 Bundle-Localization: fragment Export-Package: org.eclipse.swt.graphics Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x86)) -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/eeProfile/ee-from-bree/META-INF/MANIFEST.MF b/tycho-its/projects/eeProfile/ee-from-bree/META-INF/MANIFEST.MF index 2a8f55533e..621c3db766 100644 --- a/tycho-its/projects/eeProfile/ee-from-bree/META-INF/MANIFEST.MF +++ b/tycho-its/projects/eeProfile/ee-from-bree/META-INF/MANIFEST.MF @@ -2,6 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: 364095_dependencyResolverBREE.ee-from-bree Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, - J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.w3c.dom diff --git a/tycho-its/projects/eeProfile/ee-from-pom/META-INF/MANIFEST.MF b/tycho-its/projects/eeProfile/ee-from-pom/META-INF/MANIFEST.MF index 1af13d38a6..12d1629b23 100644 --- a/tycho-its/projects/eeProfile/ee-from-pom/META-INF/MANIFEST.MF +++ b/tycho-its/projects/eeProfile/ee-from-pom/META-INF/MANIFEST.MF @@ -2,6 +2,5 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: 364095_dependencyResolverBREE.ee-from-pom Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0, - J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Import-Package: org.w3c.dom diff --git a/tycho-its/projects/eeProfile/ee-from-pom/pom.xml b/tycho-its/projects/eeProfile/ee-from-pom/pom.xml index 8c5c6c4048..2581bb528a 100644 --- a/tycho-its/projects/eeProfile/ee-from-pom/pom.xml +++ b/tycho-its/projects/eeProfile/ee-from-pom/pom.xml @@ -24,7 +24,7 @@ target-platform-configuration ${tycho-version} - J2SE-1.5 + JavaSE-17 diff --git a/tycho-its/projects/jar-signing-extra/plugin/META-INF/MANIFEST.MF b/tycho-its/projects/jar-signing-extra/plugin/META-INF/MANIFEST.MF index e08a2096f6..40d3fa5aad 100644 --- a/tycho-its/projects/jar-signing-extra/plugin/META-INF/MANIFEST.MF +++ b/tycho-its/projects/jar-signing-extra/plugin/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSGi Jarsigning Example Bundle Bundle-SymbolicName: jarsigning Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/jar-signing/plugin/META-INF/MANIFEST.MF b/tycho-its/projects/jar-signing/plugin/META-INF/MANIFEST.MF index e08a2096f6..40d3fa5aad 100644 --- a/tycho-its/projects/jar-signing/plugin/META-INF/MANIFEST.MF +++ b/tycho-its/projects/jar-signing/plugin/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-Name: OSGi Jarsigning Example Bundle Bundle-SymbolicName: jarsigning Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/jar-signing/pom.xml b/tycho-its/projects/jar-signing/pom.xml index 27e0aa897f..1628c925fd 100644 --- a/tycho-its/projects/jar-signing/pom.xml +++ b/tycho-its/projects/jar-signing/pom.xml @@ -23,7 +23,7 @@ abcd1234 org.apache.maven.plugins maven-jarsigner-plugin - 1.2 + 3.0.0 diff --git a/tycho-its/projects/p2Inf.hostRequireFragment/consumer/META-INF/MANIFEST.MF b/tycho-its/projects/p2Inf.hostRequireFragment/consumer/META-INF/MANIFEST.MF index c5fbf9add0..c9636566a0 100644 --- a/tycho-its/projects/p2Inf.hostRequireFragment/consumer/META-INF/MANIFEST.MF +++ b/tycho-its/projects/p2Inf.hostRequireFragment/consumer/META-INF/MANIFEST.MF @@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2 Bundle-Name: Bundle using the host bundle and the implicitly provided implementation Bundle-SymbolicName: org.example.phf.consumer Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit Import-Package: phf.host diff --git a/tycho-its/projects/p2Inf.hostRequireFragment/fragments/fragment-linux64/META-INF/MANIFEST.MF b/tycho-its/projects/p2Inf.hostRequireFragment/fragments/fragment-linux64/META-INF/MANIFEST.MF index d974a9a815..f85f218454 100644 --- a/tycho-its/projects/p2Inf.hostRequireFragment/fragments/fragment-linux64/META-INF/MANIFEST.MF +++ b/tycho-its/projects/p2Inf.hostRequireFragment/fragments/fragment-linux64/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Fragment providing the implementation for linux.gtk.x86_64 Bundle-SymbolicName: org.example.phf.linux.gtk.x86_64 Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Fragment-Host: org.example.phf.host X-Comment: Platform filter disabled so that the test runs on all platforms X-Eclipse-PlatformFilter: (&(osgi.os=linux)(osgi.ws=gtk)(osgi.arch=x86_64)) diff --git a/tycho-its/projects/p2Inf.hostRequireFragment/host/META-INF/MANIFEST.MF b/tycho-its/projects/p2Inf.hostRequireFragment/host/META-INF/MANIFEST.MF index 0ea6d00340..b9dfcb94e3 100644 --- a/tycho-its/projects/p2Inf.hostRequireFragment/host/META-INF/MANIFEST.MF +++ b/tycho-its/projects/p2Inf.hostRequireFragment/host/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Host bundle requiring its implementation fragments via a p2.inf dependency Bundle-SymbolicName: org.example.phf.host Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: phf.host diff --git a/tycho-its/projects/product.duplicateIUs/bundle.test/META-INF/MANIFEST.MF b/tycho-its/projects/product.duplicateIUs/bundle.test/META-INF/MANIFEST.MF index 7b4e8fd994..5f874e3d7a 100644 --- a/tycho-its/projects/product.duplicateIUs/bundle.test/META-INF/MANIFEST.MF +++ b/tycho-its/projects/product.duplicateIUs/bundle.test/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: Test Plug-in Bundle-SymbolicName: bundle.test Bundle-Version: 0.0.1.qualifier -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="3.8.2" diff --git a/tycho-its/projects/product.metaRequirements/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/product.metaRequirements/bundle/META-INF/MANIFEST.MF index 9543d3b6e9..48bf45b3f3 100644 --- a/tycho-its/projects/product.metaRequirements/bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/product.metaRequirements/bundle/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-Name: Bundle using the custom touchpoint Bundle-SymbolicName: pmr.bundle Bundle-Version: 0.1.0.qualifier Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/product.metaRequirements/touchpoint/META-INF/MANIFEST.MF b/tycho-its/projects/product.metaRequirements/touchpoint/META-INF/MANIFEST.MF index 07bfe34d61..bdb5bd3378 100644 --- a/tycho-its/projects/product.metaRequirements/touchpoint/META-INF/MANIFEST.MF +++ b/tycho-its/projects/product.metaRequirements/touchpoint/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Bundle-Version: 0.1.0.qualifier Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.equinox.p2.engine.spi Require-Bundle: org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/artificial/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/artificial/META-INF/MANIFEST.MF index 3831774e7f..a555934c11 100644 --- a/tycho-its/projects/resolver.extraRequirements/artificial/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/artificial/META-INF/MANIFEST.MF @@ -7,4 +7,4 @@ Require-Bundle: org.eclipse.osgi, org.junit Bundle-Activator: test.Activator Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle.tests/META-INF/MANIFEST.MF index 8cbb3e7d18..88be1b260e 100644 --- a/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle.tests/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle.tests/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle.tests Bundle-Version: 1.0.0.qualifier DynamicImport-Package: bundle Require-Bundle: org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 \ No newline at end of file +Bundle-RequiredExecutionEnvironment: JavaSE-17 \ No newline at end of file diff --git a/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle/META-INF/MANIFEST.MF index b4072965ba..5a200b0b1b 100644 --- a/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/dynamicimport-package/bundle/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: bundle Bundle-Version: 1.0.0.qualifier Export-Package: bundle -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle.tests/META-INF/MANIFEST.MF index 0592f6ff37..98572e519a 100644 --- a/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle.tests/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle.tests/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle.tests Bundle-Version: 1.0.0.qualifier Import-Package: split Require-Bundle: org.junit -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle/META-INF/MANIFEST.MF index d170816ccd..d6d0b46694 100644 --- a/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/fragment-split-package/bundle/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle Bundle-Version: 1.0.0.qualifier Export-Package: split Eclipse-ExtensibleAPI: true -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/fragment-split-package/fragment/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/fragment-split-package/fragment/META-INF/MANIFEST.MF index d04215dd2a..643b40fa9e 100644 --- a/tycho-its/projects/resolver.extraRequirements/fragment-split-package/fragment/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/fragment-split-package/fragment/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: fragment Bundle-Version: 1.0.0.qualifier Export-Package: split;f=f;mandatory:=f Fragment-Host: bundle -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle.tests/META-INF/MANIFEST.MF index d7c3e6043c..f6d8051ff4 100644 --- a/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle.tests/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle.tests/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle.tests Bundle-Version: 1.0.0.qualifier Require-Bundle: org.junit, bundle -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle/META-INF/MANIFEST.MF index 0cce51eda5..fdd6f583f9 100644 --- a/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/bundle/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundle Bundle-Version: 1.0.0.qualifier Export-Package: bundle Eclipse-ExtensibleAPI: true -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/fragment/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/fragment/META-INF/MANIFEST.MF index 93c8d071e5..9542f175b2 100644 --- a/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/fragment/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/implicit-fragment-import-package/fragment/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: fragment Bundle-Version: 1.0.0.qualifier Export-Package: fragment Fragment-Host: bundle -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundle.tests/META-INF/MANIFEST.MF index 61350cce03..82089e408c 100644 --- a/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundle.tests/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundle.tests/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-Version: 1.0.0.qualifier Require-Bundle: org.junit Import-Package: split;a=split, unsplit -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleA/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleA/META-INF/MANIFEST.MF index 270d19c72f..1c4225489f 100644 --- a/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleA/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleA/META-INF/MANIFEST.MF @@ -4,4 +4,4 @@ Bundle-SymbolicName: bundleA Bundle-Version: 1.0.0.qualifier Export-Package: split;a=split;mandatory:=a Import-Package: split;a=split -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleB/META-INF/MANIFEST.MF b/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleB/META-INF/MANIFEST.MF index bb7dd0ab5e..25f1e0592e 100644 --- a/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleB/META-INF/MANIFEST.MF +++ b/tycho-its/projects/resolver.extraRequirements/import-package-directives/bundleB/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-Version: 1.0.0.qualifier Export-Package: split;b=split;mandatory:=b;version=2, unsplit Import-Package: split;b=split -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.bundleResources/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.bundleResources/META-INF/MANIFEST.MF index f20c85dbed..0549516992 100644 --- a/tycho-its/projects/surefire.bundleResources/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.bundleResources/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: bundle Bundle-SymbolicName: bundle Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.junit;bundle-version="[4.8.0,5.0.0)", system.bundle Bundle-Activator: test.Activator diff --git a/tycho-its/projects/surefire.bundleResources/pom.xml b/tycho-its/projects/surefire.bundleResources/pom.xml index 668e06ee4d..288b278815 100644 --- a/tycho-its/projects/surefire.bundleResources/pom.xml +++ b/tycho-its/projects/surefire.bundleResources/pom.xml @@ -28,7 +28,6 @@ target-platform-configuration ${tycho-version} - p2 false diff --git a/tycho-its/projects/surefire.optionalDependencies.ignore/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.optionalDependencies.ignore/META-INF/MANIFEST.MF index ab620b4372..7991193066 100644 --- a/tycho-its/projects/surefire.optionalDependencies.ignore/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.optionalDependencies.ignore/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Require-Bundle: org.junit, org.eclipse.core.runtime, org.eclipse.equinox.frameworkadmin;bundle-version="[1.0.0,1.0.100)";resolution:=optional, org.eclipse.equinox.frameworkadmin;bundle-version="1.0.100";resolution:=optional -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.optionalDependencies.reactor/reactorbundle/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.optionalDependencies.reactor/reactorbundle/META-INF/MANIFEST.MF index 258926be61..a801bc8198 100644 --- a/tycho-its/projects/surefire.optionalDependencies.reactor/reactorbundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.optionalDependencies.reactor/reactorbundle/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: sodr.reactorbundle Bundle-Version: 1.0.0.qualifier Require-Bundle: org.eclipse.equinox.frameworkadmin;resolution:=optional;x-installation:=greedy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.optionalDependencies.reactor/testbundle/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.optionalDependencies.reactor/testbundle/META-INF/MANIFEST.MF index f02c808dae..cc574c732c 100644 --- a/tycho-its/projects/surefire.optionalDependencies.reactor/testbundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.optionalDependencies.reactor/testbundle/META-INF/MANIFEST.MF @@ -6,4 +6,4 @@ Require-Bundle: org.junit, org.eclipse.core.runtime, sodr.reactorbundle, org.apache.ant;resolution:=optional;x-installation:=greedy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.runorder/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.runorder/META-INF/MANIFEST.MF index 168bb77a5f..2eed031f0d 100644 --- a/tycho-its/projects/surefire.runorder/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.runorder/META-INF/MANIFEST.MF @@ -3,4 +3,4 @@ Bundle-ManifestVersion: 2 Bundle-SymbolicName: surefire.runorder Bundle-Version: 1.0.0.qualifier Import-Package: org.junit;version="4.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.testFragment/p1.test/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.testFragment/p1.test/META-INF/MANIFEST.MF index 3599bd2488..88fd80f9fa 100644 --- a/tycho-its/projects/surefire.testFragment/p1.test/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.testFragment/p1.test/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: p1.test;singleton:=true Bundle-Version: 0.0.1.qualifier Require-Bundle: org.junit;bundle-version="3.8.0" Fragment-Host: p1;bundle-version="0.0.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.testFragment/p1/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.testFragment/p1/META-INF/MANIFEST.MF index bbef9d5b20..1936aafd19 100644 --- a/tycho-its/projects/surefire.testFragment/p1/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.testFragment/p1/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: p1;singleton:=true Bundle-Version: 0.0.1.qualifier Bundle-Activator: p1.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/surefire.testng/bundle.test/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.testng/bundle.test/META-INF/MANIFEST.MF index fb8fc9aad6..f507268142 100644 --- a/tycho-its/projects/surefire.testng/bundle.test/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.testng/bundle.test/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: TestNG Test Plug-in Bundle-SymbolicName: bundle.test Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: testng.bundle;bundle-version="1.0.0" diff --git a/tycho-its/projects/surefire.testng/bundle.testGroups/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.testng/bundle.testGroups/META-INF/MANIFEST.MF index 926761aab7..08b5d9a02c 100644 --- a/tycho-its/projects/surefire.testng/bundle.testGroups/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.testng/bundle.testGroups/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: TestNG Test Plug-in testing groups Bundle-SymbolicName: bundle.testGroups Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: testng.bundle;bundle-version="1.0.0" diff --git a/tycho-its/projects/surefire.testng/bundle.testSuites/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.testng/bundle.testSuites/META-INF/MANIFEST.MF index 2e2ec3b646..8fff30f07b 100644 --- a/tycho-its/projects/surefire.testng/bundle.testSuites/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.testng/bundle.testSuites/META-INF/MANIFEST.MF @@ -3,5 +3,5 @@ Bundle-ManifestVersion: 2 Bundle-Name: TestNG Test Plug-in testing Suites Bundle-SymbolicName: bundle.testSuites Bundle-Version: 1.0.0 -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: testng.bundle;bundle-version="1.0.0" diff --git a/tycho-its/projects/surefire.testng/testng.bundle/META-INF/MANIFEST.MF b/tycho-its/projects/surefire.testng/testng.bundle/META-INF/MANIFEST.MF index 0fad7d08dc..eb6284d392 100644 --- a/tycho-its/projects/surefire.testng/testng.bundle/META-INF/MANIFEST.MF +++ b/tycho-its/projects/surefire.testng/testng.bundle/META-INF/MANIFEST.MF @@ -34,4 +34,4 @@ Export-Package: com.beust.jcommander, org.testng.xml, org.testng.xml.dom DynamicImport-Package: * -Bundle-RequiredExecutionEnvironment: JavaSE-1.7 +Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/tycho-its/projects/tycho154/bundle.tests/META-INF/MANIFEST.MF b/tycho-its/projects/tycho154/bundle.tests/META-INF/MANIFEST.MF index 88cacbbcd9..5d4fac9d22 100644 --- a/tycho-its/projects/tycho154/bundle.tests/META-INF/MANIFEST.MF +++ b/tycho-its/projects/tycho154/bundle.tests/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: bundle.tests;singleton:=true Bundle-Version: 0.0.1.qualifier Require-Bundle: org.junit;bundle-version="4.0.0", bundle;bundle-version="0.0.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 \ No newline at end of file +Bundle-RequiredExecutionEnvironment: JavaSE-17 \ No newline at end of file diff --git a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java index 066410f9ae..57d96565b6 100644 --- a/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java +++ b/tycho-its/src/test/java/org/eclipse/tycho/test/tycho476/ExecutionEnvironmentTest.java @@ -23,18 +23,18 @@ public class ExecutionEnvironmentTest extends AbstractTychoIntegrationTest { - @Test - public void testCompilerSourceTargetConfigurationViaManifest() throws Exception { - Verifier verifier = getVerifier("TYCHO476", false); - verifier.executeGoal("compile"); - // compile only succeeds with source level 1.6 which - // is configured indirectly via Bundle-RequiredExecutionEnvironment: JavaSE-1.6 - verifier.verifyErrorFreeLog(); - File classFile = new File(verifier.getBasedir(), "target/classes/TestRunnable.class"); - Assert.assertTrue(classFile.canRead()); - JavaClass javaClass = new ClassParser(classFile.getAbsolutePath()).parse(); - // bytecode major level 50 == target 1.6 - Assert.assertEquals(50, javaClass.getMajor()); - } + @Test + public void testCompilerSourceTargetConfigurationViaManifest() throws Exception { + Verifier verifier = getVerifier("TYCHO476", false); + verifier.executeGoal("compile"); + // compile only succeeds with source level 1.6 which + // is configured indirectly via Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + verifier.verifyErrorFreeLog(); + File classFile = new File(verifier.getBasedir(), "target/classes/TestRunnable.class"); + Assert.assertTrue(classFile.canRead()); + JavaClass javaClass = new ClassParser(classFile.getAbsolutePath()).parse(); + // bytecode major level 61 == target 17 + Assert.assertEquals(61, javaClass.getMajor()); + } }