You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/09/11 19:57:27 UTC

(maven-doap-plugin) branch master updated: Move writeReleases/resolveVersioningMetadata/isArtifactInRepository to aether-native repos

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doap-plugin.git


The following commit(s) were added to refs/heads/master by this push:
     new 9db0ee1  Move writeReleases/resolveVersioningMetadata/isArtifactInRepository to aether-native repos
9db0ee1 is described below

commit 9db0ee19a0e03512ecf01a51fc0b130b3877f7c4
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri Sep 11 21:36:17 2026 +0200

    Move writeReleases/resolveVersioningMetadata/isArtifactInRepository to aether-native repos
    
    remoteRepositories now injects ${project.remoteProjectRepositories}
    (List<RemoteRepository>, aether-native, mirror/proxy/auth already
    applied by Maven at project-build time) instead of the deprecated
    ${project.remoteArtifactRepositories}. The one remaining consumer of
    the legacy list -- ProjectBuildingRequest.setRemoteRepositories() in
    getMavenProject(), which has no aether-native overload in maven-core
    3.9.16 (confirmed by reading DefaultProjectBuilder.InternalConfig,
    which builds its resolution session and repository list directly from
    request.getLocalRepository()/getRemoteRepositories()) -- gets its own
    narrowly-scoped projectBuildingRepositories field instead.
    
    writeReleases()'s file-release loop still builds a legacy DefaultArtifact
    (needed for ArtifactHandlerManager's type-to-extension mapping), then
    converts it once via RepositoryUtils.toArtifact() for both the path
    computation (RepositoryLayoutProvider, replacing
    ArtifactRepository.pathOf()) and the existence check.
    isArtifactInRepository() drops its hand-rolled
    "groupId:artifactId:type:version" coordinate string and manual
    RemoteRepository reconstruction now that both artifact and repository
    already arrive in their proper aether form.
    
    That hand-rolled coordinate string was carrying a real bug: aether's
    colon-coordinate parser treats the third segment as the file
    extension, not the Maven packaging, so for any packaging where the two
    differ (e.g. this plugin's own "maven-plugin", whose real extension is
    .jar) the existence check silently failed and <file-release> was
    dropped for every release, on master, unconditionally. Verified by
    installing master's and this branch's plugin jar under the same GAV in
    turn and running doap:generate against this project's own pom (5 real
    releases in central): master emits zero <file-release> elements for
    any of them; this branch emits all five, and all five URLs return HTTP
    200 from repo.maven.apache.org. Not a claimed no-op change: it changes
    output, for the better, and that's the point of using the real
    extension instead of the raw packaging string.
    
    Eliminates 4 of the remaining 7 ArtifactRepository warnings; the last
    3 (import, localRepository, projectBuildingRepositories) are pinned by
    ProjectBuildingRequest as above. Also verified with mvn compile/test
    (13/13) and mvn spotless:check.
---
 .../org/apache/maven/plugin/doap/DoapMojo.java     | 75 ++++++++++++----------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
index 4428e64..db386c5 100644
--- a/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
+++ b/src/main/java/org/apache/maven/plugin/doap/DoapMojo.java
@@ -94,7 +94,10 @@ import org.eclipse.aether.resolution.MetadataRequest;
 import org.eclipse.aether.resolution.MetadataResult;
 import org.eclipse.aether.spi.connector.ArtifactDownload;
 import org.eclipse.aether.spi.connector.RepositoryConnector;
+import org.eclipse.aether.spi.connector.layout.RepositoryLayout;
+import org.eclipse.aether.spi.connector.layout.RepositoryLayoutProvider;
 import org.eclipse.aether.transfer.NoRepositoryConnectorException;
+import org.eclipse.aether.transfer.NoRepositoryLayoutException;
 
 /**
  * <p>
@@ -201,16 +204,29 @@ public class DoapMojo extends AbstractMojo {
     private ArtifactRepository localRepository;
 
     /**
-     * The remote repositories where the artifacts are located.
+     * The remote repositories where the artifacts are located, in the legacy form required by
+     * {@link org.apache.maven.project.ProjectBuildingRequest#setRemoteRepositories(List)}: that API has no
+     * aether-native overload, so this one stays deprecated-typed.
      *
      * @since 1.0
      */
     @Parameter(defaultValue = "${project.remoteArtifactRepositories}", required = true, readonly = true)
-    private List<ArtifactRepository> remoteRepositories;
+    private List<ArtifactRepository> projectBuildingRepositories;
+
+    /**
+     * The remote repositories where the artifacts are located.
+     *
+     * @since 1.0
+     */
+    @Parameter(defaultValue = "${project.remoteProjectRepositories}", required = true, readonly = true)
+    private List<RemoteRepository> remoteRepositories;
 
     @Inject
     private RepositoryConnectorProvider connectorProvider;
 
