From 443b9cfad5c50ea1d42957e5a2b1cb956d459a1a Mon Sep 17 00:00:00 2001
From: "jose.pereda" <jose.pereda@gluonhq.com>
Date: Mon, 14 Oct 2024 20:42:16 +0200
Subject: [PATCH 1/5] Fix MavenArtifactResolver issues with maven 3.9+

---
 pom.xml                                       | 66 +++++---------
 src/main/java/com/gluonhq/NativeBaseMojo.java | 31 +++++--
 .../gluonhq/utils/MavenArtifactResolver.java  | 90 +++----------------
 3 files changed, 54 insertions(+), 133 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2ba30b5..72fdedd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <!--
- ~ Copyright (c) 2019, 2023, Gluon
+ ~ Copyright (c) 2019, 2024, Gluon
  ~ All rights reserved.
  ~
  ~ Redistribution and use in source and binary forms, with or without
@@ -42,12 +42,11 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.resource>21</maven.compiler.resource>
     <source.plugin.version>3.3.0</source.plugin.version>
     <javadoc.plugin.version>3.5.0</javadoc.plugin.version>
     <gpg.plugin.version>3.1.0</gpg.plugin.version>
-    <maven.resolver.version>1.7.3</maven.resolver.version>
+    <maven.plugin.version>3.9.9</maven.plugin.version>
     <substrate.version>0.0.65-SNAPSHOT</substrate.version>
   </properties>
 
