Getting dependencies approximately correct for testing
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/b741c5b0 Tree: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/tree/b741c5b0 Diff: http://git-wip-us.apache.org/repos/asf/commons-release-plugin/diff/b741c5b0 Branch: refs/heads/master Commit: b741c5b0b933494a083254483d009e86e091503f Parents: 097b028 Author: Rob Tompkins <chtom...@apache.org> Authored: Sat Jan 6 13:52:10 2018 -0500 Committer: Rob Tompkins <chtom...@apache.org> Committed: Sat Jan 6 13:52:10 2018 -0500 ---------------------------------------------------------------------- pom.xml | 31 +++++++++++++------- .../mojos/CommonsSiteCompressionMojoTest.java | 10 ++----- .../mojos/compress-site/compress-site.xml | 21 ++++++++++++- 3 files changed, 44 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/b741c5b0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d3a2816..ebc4b5f 100644 --- a/pom.xml +++ b/pom.xml @@ -100,16 +100,16 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-compat</artifactId> - <version>${maven.dependency.version}</version> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.5</version> </dependency> <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-utils</artifactId> + <version>3.2.0</version> + </dependency> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>2.2.1</version> @@ -160,15 +160,26 @@ <version>1.1.3</version> </dependency> <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <version>1.9.5</version> - <scope>test</scope> + <groupId>org.sonatype.aether</groupId> + <artifactId>aether-api</artifactId> + <version>1.13.1</version> </dependency> <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>3.3.0</version> + <version>2.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-compat</artifactId> + <version>${maven.dependency.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven.dependency.version}</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/b741c5b0/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 cc3f0b9..58f3031 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 @@ -16,8 +16,6 @@ */ package org.apache.commons.release.plugin.mojos; -import org.apache.maven.plugin.MojoExecutionException; -import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import java.io.File; @@ -32,12 +30,10 @@ public class CommonsSiteCompressionMojoTest extends AbstractMojoTestCase { protected CommonsSiteCompressionMojo mojo; - protected void setUp() throws Exception { - super.setUp(); - } - public void testCompressSite() throws Exception { - File testFile = getTestFile("target/test-classes/mojos/compress-site/compress-site.xml"); + File testFile = new File("src/test/resources/mojos/compress-site/compress-site.xml"); + assertNotNull(testFile); + assertTrue(testFile.exists()); mojo = (CommonsSiteCompressionMojo) lookupMojo("compress-site", testFile); mojo.execute(); } http://git-wip-us.apache.org/repos/asf/commons-release-plugin/blob/b741c5b0/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 c392fdc..0d08ab7 100644 --- a/src/test/resources/mojos/compress-site/compress-site.xml +++ b/src/test/resources/mojos/compress-site/compress-site.xml @@ -17,13 +17,32 @@ ~ specific language governing permissions and limitations ~ under the License. --> +<project xmlns="http://maven.apache.org/POM/4.0.0"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> -<project> + <groupId>org.apache.commons.plugin.my.unit</groupId> + <artifactId>compress-site-test</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Test MyMojo</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> <build> <plugins> <plugin> + <groupId>org.apache.commons</groupId> <artifactId>commons-release-plugin</artifactId> <configuration> + <distSvnStagingUrl>aBadUrl</distSvnStagingUrl> <siteDirectory>${basedir}/target/test-classes/mojos/compress-site/example-site</siteDirectory> </configuration> </plugin>
