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 2019/05/05 14:42:32 UTC
[maven-deploy-plugin] branch master updated (8f5aae8 -> 157b624)
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git.
from 8f5aae8 Removed Subversion lagacy
new 0331156 [MDEPLOY-207] removed forgotten layout
new 157b624 improved documentation
The 2 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:
.../apache/maven/plugins/deploy/DeployMojo.java | 24 +++++++++++-----------
src/site/apt/examples/deploy-network-issues.apt | 18 ++++++++++------
2 files changed, 24 insertions(+), 18 deletions(-)
[maven-deploy-plugin] 01/02: [MDEPLOY-207] removed forgotten layout
Posted by hb...@apache.org.
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-deploy-plugin.git
commit 0331156b6e59ddc3d383073f194d6e4339e6c36d
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun May 5 16:30:48 2019 +0200
[MDEPLOY-207] removed forgotten layout
---
src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
index 0f830e6..2b8652d 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -263,7 +263,7 @@ public class DeployMojo
if ( repo == null )
{
String msg = "Deployment failed: repository element was not specified in the POM inside"
- + " distributionManagement element or in -DaltDeploymentRepository=id::layout::url parameter";
+ + " distributionManagement element or in -DaltDeploymentRepository=id::url parameter";
throw new MojoExecutionException( msg );
}
[maven-deploy-plugin] 02/02: improved documentation
Posted by hb...@apache.org.
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-deploy-plugin.git
commit 157b624f271cd2dfb6414bc1aa6e2e12695adabe
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sun May 5 16:42:28 2019 +0200
improved documentation
---
.../apache/maven/plugins/deploy/DeployMojo.java | 22 +++++++++++-----------
src/site/apt/examples/deploy-network-issues.apt | 18 ++++++++++++------
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
index 2b8652d..0953ff6 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -82,8 +82,8 @@ public class DeployMojo
private boolean deployAtEnd;
/**
- * Specifies an alternative repository to which the project artifacts should be deployed ( other than those
- * specified in <distributionManagement> ). <br/>
+ * Specifies an alternative repository to which the project artifacts should be deployed (other than those specified
+ * in <distributionManagement>). <br/>
* Format: <code>id::url</code>
* <dl>
* <dt>id</dt>
@@ -91,9 +91,9 @@ public class DeployMojo
* <dt>url</dt>
* <dd>The location of the repository</dd>
* </dl>
- * <b>Note:</b> In version 2, the format was <code>id::layout::url</code>, but since 3.0.0 the layout part has been
- * removed because Maven 3 only supports <code>default</code> (ie. Maven 2) layout and not <code>legacy</code>
- * (Maven 1) layout.</b>
+ * <b>Note:</b> In version 2.x, the format was <code>id::<i>layout</i>::url</code> where <code><i>layout</i></code>
+ * could be <code>default</code> (ie. Maven 2) or <code>legacy</code> (ie. Maven 1), but since 3.0.0 the layout part
+ * has been removed because Maven 3 only supports Maven 2 repository layout.
*/
@Parameter( property = "altDeploymentRepository" )
private String altDeploymentRepository;
@@ -101,9 +101,9 @@ public class DeployMojo
/**
* The alternative repository to use when the project has a snapshot version.
*
- * <b>Note:</b> In version 2, the format was <code>id::layout::url</code>, but since 3.0.0 the layout part has been
- * removed because Maven 3 only supports <code>default</code> (ie. Maven 2) layout and not <code>legacy</code>
- * (Maven 1) layout.</b>
+ * <b>Note:</b> In version 2.x, the format was <code>id::<i>layout</i>::url</code> where <code><i>layout</i></code>
+ * could be <code>default</code> (ie. Maven 2) or <code>legacy</code> (ie. Maven 1), but since 3.0.0 the layout part
+ * has been removed because Maven 3 only supports Maven 2 repository layout.
* @since 2.8
* @see DeployMojo#altDeploymentRepository
*/
@@ -113,9 +113,9 @@ public class DeployMojo
/**
* The alternative repository to use when the project has a final version.
*
- * <b>Note:</b> In version 2, the format was <code>id::layout::url</code>, but since 3.0.0 the layout part has been
- * removed because Maven 3 only supports <code>default</code> (ie. Maven 2) layout and not <code>legacy</code>
- * (Maven 1) layout.</b>
+ * <b>Note:</b> In version 2.x, the format was <code>id::<i>layout</i>::url</code> where <code><i>layout</i></code>
+ * could be <code>default</code> (ie. Maven 2) or <code>legacy</code> (ie. Maven 1), but since 3.0.0 the layout part
+ * has been removed because Maven 3 only supports Maven 2 repository layout.
* @since 2.8
* @see DeployMojo#altDeploymentRepository
*/
diff --git a/src/site/apt/examples/deploy-network-issues.apt b/src/site/apt/examples/deploy-network-issues.apt
index 059f4eb..10cbdee 100644
--- a/src/site/apt/examples/deploy-network-issues.apt
+++ b/src/site/apt/examples/deploy-network-issues.apt
@@ -60,7 +60,7 @@ Deploying With Network Issues
When the network is really not consistent, a deeper strategy is to deploy in 2 steps:
- 1. <<<deploy>>> to a local <<<file:./target/staging-deploy>>> directory during the build,
+ 1. <<<deploy>>> to a local directory during the build, for example <<<file:./target/staging-deploy>>>,
2. then copy from the local area to the target remote repository, retrying as much as necessary.
@@ -75,9 +75,13 @@ Deploying With Network Issues
mvn deploy -DaltDeploymentRepository=local::file:./target/staging-deploy
+----+
- Notice: with maven-deploy-plugin 2.x, the parameter format was <<<local::default::file:./target/staging-deploy>>>
+ or for older 2.x version of maven-deploy-plugin
- Of course, if you want can configure the repository in your <<<pom.xml>>> if you want to go from a temporary strategy
++----+
+mvn deploy -DaltDeploymentRepository=local::default::file:./target/staging-deploy
++----+
+
+ Of course, you can configure the repository in your <<<pom.xml>>> if you want to go from a temporary strategy
to the general strategy.
** Copying from Local Directory to Target Remote Repository
@@ -90,13 +94,15 @@ mvn deploy -DaltDeploymentRepository=local::file:./target/staging-deploy
like a staging repository provided by a repository manager.
It can be invoked fully from command line (renaming <<<-Dwagon.>>> with <<<wagon.targetId>>> when
- {{{https://github.com/mojohaus/wagon-maven-plugin/pull/26}2.0.1 will be released}}):
+ {{{https://github.com/mojohaus/wagon-maven-plugin/pull/26}Wagon Maven Plugin 2.0.1 will be released}}):
+----+
mvn org.codehaus.mojo:wagon-maven-plugin:2.0.0:merge-maven-repos \
-Dwagon.source=file:./target/staging-deploy \
-Dwagon.target=https://... \
-Dwagon.=id
+# or once wagon-maven-plugin 2.0.1 is released:
+ -Dwagon.targetId=id
+----+
or more simply with <<<mvn wagon:merge-maven-repos>>> with configuration in <<<pom.xml>>>:
@@ -112,8 +118,8 @@ mvn org.codehaus.mojo:wagon-maven-plugin:2.0.0:merge-maven-repos \
<version>2.0.0</version>
<configuration>
<source>file:./target/staging-deploy</source>
- <target>https://...</target>
- <targetId>id</targetId>
+ <target>${project.distributionManagement.repository.url}</target>
+ <targetId>${project.distributionManagement.repository.id}</targetId>
</configuration>
</plugin>
</plugins>