@@ -60,57 +59,30 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.8.8</version>
+      <version>${maven.plugin.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven.plugin-tools</groupId>
-      <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.9.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-java</artifactId>
-      <version>0.9.11</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-exec</artifactId>
-      <version>1.3</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.8.8</version>
+      <version>${maven.plugin.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-invoker</artifactId>
-      <version>3.2.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-aether-provider</artifactId>
-      <version>3.3.9</version>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-annotations</artifactId>
+      <version>3.15.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-http</artifactId>
-      <version>${maven.resolver.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-transport-file</artifactId>
-      <version>${maven.resolver.version}</version>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-invoker</artifactId>
+      <version>3.3.0</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.resolver</groupId>
-      <artifactId>maven-resolver-connector-basic</artifactId>
-      <version>${maven.resolver.version}</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-exec</artifactId>
+      <version>1.4.0</version>
     </dependency>
   </dependencies>
 
@@ -134,12 +106,16 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.0</version>
+        <configuration>
+          <source>21</source>
+          <target>21</target>
+        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.15.0</version>
       </plugin>
       <plugin>
         <groupId>org.sonatype.plugins</groupId>
@@ -155,7 +131,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <id>enforce-no-snapshots</id>
diff --git a/src/main/java/com/gluonhq/NativeBaseMojo.java b/src/main/java/com/gluonhq/NativeBaseMojo.java
index 6506e92..72e19c3 100644
--- a/src/main/java/com/gluonhq/NativeBaseMojo.java
+++ b/src/main/java/com/gluonhq/NativeBaseMojo.java
@@ -51,8 +51,11 @@
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.rtinfo.RuntimeInformation;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.graph.DependencyFilter;
+import org.eclipse.aether.repository.RemoteRepository;
 
 import java.io.File;
 import java.io.IOException;
@@ -74,14 +77,31 @@ public abstract class NativeBaseMojo extends AbstractMojo {
 
     private static final List<String> ALLOWED_DEPENDENCY_TYPES = Collections.singletonList("jar");
 
-    // TODO: Remove this restriction when MavenArtifactResolver works with Maven 3.9.0+
-    private static final Version MAX_SUPPORTED_MAVEN_VERSION = new Version(3, 8, 8);
+    private static final Version MAX_SUPPORTED_MAVEN_VERSION = new Version(3, 9, 9);
 
     Path outputDir;
 
     @Parameter(defaultValue = "${project}", readonly = true)
     MavenProject project;
 
+    /**
+     * The entry point to Maven Artifact Resolver
+     */
+    @Component
+    private RepositorySystem repoSystem;
+
+    /**
+     * The current repository/network configuration of Maven.
+     */
+    @Parameter(defaultValue = "${repositorySystemSession}", readonly = true)
+    private RepositorySystemSession repoSession;
+
+    /**
+     * The project's remote repositories to use for the resolution.
+     */
+    @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true)
+    private List<RemoteRepository> remoteRepos;
+
     @Parameter(defaultValue = "${session}", readonly = true)
     MavenSession session;
 
@@ -242,12 +262,7 @@ private String getProjectClasspath() {
     }
 
     private List<File> getClasspathElements(MavenProject project) {
-        List<Repository> repositories = project.getRepositories();
-        Repository gluonRepository = new Repository();
-        gluonRepository.setId("Gluon");
-        gluonRepository.setUrl("https://nexus.gluonhq.com/nexus/content/repositories/releases");
-        repositories.add(gluonRepository);
-        MavenArtifactResolver.initRepositories(repositories);
+        MavenArtifactResolver.initRepositories(repoSystem, repoSession, remoteRepos);
 
         List<Artifact> attachDependencies = getAttachDependencies();
         List<File> list = Stream.concat(project.getArtifacts().stream(), attachDependencies.stream())
diff --git a/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java b/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java
index edefdde..1149f2b 100644
--- a/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java
+++ b/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Gluon
+ * Copyright (c) 2019, 2024, Gluon
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,46 +31,29 @@
 package com.gluonhq.utils;
 
 import org.apache.maven.artifact.handler.DefaultArtifactHandler;
-import org.apache.maven.model.Repository;
-import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
-import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.eclipse.aether.collection.CollectRequest;
-import org.eclipse.aether.connector.basic.BasicRepositoryConnectorFactory;
 import org.eclipse.aether.graph.Dependency;
 import org.eclipse.aether.graph.DependencyFilter;
-import org.eclipse.aether.impl.DefaultServiceLocator;
-import org.eclipse.aether.repository.LocalRepository;
 import org.eclipse.aether.repository.RemoteRepository;
-import org.eclipse.aether.repository.RepositoryPolicy;
 import org.eclipse.aether.resolution.ArtifactRequest;
 import org.eclipse.aether.resolution.ArtifactResolutionException;
 import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.aether.resolution.DependencyRequest;
 import org.eclipse.aether.resolution.DependencyResolutionException;
-import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
-import org.eclipse.aether.spi.connector.transport.TransporterFactory;
-import org.eclipse.aether.transport.file.FileTransporterFactory;
-import org.eclipse.aether.transport.http.HttpTransporterFactory;
 import org.eclipse.aether.util.artifact.JavaScopes;
 import org.eclipse.aether.util.filter.DependencyFilterUtils;
 
 import java.util.Arrays;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
-import static org.eclipse.aether.repository.RepositoryPolicy.CHECKSUM_POLICY_WARN;
-import static org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_DAILY;
-import static org.eclipse.aether.repository.RepositoryPolicy.UPDATE_POLICY_NEVER;
-
 public class MavenArtifactResolver {
 
     private static final String DEFAULT_LOCAL_REPO = org.apache.maven.repository.RepositorySystem.
@@ -87,7 +70,7 @@ public class MavenArtifactResolver {
      *
      * If the instance hasn't been created yet, it will throw an
      * {@code IllegalStateException}. To prevent this,
-     * {@link #initRepositories(List)} has to be called first.
+     * {@link #initRepositories(RepositorySystem, RepositorySystemSession, List)} has to be called first.
      *
      * @return an instance of MavenArtifactResolver
      */
@@ -98,77 +81,24 @@ public static MavenArtifactResolver getInstance() {
         return instance;
     }
 
-    private MavenArtifactResolver(List<Repository> repositories) {
-        repositorySystem = createRepositorySystem();
-        systemSession = createRepositorySystemSession(repositorySystem, DEFAULT_LOCAL_REPO);
-        remoteRepositories = new LinkedList<>();
-        repositories.forEach(r -> {
-            org.apache.maven.model.RepositoryPolicy releases = r.getReleases();
-            RepositoryPolicy releasesRepositoryPolicy = null;
-            if (releases != null) {
-                releasesRepositoryPolicy = new RepositoryPolicy(releases.isEnabled(),
-                        releases.getUpdatePolicy() == null ? UPDATE_POLICY_NEVER : releases.getUpdatePolicy(),
-                        releases.getChecksumPolicy());
-            }
-            RepositoryPolicy snapshotsRepositoryPolicy = null;
-            org.apache.maven.model.RepositoryPolicy snapshots = r.getSnapshots();
-            if (snapshots != null) {
-                snapshotsRepositoryPolicy = new RepositoryPolicy(snapshots.isEnabled(),
-                        snapshots.getUpdatePolicy() == null ? UPDATE_POLICY_NEVER : snapshots.getUpdatePolicy(),
-                        snapshots.getChecksumPolicy());
-            }
-            if (releasesRepositoryPolicy == null && snapshotsRepositoryPolicy == null) {
-                if (r.getUrl().toLowerCase(Locale.ROOT).contains("/release")) {
-                    releasesRepositoryPolicy = new RepositoryPolicy(true, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN);
-                    snapshotsRepositoryPolicy = new RepositoryPolicy(false, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN);
-                } else if (r.getUrl().toLowerCase(Locale.ROOT).contains("/snapshot")) {
-                    releasesRepositoryPolicy = new RepositoryPolicy(false, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN);
-                    snapshotsRepositoryPolicy = new RepositoryPolicy(true, UPDATE_POLICY_DAILY, CHECKSUM_POLICY_WARN);
-                }
-            }
-
-            RemoteRepository repository = new RemoteRepository
-                .Builder(r.getId(), "default", r.getUrl())
-                    .setReleasePolicy(releasesRepositoryPolicy)
-                    .setSnapshotPolicy(snapshotsRepositoryPolicy)
-                    .build();
-            remoteRepositories.add(repository);
-        });
+    private MavenArtifactResolver(RepositorySystem repositorySystem, RepositorySystemSession systemSession, List<RemoteRepository> repositories) {
+        this.repositorySystem = repositorySystem;
+        this.systemSession = systemSession;
+        this.remoteRepositories = repositories;
     }
 
     /**
      * Creates and initializes a new instance with a list of remote
      * repositories, only if such instance doesn't already exist
      *
-     * @param repositories a list of remote repositories
+     * @param repositorySystem The entry point to Maven Artifact Resolver
+     * @param systemSession The current repository/network configuration of Maven
      */
-    public static void initRepositories(List<Repository> repositories) {
+    public static void initRepositories(RepositorySystem repositorySystem, RepositorySystemSession systemSession, List<RemoteRepository> repositories) {
         if (instance != null) {
             return;
         }
-        instance = new MavenArtifactResolver(repositories);
-    }
-
-    // TODO: Find an alternative, as this only works up until Maven 3.8.7.
-    private RepositorySystem createRepositorySystem() {
-        DefaultServiceLocator serviceLocator = MavenRepositorySystemUtils.newServiceLocator();
-        serviceLocator.addService(RepositoryConnectorFactory.class, BasicRepositoryConnectorFactory.class);
-        serviceLocator.addService(TransporterFactory.class, FileTransporterFactory.class);
-        serviceLocator.addService(TransporterFactory.class, HttpTransporterFactory.class);
-        serviceLocator.setErrorHandler(new DefaultServiceLocator.ErrorHandler() {
-            @Override
-            public void serviceCreationFailed(Class<?> type, Class<?> impl, Throwable exception) {
-                throw new RuntimeException(exception);
-            }
-        });
-        return serviceLocator.getService(RepositorySystem.class);
-    }
-
-    private DefaultRepositorySystemSession createRepositorySystemSession(RepositorySystem system, String localRepoPath) {
-        DefaultRepositorySystemSession systemSession = MavenRepositorySystemUtils.newSession();
-        LocalRepository localRepo = new LocalRepository(localRepoPath);
-        systemSession.setLocalRepositoryManager(system.newLocalRepositoryManager(systemSession, localRepo));
-        return systemSession;
+        instance = new MavenArtifactResolver(repositorySystem, systemSession, repositories);
     }
 
     /**

From 45a3819c77c9fb0899e6f13a5c1a827c1afe168b Mon Sep 17 00:00:00 2001
From: "jose.pereda" <jose.pereda@gluonhq.com>
Date: Mon, 14 Oct 2024 20:56:01 +0200
Subject: [PATCH 2/5] update workflows

---
 .github/workflows/build.yml   |  9 +++++----
 .github/workflows/release.yml | 11 ++++++-----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7130fb3..56b078b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,12 +12,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
-      - name: Setup Java 11 and Apache Maven
-        uses: actions/setup-java@v1
+      - name: Setup Java 21 and Apache Maven
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 21
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c4e4714..0858a0b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,15 +9,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
           persist-credentials: false
 
-      - name: Setup Java 11 and Apache Maven
-        uses: actions/setup-java@v1
+      - name: Setup Java 21 and Apache Maven
+        uses: actions/setup-java@v4
         with:
-          java-version: 11
+          distribution: 'temurin'
+          java-version: 21
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_CENTRAL_TOKEN
@@ -82,7 +83,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install xmlstarlet
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 5
           persist-credentials: false

From a8bd2360985fb1fb5eb41ff0dc975df61ff55a31 Mon Sep 17 00:00:00 2001
From: "jose.pereda" <jose.pereda@gluonhq.com>
Date: Tue, 15 Oct 2024 12:19:45 +0200
Subject: [PATCH 3/5] fix javadoc

---
 src/main/java/com/gluonhq/utils/MavenArtifactResolver.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java b/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java
index 1149f2b..458d401 100644
--- a/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java
+++ b/src/main/java/com/gluonhq/utils/MavenArtifactResolver.java
@@ -93,6 +93,7 @@ private MavenArtifactResolver(RepositorySystem repositorySystem, RepositorySyste
      *
      * @param repositorySystem The entry point to Maven Artifact Resolver
      * @param systemSession The current repository/network configuration of Maven
+     * @param repositories The current list of remote repositories
      */
     public static void initRepositories(RepositorySystem repositorySystem, RepositorySystemSession systemSession, List<RemoteRepository> repositories) {
         if (instance != null) {

From b3311f54b7176b77d690018205fc85709dc012ec Mon Sep 17 00:00:00 2001
From: "jose.pereda" <jose.pereda@gluonhq.com>
Date: Tue, 15 Oct 2024 12:20:06 +0200
Subject: [PATCH 4/5] add dependency for maven lower than 3.9.0

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index 72fdedd..b3df983 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,6 +74,11 @@
       <version>3.15.0</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-util</artifactId>
+      <version>2.0.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>

From 5d5e760d14cec6df52d0aa946250bfae8c9c1e14 Mon Sep 17 00:00:00 2001
From: "jose.pereda" <jose.pereda@gluonhq.com>
Date: Tue, 15 Oct 2024 12:26:33 +0200
Subject: [PATCH 5/5] Remove unneeded maven version check

---
 src/main/java/com/gluonhq/NativeBaseMojo.java | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/main/java/com/gluonhq/NativeBaseMojo.java b/src/main/java/com/gluonhq/NativeBaseMojo.java
index 72e19c3..3d1b62e 100644
--- a/src/main/java/com/gluonhq/NativeBaseMojo.java
+++ b/src/main/java/com/gluonhq/NativeBaseMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2023, Gluon
+ * Copyright (c) 2019, 2024, Gluon
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,14 +36,12 @@
 import com.gluonhq.substrate.SubstrateDispatcher;
 import com.gluonhq.substrate.model.Triplet;
 import com.gluonhq.substrate.target.WebTargetConfiguration;
-import com.gluonhq.substrate.util.Version;
 import com.gluonhq.utils.MavenArtifactResolver;
 import org.apache.commons.exec.ProcessDestroyer;
 import org.apache.commons.exec.ShutdownHookProcessDestroyer;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.model.Dependency;
-import org.apache.maven.model.Repository;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -77,8 +75,6 @@ public abstract class NativeBaseMojo extends AbstractMojo {
 
     private static final List<String> ALLOWED_DEPENDENCY_TYPES = Collections.singletonList("jar");
 
-    private static final Version MAX_SUPPORTED_MAVEN_VERSION = new Version(3, 9, 9);
-
     Path outputDir;
 
     @Parameter(defaultValue = "${project}", readonly = true)
@@ -177,12 +173,6 @@ public abstract class NativeBaseMojo extends AbstractMojo {
     private ProcessDestroyer processDestroyer;
 
     public SubstrateDispatcher createSubstrateDispatcher() throws IOException, MojoExecutionException {
-        String mavenVersion = runtimeInformation.getMavenVersion();
-        Version version = new Version(mavenVersion);
-        if (version.compareTo(MAX_SUPPORTED_MAVEN_VERSION) > 0) {
-            throw new MojoExecutionException("Maven version " + mavenVersion + " is not currently supported by the GluonFX Maven Plugin.\n" +
-                    "Please downgrade your Maven version to " + MAX_SUPPORTED_MAVEN_VERSION + " and then try again.\n");
-        }
         if (getGraalvmHome().isEmpty()) {
             throw new MojoExecutionException("GraalVM installation directory not found." +
                     " Either set GRAALVM_HOME as an environment variable or" +