You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2022/01/09 22:06:14 UTC
[maven-plugin-tools] branch master updated: [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
The following commit(s) were added to refs/heads/master by this push:
new c6d0808 [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
c6d0808 is described below
commit c6d0808b92423b969f8d2aac500b7263399d0373
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun Jan 9 19:40:26 2022 +0100
[MPLUGIN-384] restore compatibility with Maven 3 ecosystem
---
.gitignore | 1 +
.../repository}/metadata/GroupRepositoryMetadata.java | 7 +++----
.../plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java | 1 +
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9a1c7ca..992bcd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ out/
.DS_Store
.java-version
+.factorypath
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/GroupRepositoryMetadata.java b/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
similarity index 91%
rename from maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/GroupRepositoryMetadata.java
rename to maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
index 67ea96d..b55bcb3 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/GroupRepositoryMetadata.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/artifact/repository/metadata/GroupRepositoryMetadata.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.plugin.metadata;
+package org.apache.maven.artifact.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,12 +23,11 @@ import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.metadata.AbstractRepositoryMetadata;
-import org.apache.maven.artifact.repository.metadata.Metadata;
-import org.apache.maven.artifact.repository.metadata.Plugin;
/**
* Metadata for the group directory of the repository.
+ * Class copied from maven-compat for to remove dependency but keep compatibility with Maven 3 (and Nexus Staging
+ * Plugin, see <a href="https://issues.apache.org/jira/browse/MPLUGIN-384">MPLUGIN-384</a>)
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
index 630c872..0711980 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java
@@ -21,6 +21,7 @@ package org.apache.maven.plugin.plugin.metadata;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
+import org.apache.maven.artifact.repository.metadata.GroupRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Versioning;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;