diff --git a/demo/osgi-repository/my-bundle/pom.xml b/demo/osgi-repository/my-bundle/pom.xml
index 7a3415e5fe..e64cf5ed3b 100644
--- a/demo/osgi-repository/my-bundle/pom.xml
+++ b/demo/osgi-repository/my-bundle/pom.xml
@@ -7,8 +7,8 @@
 	</parent>
 	<artifactId>my-bundle</artifactId>
 	<properties>
-		<maven.compiler.source>1.8</maven.compiler.source>
-		<maven.compiler.target>1.8</maven.compiler.target>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
 	</properties>
 	<dependencies>
 		<dependency>
diff --git a/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml b/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml
index 6049aec861..f7fcb0e015 100644
--- a/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml
+++ b/tycho-its/projects/TYCHO590annotationProcessing/annotated-project/pom.xml
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.tycho.tychoits.TYCHO590</groupId>
 	<artifactId>annotated-project</artifactId>
-	
+
 	<parent>
 		<groupId>org.eclipse.tycho.tychoits.TYCHO590</groupId>
 		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
-	
+
 	<build>
 		<plugins>
 			<plugin>
@@ -17,8 +17,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.10.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>8</source>
+					<target>8</target>
 					<fork>false</fork>
 					<compilerId>jdt</compilerId>
 					<annotationProcessors>
diff --git a/tycho-its/projects/TYCHO590annotationProcessing/pom.xml b/tycho-its/projects/TYCHO590annotationProcessing/pom.xml
index 660358242e..d596409533 100644
--- a/tycho-its/projects/TYCHO590annotationProcessing/pom.xml
+++ b/tycho-its/projects/TYCHO590annotationProcessing/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>parent</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	
+
 	<modules>
 		<module>annotation-processor</module>
 		<module>annotated-project</module>
@@ -18,8 +18,8 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.10.1</version>
 				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
+					<source>8</source>
+					<target>8</target>
 					<fork>false</fork>
 					<compilerId>jdt</compilerId>
 				</configuration>
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 e024383d21..fd7ae994d9 100644
--- a/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml
+++ b/tycho-its/projects/document-bundle-plugin/test1/doclet/pom.xml
@@ -14,9 +14,9 @@
 	<properties>
 		<maven.compiler.release>17</maven.compiler.release>
 	</properties>
-	
+
 	<dependencies>
-		<!-- Adding another dependency just to verify that also transitive dependencies 
+		<!-- Adding another dependency just to verify that also transitive dependencies
 		get resolved and added to the javadoc execution class path  -->
 		<dependency>
 			<groupId>org.eclipse.tycho</groupId>
diff --git a/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml b/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml
index c5dcabd241..b9a45edc8a 100644
--- a/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml
+++ b/tycho-surefire/org.eclipse.tycho.bnd.executionlistener/pom.xml
@@ -7,7 +7,7 @@
 	</parent>
 	<artifactId>org.eclipse.tycho.bnd.executionlistener</artifactId>
 	<properties>
-		<min.jdk.version>1.8</min.jdk.version>
+		<min.jdk.version>8</min.jdk.version>
 	</properties>
 	<dependencies>
 		<dependency>