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.
eclipse-tycho · Sep 10, 2024 · e0da2c7 · e0da2c7
1 parent 9744b15
commit e0da2c7
Show file tree

Hide file tree

Showing 76 changed files with 76 additions and 116 deletions.
diff --git a/pom.xml b/pom.xml
@@ -185,6 +185,11 @@
 				<artifactId>ecj</artifactId>
 				<version>${ecjVersion}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.eclipse.jdt</groupId>
+				<artifactId>org.eclipse.jdt.core</artifactId>
+				<version>3.39.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-testing-harness</artifactId>

diff --git a/tycho-apitools-plugin/pom.xml b/tycho-apitools-plugin/pom.xml
@@ -67,7 +67,6 @@
 		<dependency>
 		    <groupId>org.eclipse.jdt</groupId>
 		    <artifactId>org.eclipse.jdt.core</artifactId>
-		    <version>3.38.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.eclipse.jdt</groupId>

diff --git a/tycho-core/pom.xml b/tycho-core/pom.xml
@@ -310,7 +310,6 @@
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.38.0</version>
 		</dependency>
 		<dependency>
 		    <groupId>org.eclipse.pde</groupId>

diff --git a/tycho-its/pom.xml b/tycho-its/pom.xml
@@ -194,7 +194,6 @@
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.38.0</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- update site tests -->

diff --git 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
@@ -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/.../projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle01/META-INF/MANIFEST.MF b/.../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/.../projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle02/META-INF/MANIFEST.MF b/.../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/.../projects/TYCHO0209tychoRepositoryRoundtrip/build01/build01.bundle03/META-INF/MANIFEST.MF b/.../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
@@ -38,9 +38,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/.../projects/TYCHO0209tychoRepositoryRoundtrip/build02/build02.bundle02/META-INF/MANIFEST.MF b/.../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
@@ -40,10 +40,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-          <ignoreTychoRepositories>false</ignoreTychoRepositories>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/.../projects/TYCHO0209tychoRepositoryRoundtrip/build03/build03.bundle01/META-INF/MANIFEST.MF b/.../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
@@ -22,9 +22,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git 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
@@ -20,9 +20,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git 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
@@ -20,9 +20,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml b/tycho-its/projects/TYCHO0383dotQualifierMatching/featureDotQualifier/pom.xml
@@ -53,7 +53,6 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <resolver>p2</resolver>
           <environments>
             <environment>
               <os>linux</os>

diff --git a/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/pom.xml b/tycho-its/projects/TYCHO0383dotQualifierMatching/productDotQualifier/pom.xml
@@ -35,7 +35,6 @@
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tycho-version}</version>
 				<configuration>
-					<resolver>p2</resolver>
 					<environments>
 						<environment>
 							<os>linux</os>

diff --git a/...3dotQualifierMatching/productDotQualifier/productDotQualifier.plugin/META-INF/MANIFEST.MF b/...3dotQualifierMatching/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
@@ -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
@@ -27,7 +27,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.13.0</version>
 			</plugin>
 		</plugins>
 	</build>

diff --git a/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/pom.xml b/tycho-its/projects/TYCHO0404pomDependencyConsiderExtraClasspath/pom.xml
@@ -22,7 +22,6 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <resolver>p2</resolver>
           <pomDependencies>consider</pomDependencies>
         </configuration>
       </plugin>

diff --git a/...HO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/META-INF/MANIFEST.MF b/...HO253extraClassPathEntries/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/.../projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml b/.../projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest1/pom.xml
@@ -40,9 +40,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/...HO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/META-INF/MANIFEST.MF b/...HO253extraClassPathEntries/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/.../projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml b/.../projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest2/pom.xml
@@ -40,9 +40,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/...HO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/META-INF/MANIFEST.MF b/...HO253extraClassPathEntries/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/.../projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml b/.../projects/TYCHO253extraClassPathEntries/org.eclipse.tycho.testExtraClasspathTest3/pom.xml
@@ -40,9 +40,6 @@
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
-        <configuration>
-          <resolver>p2</resolver>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git 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
@@ -23,7 +23,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.13.0</version>
 				<configuration>
 					<compilerId>jdt</compilerId>
 					<compilerArgument>-err:unused</compilerArgument> 

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
@@ -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
@@ -66,15 +66,6 @@
 							  <mainLabel>The custom main label</mainLabel>
 							  <mainFilename>custom-overview.html</mainFilename>
 							</tocOptions>
-							<jvmOptions>
-									<jvmOption>
-										-Xms8m</jvmOption>
-									<jvmOption>-Xmx48m</jvmOption>
-									<jvmOption>
-										-Dfoo=bar
-
-									</jvmOption>
-								</jvmOptions>
 						</configuration>
 					</execution>
 				</executions>

diff --git 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 @@
 	<packaging>jar</packaging>
 
 	<properties>
-		<maven.compiler.target>8</maven.compiler.target>
-		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.release>17</maven.compiler.release>
 	</properties>
 
 	<dependencies>

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
@@ -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/...rojects/eeProfile.resolution.fragments/org.eclipse.jface.databinding/META-INF/MANIFEST.MF b/...rojects/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/...rojects/eeProfile.resolution.fragments/org.eclipse.swt.gtk.linux.x86/META-INF/MANIFEST.MF b/...rojects/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
@@ -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
@@ -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
@@ -24,7 +24,7 @@
         <artifactId>target-platform-configuration</artifactId>
         <version>${tycho-version}</version>
         <configuration>
-          <executionEnvironment>J2SE-1.5</executionEnvironment>
+          <executionEnvironment>JavaSE-17</executionEnvironment>
         </configuration>
       </plugin>
     </plugins>

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
@@ -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
@@ -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
@@ -23,7 +23,7 @@
 		<keystore.key.password>abcd1234</keystore.key.password>
 		<jarsigner.plugin.groupId>org.apache.maven.plugins</jarsigner.plugin.groupId>
 		<jarsigner.plugin.artifactId>maven-jarsigner-plugin</jarsigner.plugin.artifactId>
-		<jarsigner.plugin.version>1.2</jarsigner.plugin.version>
+		<jarsigner.plugin.version>3.0.0</jarsigner.plugin.version>
 	</properties>
 
 	<build>

diff --git 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
@@ -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
@@ -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
@@ -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"