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 18:40:32 UTC
[maven-plugin-tools] branch MPLUGIN-384 created (now 34a2b9a)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch MPLUGIN-384
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git.
at 34a2b9a [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
This branch includes the following new commits:
new 34a2b9a [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-plugin-tools] 01/01: [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
Posted by hb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch MPLUGIN-384
in repository https://gitbox.apache.org/repos/asf/maven-plugin-tools.git
commit 34a2b9a5f6ecd8492ea35353f2a1d6a0dee9402b
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 | 4 +++-
.../maven/plugin/plugin/metadata/AddPluginArtifactMetadataMojo.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
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 92%
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..5b7e0bc 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
@@ -29,6 +29,8 @@ 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;