Parent POM 49 (#240)

cstamas · web-flow · commit cb41aa6d89df · 2025-12-19T18:38:14.000+01:00
And some other minor updates. Added workaround for nx3 publisher IT (that needs manual intervention to run) and Maven 4.0.0-rc-5.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build:
     name: Verify
-    uses: maveniverse/parent/.github/workflows/ci.yml@release-48.1
+    uses: maveniverse/parent/.github/workflows/ci.yml@release-49
     with:
       maven-matrix: '[ "3.9.12" ]' # IT does the mvn matrix
       maven-test: './mvnw clean verify -e -B -V -P run-its -f it'
diff --git a/core/src/main/java/eu/maveniverse/maven/njord/shared/Session.java b/core/src/main/java/eu/maveniverse/maven/njord/shared/Session.java
@@ -93,6 +93,12 @@ default Optional<ArtifactStoreComparator> selectArtifactStoreComparator(String n
      */
     ArtifactStoreTemplate selectSessionArtifactStoreTemplate(String uri);
 
+    /**
+     * Returns {@code true} if this repository should be handled by connector. Calls to
+     * {@link #getOrCreateSessionArtifactStore(RemoteRepository, String)} must be protected by this method.
+     */
+    boolean handleRemoteRepository(RemoteRepository repository);
+
     /**
      * Creates session-bound artifact store and memoize it during session.
      * {@code repoId::njord:}
diff --git a/core/src/main/java/eu/maveniverse/maven/njord/shared/impl/DefaultSession.java b/core/src/main/java/eu/maveniverse/maven/njord/shared/impl/DefaultSession.java
@@ -40,12 +40,14 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import org.apache.maven.model.Model;
+import org.apache.maven.rtinfo.RuntimeInformation;
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.repository.RemoteRepository;
 
 public class DefaultSession extends CloseableConfigSupport<SessionConfig> implements Session {
-    private final String sessionBoundStoreKey;
+    private final RuntimeInformation mavenRuntimeInformation;
+    private final String sessionBoundStoresKey;
     private final InternalArtifactStoreManager internalArtifactStoreManager;
     private final ArtifactStoreWriter artifactStoreWriter;
     private final ArtifactStoreMerger artifactStoreMerger;
@@ -56,6 +58,7 @@ public class DefaultSession extends CloseableConfigSupport<SessionConfig> implem
 
     public DefaultSession(
             SessionConfig sessionConfig,
+            RuntimeInformation mavenRuntimeInformation,
             InternalArtifactStoreManagerFactory internalArtifactStoreManagerFactory,
             ArtifactStoreWriterFactory artifactStoreWriterFactory,
             ArtifactStoreMergerFactory artifactStoreMergerFactory,
@@ -64,7 +67,8 @@ public DefaultSession(
             Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories,
             MavenModelReaderImpl mavenModelReader) {
         super(sessionConfig);
-        this.sessionBoundStoreKey = Session.class.getName() + "." + ArtifactStore.class + "." + UUID.randomUUID();
+        this.mavenRuntimeInformation = requireNonNull(mavenRuntimeInformation);
+        this.sessionBoundStoresKey = Session.class.getName() + "." + ArtifactStore.class + "." + UUID.randomUUID();
         this.internalArtifactStoreManager = internalArtifactStoreManagerFactory.create(sessionConfig);
         this.artifactStoreWriter = requireNonNull(artifactStoreWriterFactory).create(sessionConfig);
         this.artifactStoreMerger = requireNonNull(artifactStoreMergerFactory).create(sessionConfig);
@@ -181,12 +185,34 @@ public ArtifactStoreTemplate selectSessionArtifactStoreTemplate(String uri) {
         }
     }
 
+    @Override
+    public boolean handleRemoteRepository(RemoteRepository repository) {
+        requireNonNull(repository);
+        checkClosed();
+        if (mavenRuntimeInformation.isMavenVersion("[4.0.0-rc-5,4.0.0-rc-5]")) {
+            // BEGIN: workaround for Maven 4.0.0-rc-5 (only)
+            // IF: repoId is in form '[some string]-hex' (hex part is 40 char long; sha1)
+            // THEN: chop it off, and check if "some string" ID repo is already present
+            if (repository.getId().length() > 41
+                    && repository
+                            .getId()
+                            .substring(repository.getId().length() - 41)
+                            .matches("-[0-9a-f]+")) {
+                String id = repository.getId().substring(0, repository.getId().length() - 41);
+                return getSessionBoundStores().keySet().stream().noneMatch(r -> id.equals(r.getId()));
+            }
+            // END: workaround for Maven 4.0.0-rc-5 (only)
+        }
+        return true;
+    }
+
     @Override
     public ArtifactStore getOrCreateSessionArtifactStore(RemoteRepository repository, String uri) {
+        requireNonNull(repository);
         requireNonNull(uri);
         checkClosed();
-        ConcurrentMap<RemoteRepository, String> sessionBoundStore = getSessionBoundStore();
-        String storeName = sessionBoundStore.computeIfAbsent(repository, k -> {
+        ConcurrentMap<RemoteRepository, String> sessionBoundStores = getSessionBoundStores();
+        String storeName = sessionBoundStores.computeIfAbsent(repository, r -> {
             try {
                 String artifactStoreName;
                 boolean isNewArtifactStore = true;
@@ -223,7 +249,9 @@ public ArtifactStore getOrCreateSessionArtifactStore(RemoteRepository repository
                 } else {
                     throw new IllegalArgumentException("Invalid repository URI: " + uri);
                 }
-                logger.info("Created Njord artifact store {} for remote repository {}", artifactStoreName, repository);
+                if (isNewArtifactStore) {
+                    logger.info("Created Njord artifact store {} for remote repository {}", artifactStoreName, r);
+                }
                 return artifactStoreName;
             } catch (IOException e) {
                 throw new UncheckedIOException(e);
@@ -264,8 +292,8 @@ private String createUsingTemplate(String templateName) throws IOException {
     @Override
     public int publishSessionArtifactStores() throws IOException {
         checkClosed();
-        ConcurrentMap<RemoteRepository, String> sessionBoundStore = getSessionBoundStore();
-        if (sessionBoundStore.isEmpty()) {
+        ConcurrentMap<RemoteRepository, String> sessionBoundStores = getSessionBoundStores();
+        if (sessionBoundStores.isEmpty()) {
             return 0;
         }
         AtomicInteger result = new AtomicInteger(0);
@@ -275,7 +303,7 @@ public int publishSessionArtifactStores() throws IOException {
             Optional<ArtifactStorePublisher> po = selectArtifactStorePublisher(publisherName);
             if (po.isPresent()) {
                 ArtifactStorePublisher p = po.orElseThrow(J8Utils.OET);
-                for (String storeName : sessionBoundStore.values()) {
+                for (String storeName : sessionBoundStores.values()) {
                     logger.info("Publishing {} with {}", storeName, publisherName);
                     try (ArtifactStore as = internalArtifactStoreManager
                             .selectArtifactStore(storeName)
@@ -300,12 +328,12 @@ public int publishSessionArtifactStores() throws IOException {
     @Override
     public int dropSessionArtifactStores() {
         checkClosed();
-        ConcurrentMap<RemoteRepository, String> sessionBoundStore = getSessionBoundStore();
-        if (sessionBoundStore.isEmpty()) {
+        ConcurrentMap<RemoteRepository, String> sessionBoundStores = getSessionBoundStores();
+        if (sessionBoundStores.isEmpty()) {
             return 0;
         }
         AtomicInteger result = new AtomicInteger(0);
-        for (String storeName : sessionBoundStore.values()) {
+        for (String storeName : sessionBoundStores.values()) {
             try {
                 if (internalArtifactStoreManager.dropArtifactStore(storeName)) {
                     result.addAndGet(1);
@@ -326,8 +354,8 @@ protected void doClose() throws IOException {
      * Returns map of "Njord URI" to "storeName" that were created in current session.
      */
     @SuppressWarnings("unchecked")
-    private ConcurrentMap<RemoteRepository, String> getSessionBoundStore() {
+    private ConcurrentMap<RemoteRepository, String> getSessionBoundStores() {
         return (ConcurrentHashMap<RemoteRepository, String>)
-                config.session().getData().computeIfAbsent(sessionBoundStoreKey, ConcurrentHashMap::new);
+                config.session().getData().computeIfAbsent(sessionBoundStoresKey, ConcurrentHashMap::new);
     }
 }
diff --git a/core/src/main/java/eu/maveniverse/maven/njord/shared/impl/DefaultSessionFactory.java b/core/src/main/java/eu/maveniverse/maven/njord/shared/impl/DefaultSessionFactory.java
@@ -21,10 +21,12 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Singleton;
+import org.apache.maven.rtinfo.RuntimeInformation;
 
 @Singleton
 @Named
 public class DefaultSessionFactory implements SessionFactory {
+    private final RuntimeInformation mavenRuntimeInformation;
     private final InternalArtifactStoreManagerFactory internalArtifactStoreManagerFactory;
     private final ArtifactStoreWriterFactory artifactStoreWriterFactory;
     private final ArtifactStoreMergerFactory artifactStoreMergerFactory;
@@ -35,13 +37,15 @@ public class DefaultSessionFactory implements SessionFactory {
 
     @Inject
     public DefaultSessionFactory(
+            RuntimeInformation mavenRuntimeInformation,
             InternalArtifactStoreManagerFactory internalArtifactStoreManagerFactory,
             ArtifactStoreWriterFactory artifactStoreWriterFactory,
             ArtifactStoreMergerFactory artifactStoreMergerFactory,
             ArtifactPublisherRedirectorFactory artifactPublisherRedirectorFactory,
             Map<String, ArtifactStorePublisherFactory> artifactStorePublisherFactories,
             Map<String, ArtifactStoreComparatorFactory> artifactStoreComparatorFactories,
             MavenModelReaderImpl mavenModelReader) {
+        this.mavenRuntimeInformation = requireNonNull(mavenRuntimeInformation);
         this.internalArtifactStoreManagerFactory = requireNonNull(internalArtifactStoreManagerFactory);
         this.artifactStoreWriterFactory = requireNonNull(artifactStoreWriterFactory);
         this.artifactStoreMergerFactory = requireNonNull(artifactStoreMergerFactory);
@@ -55,6 +59,7 @@ public DefaultSessionFactory(
     public DefaultSession create(SessionConfig sessionConfig) {
         return new DefaultSession(
                 sessionConfig,
+                mavenRuntimeInformation,
                 internalArtifactStoreManagerFactory,
                 artifactStoreWriterFactory,
                 artifactStoreMergerFactory,
diff --git a/core/src/test/java/eu/maveniverse/maven/njord/shared/impl/publisher/PublisherTestSupport.java b/core/src/test/java/eu/maveniverse/maven/njord/shared/impl/publisher/PublisherTestSupport.java
@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import org.apache.maven.rtinfo.RuntimeInformation;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.internal.impl.checksum.DefaultChecksumAlgorithmFactorySelector;
@@ -140,6 +141,17 @@ protected Session createSession(Context context, SessionConfig config) {
         HashMap<String, ArtifactStorePublisherFactory> publishers = new HashMap<>();
         publishers.put("sonatype-cp", c -> sonatypeCp());
         SessionFactory factory = new DefaultSessionFactory(
+                new RuntimeInformation() {
+                    @Override
+                    public String getMavenVersion() {
+                        return "3.9.11";
+                    }
+
+                    @Override
+                    public boolean isMavenVersion(String s) {
+                        return getMavenVersion().equals(s);
+                    }
+                },
                 new DefaultInternalArtifactStoreManagerFactory(checksumAlgorithmFactorySelector),
                 new DefaultArtifactStoreWriterFactory(),
                 new DefaultArtifactStoreMergerFactory(context.repositorySystem(), checksumAlgorithmFactorySelector),
diff --git a/extension3/src/main/java/eu/maveniverse/maven/njord/extension3/NjordRepositoryConnectorFactory.java b/extension3/src/main/java/eu/maveniverse/maven/njord/extension3/NjordRepositoryConnectorFactory.java
@@ -57,18 +57,20 @@ public RepositoryConnector newInstance(RepositorySystemSession session, RemoteRe
             Optional<Session> nso = NjordUtils.mayGetNjordSession(session);
             if (nso.isPresent()) {
                 Session ns = nso.orElseThrow(J8Utils.OET);
-                String url = ns.artifactPublisherRedirector().getRepositoryUrl(repository);
-                if (url != null && url.startsWith(NAME + ":")) {
-                    RepositoryConnectorFactory basicRepositoryConnectorFactory = requireNonNull(
-                            repositoryConnectorFactories.get("basic").get(),
-                            "No basic repository connector factory found");
-                    ArtifactStore artifactStore = ns.getOrCreateSessionArtifactStore(repository, url.substring(6));
-                    return new NjordRepositoryConnector(
-                            artifactStore,
-                            repository,
-                            basicRepositoryConnectorFactory.newInstance(
-                                    artifactStore.storeRepositorySession(session),
-                                    artifactStore.storeRemoteRepository()));
+                if (ns.handleRemoteRepository(repository)) {
+                    String url = ns.artifactPublisherRedirector().getRepositoryUrl(repository);
+                    if (url != null && url.startsWith(NAME + ":")) {
+                        RepositoryConnectorFactory basicRepositoryConnectorFactory = requireNonNull(
+                                repositoryConnectorFactories.get("basic").get(),
+                                "No basic repository connector factory found");
+                        ArtifactStore artifactStore = ns.getOrCreateSessionArtifactStore(repository, url.substring(6));
+                        return new NjordRepositoryConnector(
+                                artifactStore,
+                                repository,
+                                basicRepositoryConnectorFactory.newInstance(
+                                        artifactStore.storeRepositorySession(session),
+                                        artifactStore.storeRemoteRepository()));
+                    }
                 }
             }
         }
diff --git a/it/extension-its/pom.xml b/it/extension-its/pom.xml
@@ -23,9 +23,6 @@
   <name>${project.groupId}:${project.artifactId}</name>
 
   <properties>
-    <maven39Version>3.9.11</maven39Version>
-    <maven4Version>4.0.0-rc-4</maven4Version>
-
     <!-- We need to skip this on Java lower than 17 (see profiles below) -->
     <mvn4-its-run.skip>true</mvn4-its-run.skip>
   </properties>
diff --git a/it/extension-its/src/it/merge-all-release/README.md b/it/extension-its/src/it/merge-all-release/README.md
@@ -1,3 +1,5 @@
 # Merge All (Release)
 
 Tests import-all and merge-all usage of Njord.
+
+Note: Maven4 must have consumer POM feature disabled as it inlines the pom (and will end up different).
diff --git a/it/extension-its/src/it/merge-all-release/invoker.properties b/it/extension-its/src/it/merge-all-release/invoker.properties
@@ -9,9 +9,9 @@
 # 0th: clean
 invoker.goals.1 = -V -e njord:${project.version}:drop-all -Dyes
 # 1st: deploy/stage
-invoker.goals.2 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l l01.log -Dattach-classifier=first
+invoker.goals.2 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l l01.log -Dattach-classifier=first -Dmaven.consumer.pom=false
 # 2nd: deploy/stage
-invoker.goals.3 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l l02.log -Dattach-classifier=second
+invoker.goals.3 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l l02.log -Dattach-classifier=second -Dmaven.consumer.pom=false
 # 3rd: export first
 invoker.goals.4 = -V -e njord:${project.version}:export -Dstore=merge-all-release-00001 -l l03.log
 # 4th: export second
diff --git a/it/extension-its/src/it/merge-release/README.md b/it/extension-its/src/it/merge-release/README.md
@@ -2,4 +2,6 @@
 
 Tests merge usage of Njord.
 
-Merge is supported only be RELEASE stores, and assumption is that build is reproducible.
+Merge is supported only be RELEASE stores, and assumption is that build is reproducible.
+
+Note: Maven4 must have consumer POM feature disabled as it inlines the pom (and will end up different).
diff --git a/it/extension-its/src/it/merge-release/invoker.properties b/it/extension-its/src/it/merge-release/invoker.properties
@@ -9,9 +9,9 @@
 # 0th: clean
 invoker.goals.1 = -V -e njord:${project.version}:drop-all -Dyes
 # 1st: deploy/stage to release
-invoker.goals.2 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l first.log
+invoker.goals.2 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l first.log -Dmaven.consumer.pom=false
 # 2nd: deploy/stage to release-sca
-invoker.goals.3 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l second.log -Dattach-classifier=second
+invoker.goals.3 = -V -e clean deploy -DaltDeploymentRepository=id::njord:release-sca -l second.log -Dattach-classifier=second -Dmaven.consumer.pom=false
 # 3rd: merge
 invoker.goals.4 = -V -e njord:${project.version}:merge -Dfrom=merge-release-00001 -Dto=merge-release-00002 -Ddrop -l third.log
 # 4th: list
diff --git a/it/pom.xml b/it/pom.xml
@@ -25,6 +25,7 @@
 
   <modules>
     <module>extension-its</module>
+    <module>publisher-sonatype-nx3-its</module>
   </modules>
 
   <properties>
@@ -33,6 +34,10 @@
 
     <maven.install.skip>true</maven.install.skip>
     <maven.deploy.skip>true</maven.deploy.skip>
+
+    <!-- Maven versions we run the ITs with -->
+    <maven39Version>3.9.12</maven39Version>
+    <maven4Version>4.0.0-rc-5</maven4Version>
   </properties>
 
   <profiles>
@@ -57,11 +62,5 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>nx3-its</id>
-      <modules>
-        <module>publisher-sonatype-nx3-its</module>
-      </modules>
-    </profile>
   </profiles>
 </project>
diff --git a/it/publisher-sonatype-nx3-its/pom.xml b/it/publisher-sonatype-nx3-its/pom.xml
@@ -23,9 +23,8 @@
   <name>${project.groupId}:${project.artifactId}</name>
 
   <properties>
-    <maven39Version>3.9.11</maven39Version>
-    <maven4Version>4.0.0-rc-3</maven4Version>
-    <groovyVersion>5.0.3</groovyVersion>
+    <!-- Must be Java 8 capable -->
+    <groovyVersion>4.0.29</groovyVersion>
 
     <!-- We need to skip this on Java lower than 17 (see profiles below) -->
     <mvn4-its-run.skip>true</mvn4-its-run.skip>
@@ -105,6 +104,11 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
+            <configuration>
+              <!-- TODO: this IT must be invoked manually (due Nx3 docker requirements) -->
+              <skipInstallation>true</skipInstallation>
+              <skipInvocation>true</skipInvocation>
+            </configuration>
             <dependencies>
               <!-- Control Groovy version for script execution -->
               <dependency>
@@ -165,7 +169,7 @@
                 </goals>
                 <phase>integration-test</phase>
                 <configuration>
-                  <skipInvocation>${mvn4-its-run.skip}</skipInvocation>
+                  <!--skipInvocation>${mvn4-its-run.skip}</skipInvocation-->
                   <mavenHome>${project.build.directory}/dependency/apache-maven-${maven4Version}</mavenHome>
                   <cloneProjectsTo>${project.build.directory}/mvn4-it</cloneProjectsTo>
                   <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
diff --git a/it/publisher-sonatype-nx3-its/src/it/scripts/DockerLib.groovy b/it/publisher-sonatype-nx3-its/src/it/scripts/DockerLib.groovy
@@ -109,6 +109,8 @@ def startNexus(File testBasedir, int maxAttempts = 60, int waitSeconds = 2) {
     ant.copy(todir: targetDb, overwrite: true) {
         fileset(dir: templateDb)
     }
+    // TODO: needs manual step
+    // sudo chown -R 200 publisher-sonatype-nx3-its/docker/dat
     println "[DOCKER] Database template copied successfully"
 
     // Start containers
diff --git a/plugin/pom.xml b/plugin/pom.xml
@@ -125,7 +125,8 @@
         <configuration>
           <goalPrefix>njord</goalPrefix>
           <requiredMavenVersion>${requireRuntimeMavenVersion.range}</requiredMavenVersion>
-          <requiredJavaVersion>${requireRuntimeJavaVersion.range}</requiredJavaVersion>
+          <!-- TODO: https://github.com/apache/maven/issues/11575 -->
+          <requiredJavaVersion>[1.8,)</requiredJavaVersion>
         </configuration>
         <executions>
           <execution>
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>eu.maveniverse.maven.parent</groupId>
     <artifactId>parent</artifactId>
-    <version>48</version>
+    <version>49</version>
   </parent>
 
   <groupId>eu.maveniverse.maven.njord</groupId>
@@ -70,7 +70,7 @@
     <requireRuntimeMavenVersion.range>[3.9,)</requireRuntimeMavenVersion.range>
 
     <!-- Dependency versions -->
-    <version.maveniverseShared>0.1.9</version.maveniverseShared>
+    <version.maveniverseShared>0.1.10</version.maveniverseShared>
     <version.maven>3.9.12</version.maven>
     <version.resolver>1.9.25</version.resolver>
     <version.mima>2.4.39</version.mima>
