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/08/19 14:59:28 UTC
[maven-deploy-plugin] branch MDEPLOY-240 updated (82ef5c8 ->
9b5c862)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MDEPLOY-240
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git.
discard 82ef5c8 [MDEPLOY-240] - Remove updateReleaseInfo parameter
new 9b5c862 [MDEPLOY-240] - Remove updateReleaseInfo parameter
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 (82ef5c8)
\
N -- N -- N refs/heads/MDEPLOY-240 (9b5c862)
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:
.../resources/unit/basic-deploy-pom/plugin-config.xml | 1 -
.../resources/unit/basic-deploy-scp/plugin-config.xml | 1 -
.../unit/basic-deploy-test/plugin-config.xml | Bin 3366 -> 3254 bytes
.../plugin-config.xml | 1 -
4 files changed, 3 deletions(-)
[maven-deploy-plugin] 01/01: [MDEPLOY-240] - Remove
updateReleaseInfo parameter
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MDEPLOY-240
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
commit 9b5c862447a5ea30be9c3647cbd7eb41a43c2413
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Sun Aug 19 16:51:38 2018 +0200
[MDEPLOY-240] - Remove updateReleaseInfo parameter
---
.../maven/plugins/deploy/AbstractDeployMojo.java | 11 -----------
.../apache/maven/plugins/deploy/DeployFileMojo.java | 4 ----
.../org/apache/maven/plugins/deploy/DeployMojo.java | 1 -
.../resources/unit/basic-deploy-pom/plugin-config.xml | 1 -
.../resources/unit/basic-deploy-scp/plugin-config.xml | 1 -
.../unit/basic-deploy-test/plugin-config.xml | Bin 3366 -> 3254 bytes
.../plugin-config.xml | 1 -
7 files changed, 19 deletions(-)
diff --git a/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java b/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
index 77e811f..c0efde1 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/AbstractDeployMojo.java
@@ -42,12 +42,6 @@ public abstract class AbstractDeployMojo
private boolean offline;
/**
- * Parameter used to update the metadata to make the artifact as release.
- */
- @Parameter( property = "updateReleaseInfo", defaultValue = "false" )
- protected boolean updateReleaseInfo;
-
- /**
* Parameter used to control how many times a failed deployment will be retried before giving up and failing. If a
* value outside the range 1-10 is specified it will be pulled to the nearest value within the range 1-10.
*
@@ -70,11 +64,6 @@ public abstract class AbstractDeployMojo
}
}
- boolean isUpdateReleaseInfo()
- {
- return updateReleaseInfo;
- }
-
int getRetryFailedDeploymentCount()
{
return retryFailedDeploymentCount;
diff --git a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
index b79010f..23014bb 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployFileMojo.java
@@ -378,10 +378,6 @@ public class DeployFileMojo
}
}
- if ( updateReleaseInfo )
- {
- artifact.setRelease( true );
- }
artifact.setRepository( deploymentRepository );
if ( sources != null )
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 812b22d..72d672f 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -144,7 +144,6 @@ public class DeployMojo
// @formatter:off
ProjectDeployerRequest pdr = new ProjectDeployerRequest()
.setProject( project )
- .setUpdateReleaseInfo( isUpdateReleaseInfo() )
.setRetryFailedDeploymentCount( getRetryFailedDeploymentCount() )
.setAltReleaseDeploymentRepository( altReleaseDeploymentRepository )
.setAltSnapshotDeploymentRepository( altSnapshotDeploymentRepository )
diff --git a/src/test/resources/unit/basic-deploy-pom/plugin-config.xml b/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
index 1f5ae63..8cf373c 100644
--- a/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
+++ b/src/test/resources/unit/basic-deploy-pom/plugin-config.xml
@@ -32,7 +32,6 @@ under the License.
<basedir>${basedir}</basedir>
</deploymentRepository>
</project>
- <updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
</plugins>
diff --git a/src/test/resources/unit/basic-deploy-scp/plugin-config.xml b/src/test/resources/unit/basic-deploy-scp/plugin-config.xml
index ffb387a..4b3a9bf 100644
--- a/src/test/resources/unit/basic-deploy-scp/plugin-config.xml
+++ b/src/test/resources/unit/basic-deploy-scp/plugin-config.xml
@@ -30,7 +30,6 @@ under the License.
<attachedArtifacts />
<deploymentRepository implementation="org.apache.maven.plugins.deploy.stubs.ArtifactRepositoryStub2" />
</project>
- <updateReleaseInfo>false</updateReleaseInfo>
<deployer implementation="org.apache.maven.plugins.deploy.stubs.ArtifactDeployerStub" />
</configuration>
</plugin>
diff --git a/src/test/resources/unit/basic-deploy-test/plugin-config.xml b/src/test/resources/unit/basic-deploy-test/plugin-config.xml
index ae6eeaf..a98749b 100644
Binary files a/src/test/resources/unit/basic-deploy-test/plugin-config.xml and b/src/test/resources/unit/basic-deploy-test/plugin-config.xml differ
diff --git a/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml b/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
index 39803a4..417c54e 100644
--- a/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
+++ b/src/test/resources/unit/basic-deploy-with-attached-artifacts/plugin-config.xml
@@ -34,7 +34,6 @@ under the License.
<basedir>${basedir}</basedir>
</deploymentRepository>
</project>
- <updateReleaseInfo>true</updateReleaseInfo>
</configuration>
</plugin>
</plugins>