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/05/02 16:23:37 UTC
[maven-deploy-plugin] branch MSHARED-695 updated (99cc768 ->
ff58ff0)
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a change to branch MSHARED-695
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git.
discard 99cc768 Using special version from branch.
discard 85e380e [MSHARED-695] - WIP - Move checksum generation from install to deploy
add a2e826f [MDEPLOY-235] - Upgrade mave-surefire/failsafe-plugin 2.21.0
add d7e07cb [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore
new fac5dbd [MSHARED-695] - WIP - Move checksum generation from install to deploy
new ff58ff0 Using special version from branch.
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 (99cc768)
\
N -- N -- N refs/heads/MSHARED-695 (ff58ff0)
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 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:
pom.xml | 1 +
src/site/xdoc/download.xml.vm | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-deploy-plugin] 02/02: Using special version from branch.
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-695
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
commit ff58ff0834b0798d7d857a74666d1c01e7cb10bf
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed May 2 17:56:42 2018 +0200
Using special version from branch.
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 9beccb6..cb39a83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.9.2-SNAPSHOT</version>
+ <version>0.10.0.MSHARED695-SNAPSHOT</version>
</dependency>
<!-- Upgrade of transitive dependency. -->
<dependency>
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.
[maven-deploy-plugin] 01/02: [MSHARED-695] - WIP - Move checksum
generation from install to deploy
Posted by kh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MSHARED-695
in repository https://gitbox.apache.org/repos/asf/maven-deploy-plugin.git
commit fac5dbdc8ae54ea968133615de011bdd2b792568
Author: Karl Heinz Marbaise <kh...@apache.org>
AuthorDate: Wed Apr 11 19:49:07 2018 +0200
[MSHARED-695] - WIP - Move checksum generation from install to deploy
---
pom.xml | 2 +-
.../apache/maven/plugins/deploy/DeployMojo.java | 6 +-
.../maven/plugins/deploy/DeployMojoTest.java | 74 +++++++++++-----------
3 files changed, 43 insertions(+), 39 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ef373a..9beccb6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-artifact-transfer</artifactId>
- <version>0.9.1</version>
+ <version>0.9.2-SNAPSHOT</version>
</dependency>
<!-- Upgrade of transitive dependency. -->
<dependency>
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..229fd47 100644
--- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
+++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java
@@ -36,6 +36,7 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuildingRequest;
+import org.apache.maven.shared.artifact.deploy.ArtifactDeployerException;
import org.apache.maven.shared.project.NoFileAssignedException;
import org.apache.maven.shared.project.deploy.ProjectDeployer;
import org.apache.maven.shared.project.deploy.ProjectDeployerRequest;
@@ -144,7 +145,6 @@ public class DeployMojo
// @formatter:off
ProjectDeployerRequest pdr = new ProjectDeployerRequest()
.setProject( project )
- .setUpdateReleaseInfo( isUpdateReleaseInfo() )
.setRetryFailedDeploymentCount( getRetryFailedDeploymentCount() )
.setAltReleaseDeploymentRepository( altReleaseDeploymentRepository )
.setAltSnapshotDeploymentRepository( altSnapshotDeploymentRepository )
@@ -196,6 +196,10 @@ public class DeployMojo
{
throw new MojoExecutionException( "NoFileAssignedException", e );
}
+ catch ( ArtifactDeployerException e )
+ {
+ throw new MojoExecutionException( "ArtifactDeployerException", e );
+ }
}
diff --git a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
index 4db5b2d..9cf69eb 100644
--- a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java
@@ -360,43 +360,43 @@ public class DeployMojoTest
assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) );
}
- public void testUpdateReleaseParamSetToTrue()
- throws Exception
- {
- File testPom = new File( getBasedir(),
- "target/test-classes/unit/basic-deploy-pom/plugin-config.xml" );
- mojo = ( DeployMojo ) lookupMojo( "deploy", testPom );
-
- MockitoAnnotations.initMocks( this );
-
- assertNotNull( mojo );
-
- ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
- when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
- when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
-
- boolean updateReleaseInfo = (Boolean) getVariableValueFromObject(mojo, "updateReleaseInfo");
-
- assertTrue( updateReleaseInfo );
-
- MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
-
- setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
-
- artifact = (DeployArtifactStub) project.getArtifact();
-
- artifact.setFile( testPom );
-
- ArtifactRepositoryStub repo = getRepoStub( mojo );
-
- repo.setAppendToUrl( "basic-deploy-updateReleaseParam" );
-
- mojo.execute();
-
- assertTrue( artifact.isRelease() );
- }
+// public void testUpdateReleaseParamSetToTrue()
+// throws Exception
+// {
+// File testPom = new File( getBasedir(),
+// "target/test-classes/unit/basic-deploy-pom/plugin-config.xml" );
+// mojo = ( DeployMojo ) lookupMojo( "deploy", testPom );
+//
+// MockitoAnnotations.initMocks( this );
+//
+// assertNotNull( mojo );
+//
+// ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class );
+// when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest );
+// MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
+// repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( LOCAL_REPO ) );
+// when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession );
+//
+// boolean updateReleaseInfo = (Boolean) getVariableValueFromObject(mojo, "updateReleaseInfo");
+//
+// assertTrue( updateReleaseInfo );
+//
+// MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" );
+//
+// setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) );
+//
+// artifact = (DeployArtifactStub) project.getArtifact();
+//
+// artifact.setFile( testPom );
+//
+// ArtifactRepositoryStub repo = getRepoStub( mojo );
+//
+// repo.setAppendToUrl( "basic-deploy-updateReleaseParam" );
+//
+// mojo.execute();
+//
+// assertTrue( artifact.isRelease() );
+// }
public void testDeployIfArtifactFileIsNull()
throws Exception
--
To stop receiving notification emails like this one, please contact
khmarbaise@apache.org.