COMMONSSITE-102: Move testing target sandbox directory
Project: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/commit/4f5d14e3 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/4f5d14e3 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/4f5d14e3 Branch: refs/heads/master Commit: 4f5d14e3d930c074e2bf78267041131e4938d0b9 Parents: 99abd44 Author: Rob Tompkins <chtom...@gmail.com> Authored: Thu Feb 15 09:24:16 2018 -0500 Committer: Rob Tompkins <chtom...@gmail.com> Committed: Thu Feb 15 09:25:30 2018 -0500 ---------------------------------------------------------------------- src/changes/changes.xml | 2 ++ .../CommonsDistributionDetachmentMojoTest.java | 18 +++++++++--------- .../mojos/CommonsDistributionStagingMojoTest.java | 2 +- .../mojos/CommonsSiteCompressionMojoTest.java | 2 +- .../mojos/compress-site/compress-site-failure.xml | 2 +- .../mojos/compress-site/compress-site.xml | 2 +- .../detach-distributions/detach-distributions.xml | 2 +- .../stage-distributions/stage-distributions.xml | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/changes/changes.xml ---------------------------------------------------------------------- diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 69e3aeb..3991ec7 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -26,6 +26,8 @@ <body> <release version="1.1" date="2018-02-15" description="1.1"> + <release version="1.1" date="YYYY-MM-DD" description="tbd"> + <action issue="COMMONSSITE-102" type="fix" dev="chtompki">Commons Release Plugin doesn't work with Commons Release Plugin</action> <action issue="COMMONSSITE-101" type="fix" dev="chtompki">Make -Dcommons.release.dryRun=true our commit toggle</action> </release> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java index cfa5c48..89168dd 100644 --- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java +++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionDetachmentMojoTest.java @@ -53,15 +53,15 @@ public class CommonsDistributionDetachmentMojoTest { assertTrue(testPom.exists()); mojo = (CommonsDistributionDetachmentMojo) rule.lookupMojo("detach-distributions", testPom); mojo.execute(); - File detachedTarGz = new File("target/commons-release-plugin/mockAttachedTar.tar.gz"); - File detachedTarGzAsc = new File("target/commons-release-plugin/mockAttachedTar.tar.gz.asc"); - File detachedTarMd5 = new File("target/commons-release-plugin/mockAttachedTar.tar.gz.md5"); - File detachedTarGzSha1 = new File("target/commons-release-plugin/mockAttachedTar.tar.gz.sha1"); - File detachedZip = new File("target/commons-release-plugin/mockAttachedZip.zip"); - File detachedZipAsc = new File("target/commons-release-plugin/mockAttachedZip.zip.asc"); - File detachedZipMd5 = new File("target/commons-release-plugin/mockAttachedZip.zip.md5"); - File detachedZipSha1 = new File("target/commons-release-plugin/mockAttachedZip.zip.sha1"); - File notDetatchedMockAttachedFile = new File("target/commons-release-plugin/mockAttachedFile.html"); + File detachedTarGz = new File("target/testing-commons-release-plugin/mockAttachedTar.tar.gz"); + File detachedTarGzAsc = new File("target/testing-commons-release-plugin/mockAttachedTar.tar.gz.asc"); + File detachedTarMd5 = new File("target/testing-commons-release-plugin/mockAttachedTar.tar.gz.md5"); + File detachedTarGzSha1 = new File("target/testing-commons-release-plugin/mockAttachedTar.tar.gz.sha1"); + File detachedZip = new File("target/testing-commons-release-plugin/mockAttachedZip.zip"); + File detachedZipAsc = new File("target/testing-commons-release-plugin/mockAttachedZip.zip.asc"); + File detachedZipMd5 = new File("target/testing-commons-release-plugin/mockAttachedZip.zip.md5"); + File detachedZipSha1 = new File("target/testing-commons-release-plugin/mockAttachedZip.zip.sha1"); + File notDetatchedMockAttachedFile = new File("target/testing-commons-release-plugin/mockAttachedFile.html"); assertTrue(detachedTarGz.exists()); assertTrue(detachedTarGzAsc.exists()); assertTrue(detachedTarMd5.exists()); http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java index 42e0a80..213cc5e 100644 --- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java +++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsDistributionStagingMojoTest.java @@ -62,7 +62,7 @@ public class CommonsDistributionStagingMojoTest { File releaseNotesBasedir = new File("src/test/resources/mojos/stage-distributions/"); mojoForTest.setBasedir(releaseNotesBasedir); mojoForTest.execute(); - File targetScmDirectory = new File("target/commons-release-plugin/scm"); + File targetScmDirectory = new File("target/testing-commons-release-plugin/scm"); assertTrue(targetScmDirectory.exists()); } } http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java ---------------------------------------------------------------------- diff --git a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java index 7d8efe6..cd01944 100644 --- a/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java +++ b/src/test/java/org/apache/commons/release/plugin/mojos/CommonsSiteCompressionMojoTest.java @@ -55,7 +55,7 @@ public class CommonsSiteCompressionMojoTest { assertTrue(testPom.exists()); mojo = (CommonsSiteCompressionMojo) rule.lookupMojo("compress-site", testPom); mojo.execute(); - File siteZip = new File("target/commons-release-plugin/site.zip"); + File siteZip = new File("target/testing-commons-release-plugin/site.zip"); assertTrue(siteZip.exists()); } http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/resources/mojos/compress-site/compress-site-failure.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/mojos/compress-site/compress-site-failure.xml b/src/test/resources/mojos/compress-site/compress-site-failure.xml index 1c3042d..1c9c6ad 100644 --- a/src/test/resources/mojos/compress-site/compress-site-failure.xml +++ b/src/test/resources/mojos/compress-site/compress-site-failure.xml @@ -42,7 +42,7 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-release-plugin</artifactId> <configuration> - <workingDirectory>target/commons-release-plugin</workingDirectory> + <workingDirectory>target/testing-commons-release-plugin</workingDirectory> <siteDirectory>${basedir}/target/test-classes/mojos/junk</siteDirectory> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/resources/mojos/compress-site/compress-site.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/mojos/compress-site/compress-site.xml b/src/test/resources/mojos/compress-site/compress-site.xml index c7e399b..53323e1 100644 --- a/src/test/resources/mojos/compress-site/compress-site.xml +++ b/src/test/resources/mojos/compress-site/compress-site.xml @@ -42,7 +42,7 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-release-plugin</artifactId> <configuration> - <workingDirectory>target/commons-release-plugin</workingDirectory> + <workingDirectory>target/testing-commons-release-plugin</workingDirectory> <siteDirectory>${basedir}/target/test-classes/mojos/compress-site/example-site</siteDirectory> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/resources/mojos/detach-distributions/detach-distributions.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/mojos/detach-distributions/detach-distributions.xml b/src/test/resources/mojos/detach-distributions/detach-distributions.xml index ac6cb4c..df4f8ca 100644 --- a/src/test/resources/mojos/detach-distributions/detach-distributions.xml +++ b/src/test/resources/mojos/detach-distributions/detach-distributions.xml @@ -43,7 +43,7 @@ <artifactId>commons-release-plugin</artifactId> <configuration> <project implementation="org.apache.commons.release.plugin.stubs.DistributionDetachmentProjectStub" /> - <workingDirectory>target/commons-release-plugin</workingDirectory> + <workingDirectory>target/testing-commons-release-plugin</workingDirectory> <distSvnStagingUrl>mockDistSvnStagingUrl</distSvnStagingUrl> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/4f5d14e3/src/test/resources/mojos/stage-distributions/stage-distributions.xml ---------------------------------------------------------------------- diff --git a/src/test/resources/mojos/stage-distributions/stage-distributions.xml b/src/test/resources/mojos/stage-distributions/stage-distributions.xml index 1e24ed1..a57d1bd 100644 --- a/src/test/resources/mojos/stage-distributions/stage-distributions.xml +++ b/src/test/resources/mojos/stage-distributions/stage-distributions.xml @@ -43,8 +43,8 @@ <artifactId>commons-release-plugin</artifactId> <configuration> <project implementation="org.apache.commons.release.plugin.stubs.DistributionDetachmentProjectStub" /> - <workingDirectory>target/commons-release-plugin</workingDirectory> - <distCheckoutDirectory>target/commons-release-plugin/scm</distCheckoutDirectory> + <workingDirectory>target/testing-commons-release-plugin</workingDirectory> + <distCheckoutDirectory>target/testing-commons-release-plugin/scm</distCheckoutDirectory> <distSvnStagingUrl>scm:svn:https://dist.apache.org/repos/dist/dev/commons/release-plugin</distSvnStagingUrl> <dryRun>true</dryRun> </configuration>
