diff --git a/src/it/compare-pom/altered-pom.xml b/src/it/compare-pom/altered-pom.xml new file mode 100644 index 00000000..0830255f --- /dev/null +++ b/src/it/compare-pom/altered-pom.xml @@ -0,0 +1,73 @@ + + + + + + 4.0.0 + + org.apache.maven.its.deploy.comparepom + test + ${revision} + pom + + + Tests deployment comparing with a deployed POM. Parameter comparePomWithDeployed. Modified POM! + + + + 1.0-SNAPSHOT + true + + + + + it + file:///${basedir}/repo + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + ${m-deploy-p.version} + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 2.1 + + + + jar + + + ${classifier} + + + + + + + diff --git a/src/it/compare-pom/invoker.properties b/src/it/compare-pom/invoker.properties new file mode 100644 index 00000000..a61a53fa --- /dev/null +++ b/src/it/compare-pom/invoker.properties @@ -0,0 +1,31 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +invoker.debug = false + +invoker.goals.1 = -Dclassifier=first clean deploy + +invoker.project.2 = altered-pom.xml +invoker.goals.2 = -Dclassifier=second -Dm-deploy-p.version=${project.version} clean deploy + +invoker.goals.3 = -Drevision=1.0 -Dclassifier=first clean deploy + +invoker.goals.4 = -Drevision=1.0 -Dclassifier=second clean deploy + +invoker.project.5 = altered-pom.xml +invoker.goals.5 = -Drevision=1.0 -Dclassifier=third -Dm-deploy-p.version=${project.version} clean deploy +invoker.buildResult.5 = failure diff --git a/src/it/compare-pom/pom.xml b/src/it/compare-pom/pom.xml new file mode 100644 index 00000000..80e5ef1a --- /dev/null +++ b/src/it/compare-pom/pom.xml @@ -0,0 +1,73 @@ + + + + + + 4.0.0 + + org.apache.maven.its.deploy.comparepom + test + ${revision} + pom + + + Tests deployment comparing with a deployed POM. Parameter comparePomWithDeployed. + + + + 1.0-SNAPSHOT + true + + + + + it + file:///${basedir}/repo + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + @project.version@ + + true + + + + org.apache.maven.plugins + maven-jar-plugin + 2.1 + + + + jar + + + ${classifier} + + + + + + + diff --git a/src/it/compare-pom/setup.bsh b/src/it/compare-pom/setup.bsh new file mode 100644 index 00000000..c33e81d8 --- /dev/null +++ b/src/it/compare-pom/setup.bsh @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.*; +import java.util.*; + +import org.codehaus.plexus.util.*; + +File file = new File( localRepositoryPath, "org/apache/maven/its/deploy/comparepom" ); +System.out.println( "Deleting " + file ); +FileUtils.deleteDirectory( file ); + +file = new File( basedir, "repo" ); +System.out.println( "Deleting " + file ); +FileUtils.deleteDirectory( file ); + +return true; diff --git a/src/it/compare-pom/verify.groovy b/src/it/compare-pom/verify.groovy new file mode 100644 index 00000000..98c9a943 --- /dev/null +++ b/src/it/compare-pom/verify.groovy @@ -0,0 +1,89 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +class LogInspector +{ + File log; + int index; + LogInspector( File log ) + { + this.log = log; + this.index = 0; + } + boolean containsAfter( CharSequence text ) + { + int newIdx = log.text.indexOf( text, index + 1 ) + if ( newIdx > index) + { + index = newIdx + return true + } + return false + } + String toString () + { + return "Log file ${log} after index ${index}." + } +} + + +assert new File( basedir, "repo/org/apache/maven/its/deploy/comparepom/test/maven-metadata.xml" ).exists() + +File snDir = new File( basedir, "repo/org/apache/maven/its/deploy/comparepom/test/1.0-SNAPSHOT/" ) +assert snDir.list( {d, f -> f ==~ /test-1.0-.*-first.jar/} as FilenameFilter ).size() == 1 +assert snDir.list( {d, f -> f ==~ /test-1.0-.*-second.jar/} as FilenameFilter ).size() == 1 +assert snDir.list( {d, f -> f ==~ /test-1.0-.*.pom/} as FilenameFilter ).size() == 2 + +assert new File( basedir, "repo/org/apache/maven/its/deploy/comparepom/test/1.0/test-1.0-first.jar" ).exists() +assert new File( basedir, "repo/org/apache/maven/its/deploy/comparepom/test/1.0/test-1.0-second.jar").exists() + +File deployedPom = new File( basedir, "repo/org/apache/maven/its/deploy/comparepom/test/1.0/test-1.0.pom" ) +assert deployedPom.exists() +assert ! deployedPom.text.contains("Modified POM!") + +File installedPom = new File( localRepositoryPath, "org/apache/maven/its/deploy/comparepom/test/1.0/test-1.0.pom" ) +assert installedPom.exists() +assert installedPom.text.contains("Modified POM!") + +File buildLog = new File( basedir, 'build.log' ) +assert buildLog.exists() + +// Inspect log +LogInspector li = new LogInspector( buildLog ) +String groupUrl = "file:///${basedir}/repo/org/apache/maven/its/deploy/comparepom" + +// 1st and 2nd run: The POM tried to be downloaded and uploaded: +assert li.containsAfter( "[INFO] Downloading from it: ${groupUrl}/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom" ) +assert li.containsAfter( "[INFO] Downloading from it: ${groupUrl}/test/1.0-SNAPSHOT/test-1.0-SNAPSHOT.pom" ) + +// 3rd run: The POM tried to be downloaded and uploaded: +assert li.containsAfter( "[INFO] Downloading from it: ${groupUrl}/test/1.0/test-1.0.pom" ) +assert li.containsAfter( "[INFO] Uploaded to it: ${groupUrl}/test/1.0/test-1.0.pom" ) + +// After that, it is never tried to be uploaded: +assert -1 == buildLog.text.indexOf( "[INFO] Uploading to it: ${groupUrl}/test/1.0/test-1.0.pom", li.index + 1 ) + +// 4th run: POM is downloaded and not uploaded: +assert li.containsAfter( "[INFO] Downloaded from it: ${groupUrl}/test/1.0/test-1.0.pom" ) +assert li.containsAfter( "[INFO] Not deploying POM, since deployed POM is equal to current POM." ) + +// 5th run: POM is downloaded, nothing is tried to be uploaded after that, and the build fails with error: +assert li.containsAfter( "[INFO] Downloaded from it: ${groupUrl}/test/1.0/test-1.0.pom" ) +assert -1 == buildLog.text.indexOf( "[INFO] Uploading to", li.index + 1 ) +assert li.containsAfter( "[ERROR] Project version org.apache.maven.its.deploy.comparepom:test:1.0 already deployed with a differing POM." ) 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 d169ab8a..919b4408 100644 --- a/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java +++ b/src/main/java/org/apache/maven/plugins/deploy/DeployMojo.java @@ -20,6 +20,8 @@ */ import java.io.File; +import java.io.IOException; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.regex.Matcher; @@ -36,13 +38,22 @@ import org.apache.maven.project.MavenProject; import org.apache.maven.project.artifact.ProjectArtifact; import org.apache.maven.project.artifact.ProjectArtifactMetadata; +import org.codehaus.plexus.util.ReaderFactory; +import org.codehaus.plexus.util.xml.Xpp3Dom; +import org.codehaus.plexus.util.xml.Xpp3DomBuilder; +import org.codehaus.plexus.util.xml.pull.XmlPullParserException; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.DefaultArtifact; import org.eclipse.aether.deployment.DeployRequest; import org.eclipse.aether.repository.RemoteRepository; +import org.eclipse.aether.resolution.ArtifactRequest; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.resolution.ArtifactResult; import org.eclipse.aether.util.artifact.SubArtifact; /** * Deploys an artifact to remote repository. - * + * * @author Emmanuel Venisse * @author John Casey (refactoring only) */ @@ -67,7 +78,7 @@ public class DeployMojo * Whether every project should be deployed during its own deploy-phase or at the end of the multimodule build. If * set to {@code true} and the build fails, none of the reactor projects is deployed. * (experimental) - * + * * @since 2.8 */ @Parameter( defaultValue = "false", property = "deployAtEnd" ) @@ -128,6 +139,13 @@ public class DeployMojo @Parameter( property = "maven.deploy.skip", defaultValue = "false" ) private String skip = Boolean.FALSE.toString(); + /** + * + * @since 3.0.1 + */ + @Parameter( property = "comparePomWithDeployed", defaultValue = "false" ) + private boolean comparePomWithDeployed; + private enum State { SKIPPED, DEPLOYED, TO_BE_DEPLOYED @@ -173,6 +191,7 @@ private boolean hasState( MavenProject project ) return pluginContext.containsKey( DEPLOY_PROCESSED_MARKER ); } + @Override public void execute() throws MojoExecutionException, MojoFailureException { @@ -261,7 +280,8 @@ private DeployRequest processProject( final MavenProject project, if ( pomFile != null ) { - request.addArtifact( RepositoryUtils.toArtifact( new ProjectArtifact( project ) ) ); + Artifact pomArtifact = RepositoryUtils.toArtifact( new ProjectArtifact( project ) ); + new DeployedPomChecker( pomArtifact, request ).addPomConditionally(); pomArtifactAttached = true; } @@ -279,11 +299,12 @@ private DeployRequest processProject( final MavenProject project, { if ( metadata instanceof ProjectArtifactMetadata ) { - request.addArtifact( new SubArtifact( + Artifact pomArtifact = new SubArtifact( mainArtifact, "", "pom" - ).setFile( ( (ProjectArtifactMetadata) metadata ).getFile() ) ); + ).setFile( ( (ProjectArtifactMetadata) metadata ).getFile() ); + new DeployedPomChecker( pomArtifact, request ).addPomConditionally(); pomArtifactAttached = true; } } @@ -315,6 +336,102 @@ else if ( !project.getAttachedArtifacts().isEmpty() ) return request; } + private class DeployedPomChecker + { + final Artifact pomArtifact; + final DeployRequest request; + final RemoteRepository repo; + + DeployedPomChecker( Artifact pomArtifact, DeployRequest request ) + { + this.pomArtifact = pomArtifact; + this.request = request; + this.repo = request.getRepository(); + } + + public void addPomConditionally () + throws MojoExecutionException, MojoFailureException + { + if ( comparePomWithDeployed ) + { + try + { + if ( deployedPomIsEqual() ) + { + return; + } + } + catch ( IOException | XmlPullParserException e ) + { + throw new MojoExecutionException( "Failed to compare POM with a version " + + "previously deployed to the repository: " + e.getMessage(), e ); + } + } + + request.addArtifact( pomArtifact ); + } + + private boolean deployedPomIsEqual() + throws IOException, XmlPullParserException, MojoFailureException + { + Xpp3Dom deployedPomDom = retrieveDeployedPom(); + if ( deployedPomDom == null ) + { + return false; + } + + File pomFile = pomArtifact.getFile(); + Xpp3Dom newPomDom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( pomFile ) ); + + if ( newPomDom.equals( deployedPomDom ) ) + { + getLog().info( "Not deploying POM, since deployed POM is equal to current POM." ); + return true; + } + else + { + String artifactId = RepositoryUtils.toArtifact( pomArtifact ).getId(); + String gav = pomArtifact.getGroupId() + ":" + pomArtifact.getArtifactId() + + ":" + pomArtifact.getVersion(); + + String shortMsg = "Project version " + gav + " already deployed with a differing POM."; + getLog().error( shortMsg ); + + throw new MojoFailureException( artifactId, + shortMsg, + "Project version " + gav + " already deployed and the POM '" + artifactId + "' " + + "deployed in repository '" + repo.getUrl() + "' " + + "differs from the POM that would be deployed. No artifacts will be deployed." ); + } + } + + private Xpp3Dom retrieveDeployedPom () + throws IOException, XmlPullParserException + { + Artifact lookupArtifact = + new DefaultArtifact( pomArtifact.getGroupId(), pomArtifact.getArtifactId(), + pomArtifact.getClassifier(), pomArtifact.getExtension(), + pomArtifact.getVersion(), pomArtifact.getProperties(), + (File) null ); + List repos = Collections.singletonList( repo ); + + ArtifactRequest request = new ArtifactRequest( lookupArtifact, repos, null ); + + try ( TempLocalRepoSession tempRepoSession = + TempLocalRepoSession.create( session.getRepositorySession(), repositorySystem ) ) + { + ArtifactResult result = repositorySystem.resolveArtifact( tempRepoSession, request ); + + File deployedPom = result.getArtifact().getFile(); + return Xpp3DomBuilder.build( ReaderFactory.newXmlReader( deployedPom ) ); + } + catch ( ArtifactResolutionException ex ) + { + return null; + } + } + } + /** * Visible for testing. */ diff --git a/src/main/java/org/apache/maven/plugins/deploy/TempLocalRepoSession.java b/src/main/java/org/apache/maven/plugins/deploy/TempLocalRepoSession.java new file mode 100644 index 00000000..b29ba45e --- /dev/null +++ b/src/main/java/org/apache/maven/plugins/deploy/TempLocalRepoSession.java @@ -0,0 +1,104 @@ +package org.apache.maven.plugins.deploy; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +import java.io.Closeable; +import java.io.File; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import org.codehaus.plexus.util.FileUtils; +import org.eclipse.aether.AbstractForwardingRepositorySystemSession; +import org.eclipse.aether.DefaultRepositoryCache; +import org.eclipse.aether.RepositoryCache; +import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.repository.LocalRepository; +import org.eclipse.aether.repository.LocalRepositoryManager; +import org.eclipse.aether.repository.WorkspaceReader; + +/** + * + */ +class TempLocalRepoSession extends AbstractForwardingRepositorySystemSession implements Closeable +{ + private final RepositorySystemSession origSession; + private final RepositoryCache cache; + private final File tempBasedir; + private LocalRepositoryManager lrm; + + private TempLocalRepoSession( RepositorySystemSession origSession, File tempBasedir ) + { + this.origSession = origSession; + this.cache = new DefaultRepositoryCache(); + this.tempBasedir = tempBasedir; + this.lrm = null; + } + + public static TempLocalRepoSession create( RepositorySystemSession origSession, RepositorySystem repoSystem ) + throws IOException + { + // Place a temporary local repository next to the regular one, as done on the maven-assembly-plugin. + File origBasedir = origSession.getLocalRepository().getBasedir(); + Path parentDir = origBasedir.getParentFile().toPath(); + File newBasedir = Files.createTempDirectory( parentDir, origBasedir.getName() ).toFile(); + + TempLocalRepoSession newSession = new TempLocalRepoSession( origSession, newBasedir ); + + String contentType = origSession.getLocalRepository().getContentType(); + String repositoryType = "enhanced".equals( contentType ) ? "default" : contentType; + LocalRepository localRepository = new LocalRepository( newBasedir, repositoryType ); + + newSession.lrm = repoSystem.newLocalRepositoryManager( newSession, localRepository ); + + return newSession; + } + + @Override + protected RepositorySystemSession getSession() + { + return origSession; + } + + @Override + public RepositoryCache getCache() + { + return cache; + } + + @Override + public LocalRepositoryManager getLocalRepositoryManager() + { + return lrm; + } + + @Override + public WorkspaceReader getWorkspaceReader() + { + return null; + } + + @Override + public void close() + throws IOException + { + FileUtils.deleteDirectory( tempBasedir ); + } +} 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 54bc16fa..519177c6 100644 --- a/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java +++ b/src/test/java/org/apache/maven/plugins/deploy/DeployMojoTest.java @@ -26,6 +26,9 @@ import static org.mockito.Mockito.when; import java.io.File; +import java.nio.file.Files; +import java.nio.file.attribute.BasicFileAttributes; +import java.nio.file.attribute.FileTime; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -41,6 +44,7 @@ import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import org.apache.maven.plugins.deploy.stubs.ArtifactRepositoryStub; import org.apache.maven.plugins.deploy.stubs.DeployArtifactStub; +import org.apache.maven.plugins.deploy.stubs.ReleaseArtifactStub; import org.apache.maven.project.MavenProject; import org.apache.maven.project.ProjectBuildingRequest; import org.codehaus.plexus.util.FileUtils; @@ -58,9 +62,9 @@ */ public class DeployMojoTest extends AbstractMojoTestCase -{ +{ private File remoteRepo; - + private File localRepo; private final String LOCAL_REPO = getBasedir() + "/target/local-repo"; @@ -72,7 +76,7 @@ public class DeployMojoTest final MavenProjectStub project = new MavenProjectStub(); private MavenSession session; - + @InjectMocks private DeployMojo mojo; @@ -89,9 +93,9 @@ public void setUp() when( session.getRepositorySession() ).thenReturn( repositorySession ); remoteRepo = new File( REMOTE_REPO ); - - remoteRepo.mkdirs(); - + + remoteRepo.mkdirs(); + localRepo = new File( LOCAL_REPO ); if ( localRepo.exists() ) @@ -109,33 +113,33 @@ public void tearDown() throws Exception { super.tearDown(); - + if( remoteRepo.exists() ) { //FileUtils.deleteDirectory( remoteRepo ); } } - + public void testDeployTestEnvironment() throws Exception { File testPom = new File( getBasedir(), "target/test-classes/unit/basic-deploy-test/plugin-config.xml" ); - + DeployMojo mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); - + assertNotNull( mojo ); } - + public void testBasicDeploy() throws Exception { File testPom = new File( getBasedir(), "target/test-classes/unit/basic-deploy-test/plugin-config.xml" ); mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); - + MockitoAnnotations.initMocks( this ); - + assertNotNull( mojo ); ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class ); @@ -158,26 +162,26 @@ public void testBasicDeploy() setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() ); setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); - + artifact = ( DeployArtifactStub ) project.getArtifact(); String packaging = project.getPackaging(); - + assertEquals( "jar", packaging ); - - artifact.setFile( file ); - + + artifact.setFile( file ); + ArtifactRepositoryStub repo = getRepoStub( mojo ); assertNotNull( repo ); - + repo.setAppendToUrl( "basic-deploy-test" ); - + assertEquals( "deploy-test", repo.getId() ); assertEquals( "deploy-test", repo.getKey() ); assertEquals( "file", repo.getProtocol() ); - assertEquals( "file://" + getBasedir() + "/target/remote-repo/basic-deploy-test", repo.getUrl() ); - + assertEquals( "file://" + new File( getBasedir(), "/target/remote-repo/basic-deploy-test" ), repo.getUrl() ); + mojo.execute(); //check the artifact in local repository @@ -198,19 +202,19 @@ public void testBasicDeploy() // extra Aether files expectedFiles.add( "resolver-status.properties" ); expectedFiles.add( "resolver-status.properties" ); - + File localRepo = new File( LOCAL_REPO, "" ); - + File[] files = localRepo.listFiles(); for (File file2 : Objects.requireNonNull( files ) ) { addFileToList(file2, fileList); } - + assertEquals( expectedFiles.size(), fileList.size() ); - assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); - + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + //check the artifact in remote repository expectedFiles = new ArrayList<>(); fileList = new ArrayList<>(); @@ -234,18 +238,18 @@ public void testBasicDeploy() expectedFiles.add( "maven-metadata.xml" ); expectedFiles.add( "maven-metadata.xml.md5" ); expectedFiles.add( "maven-metadata.xml.sha1" ); - + remoteRepo = new File( remoteRepo, "basic-deploy-test" ); - + files = remoteRepo.listFiles(); for (File file1 : Objects.requireNonNull( files ) ) { addFileToList(file1, fileList); } - + assertEquals( expectedFiles.size(), fileList.size() ); - assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); } public void testSkippingDeploy() @@ -286,10 +290,10 @@ public void testSkippingDeploy() assertEquals( "deploy-test", repo.getId() ); assertEquals( "deploy-test", repo.getKey() ); assertEquals( "file", repo.getProtocol() ); - assertEquals( "file://" + getBasedir() + "/target/remote-repo/basic-deploy-test", repo.getUrl() ); + assertEquals( "file://" + new File( getBasedir(), "/target/remote-repo/basic-deploy-test" ), repo.getUrl() ); setVariableValueToObject( mojo, "skip", Boolean.TRUE.toString() ); - + mojo.execute(); File localRepo = new File( LOCAL_REPO, "" ); @@ -297,39 +301,39 @@ public void testSkippingDeploy() File[] files = localRepo.listFiles(); assertNull( files ); - + remoteRepo = new File( remoteRepo, "basic-deploy-test" ); files = remoteRepo.listFiles(); assertNull( files ); - } - + } + public void testBasicDeployWithPackagingAsPom() 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 ); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO ) ) ); when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession ); when( session.getRepositorySession() ).thenReturn( repositorySession ); - + File pomFile = new File( getBasedir(), "target/test-classes/unit/basic-deploy-pom/target/" + "deploy-test-file-1.0-SNAPSHOT.pom" ); assertTrue( pomFile.exists() ); - + MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); project.setGroupId( "org.apache.maven.test" ); project.setArtifactId( "maven-deploy-test" ); @@ -339,15 +343,15 @@ public void testBasicDeployWithPackagingAsPom() setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); artifact = (DeployArtifactStub) project.getArtifact(); - + artifact.setArtifactHandlerExtension( project.getPackaging() ); - - artifact.setFile( pomFile ); - + + artifact.setFile( pomFile ); + ArtifactRepositoryStub repo = getRepoStub( mojo ); - + repo.setAppendToUrl( "basic-deploy-pom" ); - + mojo.execute(); List expectedFiles = new ArrayList<>(); @@ -368,18 +372,18 @@ public void testBasicDeployWithPackagingAsPom() // as we are in SNAPSHOT the file is here twice expectedFiles.add( "maven-metadata.xml" ); expectedFiles.add( "maven-metadata.xml.md5" ); - expectedFiles.add( "maven-metadata.xml.sha1" ); + expectedFiles.add( "maven-metadata.xml.sha1" ); remoteRepo = new File( remoteRepo, "basic-deploy-pom" ); - + File[] files = remoteRepo.listFiles(); for (File file : Objects.requireNonNull( files ) ) { addFileToList(file, fileList); } - + assertEquals( expectedFiles.size(), fileList.size() ); - assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); } public void testDeployIfArtifactFileIsNull() @@ -387,18 +391,18 @@ public void testDeployIfArtifactFileIsNull() { File testPom = new File( getBasedir(), "target/test-classes/unit/basic-deploy-test/plugin-config.xml" ); - + DeployMojo mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); MockitoAnnotations.initMocks( this ); ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class ); when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest ); - + setVariableValueToObject( mojo, "session", session ); - + assertNotNull( mojo ); - + MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); project.setGroupId( "org.apache.maven.test" ); project.setArtifactId( "maven-deploy-test" ); @@ -408,11 +412,11 @@ public void testDeployIfArtifactFileIsNull() setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); artifact = (DeployArtifactStub) project.getArtifact(); - + artifact.setFile( null ); - + assertNull( artifact.getFile() ); - + try { mojo.execute(); @@ -424,7 +428,7 @@ public void testDeployIfArtifactFileIsNull() //expected } } - + public void testDeployWithAttachedArtifacts() throws Exception { @@ -433,11 +437,11 @@ public void testDeployWithAttachedArtifacts() "plugin-config.xml" ); mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); - + MockitoAnnotations.initMocks( this ); - + assertNotNull( mojo ); - + ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class ); when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest ); DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); @@ -454,17 +458,17 @@ public void testDeployWithAttachedArtifacts() setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); artifact = (DeployArtifactStub) project.getArtifact(); - + File file = new File( getBasedir(), "target/test-classes/unit/basic-deploy-with-attached-artifacts/target/" + "deploy-test-file-1.0-SNAPSHOT.jar" ); - + artifact.setFile( file ); - + ArtifactRepositoryStub repo = getRepoStub( mojo ); - - repo.setAppendToUrl( "basic-deploy-with-attached-artifacts" ); - + + repo.setAppendToUrl( "basic-deploy-with-attached-artifacts" ); + mojo.execute(); //check the artifacts in remote repository @@ -489,7 +493,7 @@ public void testDeployWithAttachedArtifacts() // as we are in SNAPSHOT the file is here twice expectedFiles.add( "maven-metadata.xml" ); expectedFiles.add( "maven-metadata.xml.md5" ); - expectedFiles.add( "maven-metadata.xml.sha1" ); + expectedFiles.add( "maven-metadata.xml.sha1" ); expectedFiles.add( "attached-artifact-test-0" ); expectedFiles.add( "1.0-SNAPSHOT" ); expectedFiles.add( "maven-metadata.xml" ); @@ -501,76 +505,321 @@ public void testDeployWithAttachedArtifacts() // as we are in SNAPSHOT the file is here twice expectedFiles.add( "maven-metadata.xml" ); expectedFiles.add( "maven-metadata.xml.md5" ); - expectedFiles.add( "maven-metadata.xml.sha1" ); - + expectedFiles.add( "maven-metadata.xml.sha1" ); + remoteRepo = new File( remoteRepo, "basic-deploy-with-attached-artifacts" ); - + File[] files = remoteRepo.listFiles(); for (File file1 : Objects.requireNonNull( files ) ) { addFileToList(file1, fileList); } - + assertEquals( expectedFiles.size(), fileList.size() ); - assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); } - + + public void testComparePomWithDeployed() + throws Exception + { + File testPom = new File( getBasedir(), "target/test-classes/unit/basic-deploy-compare-pom/plugin-config.xml" ); + + mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); + + MockitoAnnotations.initMocks( this ); + + assertNotNull( mojo ); + + ProjectBuildingRequest buildingRequest = mock ( ProjectBuildingRequest.class ); + when( session.getProjectBuildingRequest() ).thenReturn( buildingRequest ); + DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession(); + repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManagerFactory().newInstance( repositorySession, new LocalRepository( LOCAL_REPO ) ) ); + when( buildingRequest.getRepositorySession() ).thenReturn( repositorySession ); + when( session.getRepositorySession() ).thenReturn( repositorySession ); + + MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); + project.setGroupId( "org.apache.maven.test" ); + project.setArtifactId( "maven-deploy-test" ); + project.setVersion( "1.0" ); // SNAPSHOT would produce unique versions per run and therefore two POM files. + + setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() ); + setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); + + ReleaseArtifactStub artifact = ( ReleaseArtifactStub ) project.getArtifact(); + + File file = new File( getBasedir(), + "target/test-classes/unit/basic-deploy-compare-pom/target/" + + "deploy-test-file-1.0-SNAPSHOT.jar" ); + artifact.setFile( file ); + + ArtifactRepositoryStub repo = getRepoStub( mojo ); + + repo.setAppendToUrl( "basic-deploy-compare-pom" ); + + // This tests that the POM is deployed, if it is not present. + setVariableValueToObject( mojo, "comparePomWithDeployed", true ); + + mojo.execute(); + + + //check that the temporary local-repos are gone + String localRepoString = localRepo.toString(); + File[] lrFiles = localRepo.getParentFile().listFiles(); + for ( File lrFile : lrFiles ) + { + if ( lrFile.equals( localRepo ) ) continue; + assertFalse("Temporary local repo left over.", lrFile.toString().startsWith(localRepoString)); + } + + //check the artifacts in remote repository + List expectedFiles = new ArrayList<>(); + List fileList = new ArrayList<>(); + + expectedFiles.add( "org" ); + expectedFiles.add( "apache" ); + expectedFiles.add( "maven" ); + expectedFiles.add( "test" ); + expectedFiles.add( "maven-deploy-test" ); + expectedFiles.add( "1.0" ); + expectedFiles.add( "maven-metadata.xml" ); + expectedFiles.add( "maven-metadata.xml.md5" ); + expectedFiles.add( "maven-metadata.xml.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0.jar" ); + expectedFiles.add( "maven-deploy-test-1.0.jar.md5" ); + expectedFiles.add( "maven-deploy-test-1.0.jar.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0.pom" ); + expectedFiles.add( "maven-deploy-test-1.0.pom.md5" ); + expectedFiles.add( "maven-deploy-test-1.0.pom.sha1" ); + + remoteRepo = new File( remoteRepo, "basic-deploy-compare-pom" ); + + File[] files = remoteRepo.listFiles(); + + for (File file1 : files) { + addFileToList(file1, fileList); + } + + assertEquals( expectedFiles.size(), fileList.size() ); + + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + + File pomFile = new File(remoteRepo, "org/apache/maven/test/maven-deploy-test/1.0/maven-deploy-test-1.0.pom"); + FileTime pomFileTime = Files.readAttributes(pomFile.toPath(), BasicFileAttributes.class).lastModifiedTime(); + + + + // Start over again to deploy another artifact. + mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); + + MockitoAnnotations.initMocks( this ); + + assertNotNull( mojo ); + + project = (MavenProject) getVariableValueFromObject( mojo, "project" ); + project.setGroupId( "org.apache.maven.test" ); + project.setArtifactId( "maven-deploy-test" ); + project.setVersion( "1.0" ); // SNAPSHOT would produce unique versions per run and therefore two POM files. + + setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() ); + setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); + + artifact = ( ReleaseArtifactStub ) project.getArtifact(); + + artifact.setFile( file ); + + repo = getRepoStub( mojo ); + + repo.setAppendToUrl( "basic-deploy-compare-pom" ); + + setVariableValueToObject( mojo, "comparePomWithDeployed", true ); + artifact.setClassifier("secondArtifact"); + + mojo.execute(); + + + //check that the temporary local-repos are gone + lrFiles = localRepo.getParentFile().listFiles(); + for ( File lrFile : lrFiles ) + { + if ( lrFile.equals( localRepo ) ) continue; + assertFalse("Temporary local repo left over.", lrFile.toString().startsWith(localRepoString)); + } + + //check the artifacts in remote repository + expectedFiles = new ArrayList<>(); + fileList = new ArrayList<>(); + + expectedFiles.add( "org" ); + expectedFiles.add( "apache" ); + expectedFiles.add( "maven" ); + expectedFiles.add( "test" ); + expectedFiles.add( "maven-deploy-test" ); + expectedFiles.add( "1.0" ); + expectedFiles.add( "maven-metadata.xml" ); + expectedFiles.add( "maven-metadata.xml.md5" ); + expectedFiles.add( "maven-metadata.xml.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0.jar" ); + expectedFiles.add( "maven-deploy-test-1.0.jar.md5" ); + expectedFiles.add( "maven-deploy-test-1.0.jar.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0-secondArtifact.jar" ); + expectedFiles.add( "maven-deploy-test-1.0-secondArtifact.jar.md5" ); + expectedFiles.add( "maven-deploy-test-1.0-secondArtifact.jar.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0.pom" ); + expectedFiles.add( "maven-deploy-test-1.0.pom.md5" ); + expectedFiles.add( "maven-deploy-test-1.0.pom.sha1" ); + + files = remoteRepo.listFiles(); + + for (File file1 : files) { + addFileToList(file1, fileList); + } + + assertEquals( expectedFiles.size(), fileList.size() ); + + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + + assertEquals( pomFileTime, Files.readAttributes(pomFile.toPath(), BasicFileAttributes.class).lastModifiedTime()); + + + + // Start over again to deploy a third artifact, but with a changed POM. + File testPom2 = new File( getBasedir(), "target/test-classes/unit/basic-deploy-compare-pom/plugin-config2.xml" ); + + mojo = ( DeployMojo ) lookupMojo( "deploy", testPom2 ); + + MockitoAnnotations.initMocks( this ); + + assertNotNull( mojo ); + + project = (MavenProject) getVariableValueFromObject( mojo, "project" ); + project.setGroupId( "org.apache.maven.test" ); + project.setArtifactId( "maven-deploy-test" ); + project.setVersion( "1.0" ); // SNAPSHOT would produce unique versions per run and therefore two POM files. + + setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() ); + setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); + + artifact = ( ReleaseArtifactStub ) project.getArtifact(); + + artifact.setFile( file ); + + repo = getRepoStub( mojo ); + + repo.setAppendToUrl( "basic-deploy-compare-pom" ); + + setVariableValueToObject( mojo, "comparePomWithDeployed", true ); + artifact.setClassifier("thirdArtifact"); + + try + { + mojo.execute(); + fail( "Should throw: Already deployed with a differing POM." ); + } + catch( MojoFailureException e ) + { + assertEquals( + "Project version org.apache.maven.test:maven-deploy-test:1.0 already deployed with a differing POM.", + e.getMessage() ); + assertEquals( + "Project version org.apache.maven.test:maven-deploy-test:1.0 already deployed and the POM " + + "'org.apache.maven.test:maven-deploy-test:pom:1.0' deployed in repository " + + "'file://" + remoteRepo.getPath() + "' differs from the POM that would be deployed. " + + "No artifacts will be deployed.", + e.getLongMessage() ); + } + + //check the artifacts in remote repository + expectedFiles = new ArrayList<>(); + fileList = new ArrayList<>(); + + expectedFiles.add( "org" ); + expectedFiles.add( "apache" ); + expectedFiles.add( "maven" ); + expectedFiles.add( "test" ); + expectedFiles.add( "maven-deploy-test" ); + expectedFiles.add( "1.0" ); + expectedFiles.add( "maven-metadata.xml" ); + expectedFiles.add( "maven-metadata.xml.md5" ); + expectedFiles.add( "maven-metadata.xml.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0.jar" ); + expectedFiles.add( "maven-deploy-test-1.0.jar.md5" ); + expectedFiles.add( "maven-deploy-test-1.0.jar.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0-secondArtifact.jar" ); + expectedFiles.add( "maven-deploy-test-1.0-secondArtifact.jar.md5" ); + expectedFiles.add( "maven-deploy-test-1.0-secondArtifact.jar.sha1" ); + expectedFiles.add( "maven-deploy-test-1.0.pom" ); + expectedFiles.add( "maven-deploy-test-1.0.pom.md5" ); + expectedFiles.add( "maven-deploy-test-1.0.pom.sha1" ); + + files = remoteRepo.listFiles(); + + for (File file1 : files) { + addFileToList(file1, fileList); + } + + assertEquals( expectedFiles.size(), fileList.size() ); + + assertEquals( 0, getSizeOfExpectedFiles( fileList, expectedFiles ) ); + + assertEquals( pomFileTime, Files.readAttributes(pomFile.toPath(), BasicFileAttributes.class).lastModifiedTime()); + } + @Ignore( "SCP is not part of Maven3 distribution. Aether handles transport extensions." ) public void _testBasicDeployWithScpAsProtocol() throws Exception { String originalUserHome = System.getProperty( "user.home" ); - + // FIX THE DAMN user.home BEFORE YOU DELETE IT!!! File altHome = new File( getBasedir(), "target/ssh-user-home" ); altHome.mkdirs(); - + System.out.println( "Testing user.home value for .ssh dir: " + altHome.getCanonicalPath() ); - + Properties props = System.getProperties(); props.setProperty( "user.home", altHome.getCanonicalPath() ); - + System.setProperties( props ); - + File testPom = new File( getBasedir(), "target/test-classes/unit/basic-deploy-scp/plugin-config.xml" ); - + mojo = ( DeployMojo ) lookupMojo( "deploy", testPom ); - + assertNotNull( mojo ); - + RepositorySystem repositorySystem = mock( RepositorySystem.class ); - + setVariableValueToObject( mojo, "repositorySystem", repositorySystem ); - + File file = new File( getBasedir(), "target/test-classes/unit/basic-deploy-scp/target/" + "deploy-test-file-1.0-SNAPSHOT.jar" ); assertTrue( file.exists() ); - + MavenProject project = (MavenProject) getVariableValueFromObject( mojo, "project" ); setVariableValueToObject( mojo, "pluginContext", new ConcurrentHashMap<>() ); setVariableValueToObject( mojo, "reactorProjects", Collections.singletonList( project ) ); artifact = (DeployArtifactStub) project.getArtifact(); - + artifact.setFile( file ); - + String altUserHome = System.getProperty( "user.home" ); - + if ( altUserHome.equals( originalUserHome ) ) { // this is *very* bad! throw new IllegalStateException( "Setting 'user.home' system property to alternate value did NOT work. Aborting test." ); } - + File sshFile = new File( altUserHome, ".ssh" ); - + System.out.println( "Testing .ssh dir: " + sshFile.getCanonicalPath() ); - + //delete first the .ssh folder if existing before executing the mojo if( sshFile.exists() ) { @@ -578,9 +827,9 @@ public void _testBasicDeployWithScpAsProtocol() } mojo.execute(); - + assertTrue( sshFile.exists() ); - + FileUtils.deleteDirectory( sshFile ); } @@ -708,7 +957,7 @@ public void testAltReleaseDeploymentRepository() assertEquals( new RemoteRepository.Builder("altReleaseDeploymentRepository", "default", "http://localhost").build(), mojo.getDeploymentRepository( project, null, "altReleaseDeploymentRepository::http://localhost", null )); } - + private void addFileToList( File file, List fileList ) { if( !file.isDirectory() ) @@ -725,22 +974,22 @@ private void addFileToList( File file, List fileList ) addFileToList(file1, fileList); } } - } - + } + private int getSizeOfExpectedFiles( List fileList, List expectedFiles ) { for( String fileName : fileList ) { - // translate uniqueVersion to -SNAPSHOT + // translate uniqueVersion to -SNAPSHOT fileName = fileName.replaceFirst( "-\\d{8}\\.\\d{6}-\\d+", "-SNAPSHOT" ); - + if( !expectedFiles.remove( fileName ) ) { fail( fileName + " is not included in the expected files" ); } } return expectedFiles.size(); - } + } private ArtifactRepositoryStub getRepoStub( Object mojo ) throws Exception diff --git a/src/test/java/org/apache/maven/plugins/deploy/stubs/ArtifactRepositoryStub.java b/src/test/java/org/apache/maven/plugins/deploy/stubs/ArtifactRepositoryStub.java index 238c5f79..3110be5d 100644 --- a/src/test/java/org/apache/maven/plugins/deploy/stubs/ArtifactRepositoryStub.java +++ b/src/test/java/org/apache/maven/plugins/deploy/stubs/ArtifactRepositoryStub.java @@ -19,6 +19,7 @@ * under the License. */ +import java.io.File; import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.ArtifactMetadata; import org.apache.maven.artifact.repository.ArtifactRepository; @@ -31,9 +32,9 @@ public class ArtifactRepositoryStub extends StubArtifactRepository { private boolean blacklisted; - + private ArtifactRepositoryLayout layout; - + private String url; private final String basedir = System.getProperty( "basedir" ); @@ -42,7 +43,7 @@ public ArtifactRepositoryStub() { super( null ); } - + public ArtifactRepositoryStub( String dir ) { super( dir ); @@ -52,54 +53,54 @@ public String pathOf( Artifact artifact ) { return getLayout().pathOf( artifact ); } - + public String pathOfRemoteRepositoryMetadata( ArtifactMetadata artifactMetadata ) { return getLayout().pathOfRemoteRepositoryMetadata( artifactMetadata ); } - + public String pathOfLocalRepositoryMetadata( ArtifactMetadata metadata, ArtifactRepository repository ) { return getLayout().pathOfLocalRepositoryMetadata( metadata, repository ); } - + public String getUrl() { return url; } - + public void setAppendToUrl( String dir ) { - this.url = "file://" + basedir + "/target/remote-repo/" + dir; + this.url = "file://" + new File( basedir + "/target/remote-repo/", dir ).getPath(); } - + public String getBasedir() { return basedir; } - + public String getProtocol() { return "file"; } - + public String getId() { return "deploy-test"; } - + public ArtifactRepositoryPolicy getSnapshots() { return new ArtifactRepositoryPolicy( true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE ); } - + public ArtifactRepositoryPolicy getReleases() { return new ArtifactRepositoryPolicy( true, ArtifactRepositoryPolicy.UPDATE_POLICY_ALWAYS, ArtifactRepositoryPolicy.CHECKSUM_POLICY_IGNORE ); } - + public ArtifactRepositoryLayout getLayout() { if( layout != null ) @@ -111,7 +112,7 @@ public ArtifactRepositoryLayout getLayout() return new DefaultRepositoryLayout(); } } - + public String getKey() { return getId(); @@ -121,7 +122,7 @@ public boolean isUniqueVersion() { return false; } - + public void setBlacklisted( boolean blackListed ) { this.blacklisted = blackListed; diff --git a/src/test/java/org/apache/maven/plugins/deploy/stubs/ReleaseArtifactStub.java b/src/test/java/org/apache/maven/plugins/deploy/stubs/ReleaseArtifactStub.java new file mode 100644 index 00000000..98a3113b --- /dev/null +++ b/src/test/java/org/apache/maven/plugins/deploy/stubs/ReleaseArtifactStub.java @@ -0,0 +1,49 @@ +package org.apache.maven.plugins.deploy.stubs; + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +public class ReleaseArtifactStub + extends DeployArtifactStub +{ + private String classifier; + + @Override + public String getVersion() + { + return "1.0"; + } + + public void setClassifier( String classifier ) + { + this.classifier = classifier; + } + + @Override + public String getClassifier() + { + return classifier; + } + + @Override + public boolean hasClassifier() + { + return classifier != null; + } +} diff --git a/src/test/resources/unit/basic-deploy-compare-pom/plugin-config.xml b/src/test/resources/unit/basic-deploy-compare-pom/plugin-config.xml new file mode 100644 index 00000000..f294d4f3 Binary files /dev/null and b/src/test/resources/unit/basic-deploy-compare-pom/plugin-config.xml differ diff --git a/src/test/resources/unit/basic-deploy-compare-pom/plugin-config2.xml b/src/test/resources/unit/basic-deploy-compare-pom/plugin-config2.xml new file mode 100644 index 00000000..fbbb32f4 Binary files /dev/null and b/src/test/resources/unit/basic-deploy-compare-pom/plugin-config2.xml differ diff --git a/src/test/resources/unit/basic-deploy-compare-pom/target/deploy-test-file-1.0-SNAPSHOT.jar b/src/test/resources/unit/basic-deploy-compare-pom/target/deploy-test-file-1.0-SNAPSHOT.jar new file mode 100644 index 00000000..6f5f2f81 --- /dev/null +++ b/src/test/resources/unit/basic-deploy-compare-pom/target/deploy-test-file-1.0-SNAPSHOT.jar @@ -0,0 +1 @@ +This is not an actual jar \ No newline at end of file