Update to Maven 4

pom.xml

@@ -63,7 +63,7 @@
 		<plexusCompilerVersion>2.15.0</plexusCompilerVersion>
 		<pluginToolsVersion>3.15.0</pluginToolsVersion>
 		<jgit-version>7.0.0.202409031743-r</jgit-version>
-		<maven-version>3.9.9</maven-version>
+		<maven-version>4.0.0-beta-4</maven-version>
 		<sisu-version>0.9.0.M3</sisu-version>
 		<minimal-maven-version>3.9.6</minimal-maven-version>
 		<!-- When updating surefire version, double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in various bnd.bnd files -->

tycho-extras/tycho-pomless/src/main/java/org/eclipse/tycho/pomless/AbstractTychoMapping.java

@@ -43,6 +43,7 @@
 import org.apache.maven.model.PluginExecution;
 import org.apache.maven.model.building.FileModelSource;
 import org.apache.maven.model.building.ModelProcessor;
+import org.apache.maven.model.io.ModelParseException;
 import org.apache.maven.model.io.ModelReader;
 import org.apache.maven.model.io.ModelWriter;
 import org.codehaus.plexus.PlexusContainer;
@@ -150,6 +151,11 @@ public Model read(Reader input, Map<String, ?> options) throws IOException {
         return read(input, file, options);
     }
 
+    @Override
+    public Model read(Path input, Map<String, ?> options) throws IOException, ModelParseException {
+        return read(input.toFile(), options);
+    }
+
     private Model read(Reader artifactReader, Path artifactFile, Map<String, ?> options) throws IOException {
         Model model = new Model();
         model.setModelVersion("4.0.0");

tycho-spi/pom.xml

@@ -30,6 +30,13 @@
 			<artifactId>tycho-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
+		<!-- legacy replace -->
+		<dependency>
+		    <groupId>org.codehaus.plexus</groupId>
+		    <artifactId>plexus-component-annotations</artifactId>
+		    <version>2.2.0</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<resources>

tycho-testing-harness/pom.xml

@@ -10,7 +10,8 @@
  -    Sonatype Inc. - initial API and implementation
  -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -68,6 +69,11 @@
 			<artifactId>sisu-osgi-api</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.inject</groupId>
+			<artifactId>guice</artifactId>
+			<version>7.0.0</version>
+		</dependency>
 	</dependencies>
 
 	<build>