Investigate Maven 3.9.0

pom.xml

@@ -67,7 +67,7 @@
 		<cipherVersion>2.0</cipherVersion>
 		<pluginToolsVersion>3.7.1</pluginToolsVersion>
 		<jgit-version>6.4.0.202211300538-r</jgit-version>
-		<maven-version>3.8.7</maven-version>
+		<maven-version>3.9.0</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 -->
 		<!-- Stick to 3.0.0-M5 because of https://github.com/eclipse-tycho/tycho/issues/879 / https://issues.apache.org/jira/projects/SUREFIRE/issues/SUREFIRE-2072 -->
 		<surefire-version>3.0.0-M8</surefire-version>

tycho-core/src/main/java/org/eclipse/tycho/core/ee/EEVersion.java

@@ -15,8 +15,6 @@
 
 import java.util.Objects;
 
-import javax.annotation.Nonnull;
-
 import org.osgi.framework.Version;
 
 public class EEVersion implements Comparable<EEVersion> {
@@ -44,12 +42,12 @@ public static EEType fromName(String profileName) {
     }
 
     private static final Version JAVA8 = Version.parseVersion("1.8");
-    @Nonnull
     private final Version version;
-    @Nonnull
     private final EEType type;
 
-    public EEVersion(@Nonnull Version version, @Nonnull EEType type) {
+    public EEVersion(Version version, EEType type) {
+        Objects.requireNonNull(version);
+        Objects.requireNonNull(type);
         this.version = version;
         this.type = type;
     }

tycho-core/src/main/java/org/eclipse/tycho/core/ee/ExecutionEnvironmentUtils.java

@@ -27,8 +27,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
-import javax.annotation.Nonnull;
-
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.toolchain.Toolchain;
 import org.apache.maven.toolchain.ToolchainManager;
@@ -72,8 +70,8 @@ private static Properties readProperties(final URL url) {
      * @throws UnknownEnvironmentException
      *             if profileName is unknown.
      */
-    public static @Nonnull StandardExecutionEnvironment getExecutionEnvironment(String profileName,
-            ToolchainManager manager, MavenSession session, Logger logger) throws UnknownEnvironmentException {
+    public static StandardExecutionEnvironment getExecutionEnvironment(String profileName, ToolchainManager manager,
+            MavenSession session, Logger logger) throws UnknownEnvironmentException {
         Map<String, StandardExecutionEnvironment> map = getExecutionEnvironmentsMap(manager, session, logger);
         StandardExecutionEnvironment ee = map.get(profileName);
         if (ee != null) {

tycho-core/src/main/java/org/eclipse/tycho/core/ee/StandardExecutionEnvironment.java

@@ -30,9 +30,6 @@
 import java.util.Properties;
 import java.util.Set;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.toolchain.Toolchain;
 import org.codehaus.plexus.logging.Logger;
@@ -89,17 +86,8 @@ public class StandardExecutionEnvironment implements Comparable<StandardExecutio
     private final Toolchain toolchain;
     private Logger logger;
 
-    /**
-     * Do no instantiate. Use factory method instead
-     * {@link ExecutionEnvironmentUtils#getExecutionEnvironment(String)}.
-     */
-    @Deprecated
-    StandardExecutionEnvironment(@Nonnull Properties profileProperties) {
-        this(profileProperties, null, null);
-    }
-
-    /* package */ StandardExecutionEnvironment(@Nonnull Properties profileProperties, @Nullable Toolchain toolchain,
-            @Nullable Logger logger) {
+    /* package */ StandardExecutionEnvironment(Properties profileProperties, Toolchain toolchain, Logger logger) {
+        Objects.requireNonNull(profileProperties);
         this.toolchain = toolchain;
         this.profileName = profileProperties.getProperty(EquinoxConfiguration.PROP_OSGI_JAVA_PROFILE_NAME);
         this.compilerSourceLevel = profileProperties.getProperty("org.eclipse.jdt.core.compiler.source");

tycho-core/src/main/java/org/eclipse/tycho/core/osgitools/DefaultClasspathEntry.java

@@ -17,8 +17,6 @@
 import java.util.List;
 import java.util.Objects;
 
-import javax.annotation.Nonnull;
-
 import org.eclipse.tycho.ArtifactKey;
 import org.eclipse.tycho.ClasspathEntry;
 import org.eclipse.tycho.ReactorProject;
@@ -34,13 +32,11 @@ public class DefaultClasspathEntry implements ClasspathEntry {
     private final Collection<AccessRule> rules;
 
     public static class DefaultAccessRule implements AccessRule {
-        private final @Nonnull String pattern;
+        private final String pattern;
         private final boolean discouraged;
 
         public DefaultAccessRule(String path, boolean discouraged) {
-            if (path == null) {
-                throw new NullPointerException();
-            }
+            Objects.requireNonNull(path);
 
             this.pattern = path;
             this.discouraged = discouraged;

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

@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2023 Christoph Läubrich and others.
+ * 
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ * 
+ * Contributors:
+ * Christoph Läubrich - initial API and implementation
+ * 
+ *******************************************************************************/
+package org.eclipse.tycho.pomless;
+
+import javax.annotation.Priority;
+
+import org.apache.maven.project.ProjectBuilder;
+import org.codehaus.plexus.component.annotations.Component;
+import org.sonatype.maven.polyglot.TeslaProjectBuilder;
+
+@Component(role = ProjectBuilder.class)
+@Priority(10)
+//Workaround for https://github.com/takari/polyglot-maven/pull/256
+public class TychoTeslaProjectBuilder extends TeslaProjectBuilder {
+
+}