+    @Inject
+    private RepositoryLayoutProvider repositoryLayoutProvider;
+
     /**
      * Project builder.
      *
@@ -472,7 +488,7 @@ public class DoapMojo extends AbstractMojo {
                 ProjectBuildingRequest request = new DefaultProjectBuildingRequest();
                 request.setRepositorySession(repositorySystemSession);
                 request.setLocalRepository(localRepository);
-                request.setRemoteRepositories(remoteRepositories);
+                request.setRemoteRepositories(projectBuildingRepositories);
                 request.setProcessPlugins(false);
                 request.setValidationLevel(ModelBuildingRequest.VALIDATION_LEVEL_MINIMAL);
 
@@ -482,10 +498,7 @@ public class DoapMojo extends AbstractMojo {
                 art.setFile(repositorySystem
                         .resolveArtifact(
                                 repositorySystemSession,
-                                new ArtifactRequest(
-                                        RepositoryUtils.toArtifact(art),
-                                        RepositoryUtils.toRepos(remoteRepositories),
-                                        null))
+                                new ArtifactRequest(RepositoryUtils.toArtifact(art), remoteRepositories, null))
                         .getArtifact()
                         .getFile());
 
@@ -1311,11 +1324,11 @@ public class DoapMojo extends AbstractMojo {
     private void writeReleases(XMLWriter writer, MavenProject project) throws MojoExecutionException {
         Metadata metadata = null;
 
-        for (ArtifactRepository repo : remoteRepositories) {
-            if (repo.getSnapshots().isEnabled()) {
+        for (RemoteRepository repo : remoteRepositories) {
+            if (repo.getPolicy(true).isEnabled()) {
                 continue;
             }
-            if (repo.getReleases().isEnabled()) {
+            if (repo.getPolicy(false).isEnabled()) {
                 metadata = resolveVersioningMetadata(project, repo);
                 break;
             }
@@ -1350,7 +1363,7 @@ public class DoapMojo extends AbstractMojo {
             DoapUtil.writeElement(writer, doapOptions.getXmlnsPrefix(), "revision", version);
 
             // list all file release from all remote repos
-            for (ArtifactRepository repo : remoteRepositories) {
+            for (RemoteRepository repo : remoteRepositories) {
                 Artifact artifactRelease = new DefaultArtifact(
                         project.getGroupId(),
                         project.getArtifactId(),
@@ -1359,10 +1372,20 @@ public class DoapMojo extends AbstractMojo {
                         project.getPackaging(),
                         null,
                         artifactHandlerManager.getArtifactHandler(project.getPackaging()));
+                org.eclipse.aether.artifact.Artifact aetherArtifactRelease =
+                        RepositoryUtils.toArtifact(artifactRelease);
 
-                String fileRelease = repo.getUrl() + "/" + repo.pathOf(artifactRelease);
+                String fileRelease;
+                try {
+                    RepositoryLayout layout =
+                            repositoryLayoutProvider.newRepositoryLayout(repositorySystemSession, repo);
+                    fileRelease = repo.getUrl() + "/" + layout.getLocation(aetherArtifactRelease, false);
+                } catch (NoRepositoryLayoutException e) {
+                    getLog().debug("No repository layout for " + repo + ", skipped.", e);
+                    continue;
+                }
 
-                if (!isArtifactInRepository(artifactRelease, repo)) {
+                if (!isArtifactInRepository(aetherArtifactRelease, repo)) {
                     getLog().debug(artifactRelease + " is not in the repository " + repo);
                     continue;
                 }
@@ -1408,9 +1431,9 @@ public class DoapMojo extends AbstractMojo {
      * @return the parsed maven-metadata.xml, or null if the repository does not carry one
      * @throws MojoExecutionException if the metadata could not be retrieved or parsed
      */
-    private Metadata resolveVersioningMetadata(MavenProject project, ArtifactRepository repository)
+    private Metadata resolveVersioningMetadata(MavenProject project, RemoteRepository repository)
             throws MojoExecutionException {
-        RemoteRepository remoteRepository = new RemoteRepository.Builder(RepositoryUtils.toRepo(repository))
+        RemoteRepository remoteRepository = new RemoteRepository.Builder(repository)
                 .setPolicy(new RepositoryPolicy(
                         true, RepositoryPolicy.UPDATE_POLICY_ALWAYS, RepositoryPolicy.CHECKSUM_POLICY_WARN))
                 .build();
@@ -1450,26 +1473,8 @@ public class DoapMojo extends AbstractMojo {
         }
     }
 
-    private boolean isArtifactInRepository(Artifact artifact, ArtifactRepository repository) {
-        // Convert Legacy Artifact to Aether Artifact
-        String artifactCoordinates = String.format(
-                "%s:%s:%s:%s",
-                artifact.getGroupId(), artifact.getArtifactId(), artifact.getType(), artifact.getVersion());
-
-        org.eclipse.aether.artifact.Artifact aetherArtifact =
-                new org.eclipse.aether.artifact.DefaultArtifact(artifactCoordinates);
-
-        // Convert Legacy ArtifactRepository to Aether RemoteRepository
-        RemoteRepository remoteRepository = new RemoteRepository.Builder(
-                        repository.getId(), repository.getLayout().getId(), repository.getUrl())
-                .build();
-
-        // set up authentication
-        remoteRepository = repositorySystem
-                .newResolutionRepositories(repositorySystemSession, Collections.singletonList(remoteRepository))
-                .get(0);
-
-        return artifactExistsRemotely(aetherArtifact, remoteRepository);
+    private boolean isArtifactInRepository(org.eclipse.aether.artifact.Artifact artifact, RemoteRepository repository) {
+        return artifactExistsRemotely(artifact, repository);
     }
 
     /**