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:59 UTC
[maven-plugin-tools] branch MPLUGIN-384 updated (34a2b9a -> 03a6062)
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.
discard 34a2b9a [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
new 03a6062 [MPLUGIN-384] restore compatibility with Maven 3 ecosystem
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (34a2b9a)
\
N -- N -- N refs/heads/MPLUGIN-384 (03a6062)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
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.
Summary of changes:
.../maven/artifact/repository/metadata/GroupRepositoryMetadata.java | 3 ---
1 file changed, 3 deletions(-)
[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 03a6062dcba0741f4ac48d35588b858fcb18d52c
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;