You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2018/12/01 08:47:05 UTC
[maven-help-plugin] branch MPH-156 updated (427c126 -> cdf80d2)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MPH-156
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git.
discard 427c126 [MPH-156] - Upgrade maven-artifact-transfer to 0.10.0
new cdf80d2 [MPH-156] - Upgrade maven-artifact-transfer to 0.10.0
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 (427c126)
\
N -- N -- N refs/heads/MPH-156 (cdf80d2)
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:
src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java | 6 +++---
src/main/java/org/apache/maven/plugins/help/DescribeMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
[maven-help-plugin] 01/01: [MPH-156] - Upgrade
maven-artifact-transfer to 0.10.0
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MPH-156
in repository https://gitbox.apache.org/repos/asf/maven-help-plugin.git
commit cdf80d28daee1362f1f5e3891833698a65b27919
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sat Dec 1 09:35:14 2018 +0100
[MPH-156] - Upgrade maven-artifact-transfer to 0.10.0
---
pom.xml | 2 +-
src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java | 6 +++---
src/main/java/org/apache/maven/plugins/help/DescribeMojo.java | 2 +-
src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index b36e1c0..f695a9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.9.1</version>
+ <version>0.10.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
diff --git a/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java b/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
index 5e6c257..4349428 100644
--- a/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/AbstractHelpMojo.java
@@ -36,9 +36,9 @@ import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.DefaultArtifactCoordinate;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolver;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.DefaultArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolver;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.WriterFactory;
diff --git a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
index 7a4e125..1645e6e 100644
--- a/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/DescribeMojo.java
@@ -56,7 +56,7 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.reporting.MavenReport;
import org.apache.maven.reporting.exec.MavenPluginManagerHelper;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
import org.apache.maven.tools.plugin.generator.GeneratorUtils;
import org.apache.maven.tools.plugin.util.PluginUtils;
import org.codehaus.plexus.util.StringUtils;
diff --git a/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java b/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
index 9678091..6df5570 100644
--- a/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
+++ b/src/main/java/org/apache/maven/plugins/help/EvaluateMojo.java
@@ -51,8 +51,8 @@ import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
-import org.apache.maven.shared.artifact.ArtifactCoordinate;
-import org.apache.maven.shared.artifact.resolve.ArtifactResolverException;
+import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
+import org.apache.maven.shared.transfer.artifact.resolve.ArtifactResolverException;
import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluationException;
import org.codehaus.plexus.components.interactivity.InputHandler;
import org.codehaus.plexus.util.IOUtil;