This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch maven-debian-helper-2.0 in repository maven-debian-helper.
commit 2cab441111bd496f4d088dde034bec589dbde549 Author: Andrew Schurman <[email protected]> Date: Fri Mar 20 01:50:07 2015 -0700 Cleanup dependencies, remove commons-io test dependency for implicit one --- debian-maven-plugin/pom.xml | 9 +++---- .../org/debian/maven/plugin/InstallMojoTest.java | 2 +- maven-debian-helper/pom.xml | 4 +++ maven-packager-utils/pom.xml | 8 +----- .../maven/packager/DependenciesSolverTest.java | 8 +++--- pom.xml | 31 +++++----------------- 6 files changed, 21 insertions(+), 41 deletions(-) diff --git a/debian-maven-plugin/pom.xml b/debian-maven-plugin/pom.xml index ea7de55..7bdebe1 100644 --- a/debian-maven-plugin/pom.xml +++ b/debian-maven-plugin/pom.xml @@ -19,13 +19,12 @@ <artifactId>maven-repo-helper</artifactId> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> + <groupId>junit</groupId> + <artifactId>junit</artifactId> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> diff --git a/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java b/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java index e1e754f..0ab7508 100644 --- a/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java +++ b/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java @@ -24,7 +24,7 @@ import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; -import org.apache.commons.io.FileUtils; +import org.codehaus.plexus.util.FileUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/maven-debian-helper/pom.xml b/maven-debian-helper/pom.xml index 843f57d..099ca2b 100644 --- a/maven-debian-helper/pom.xml +++ b/maven-debian-helper/pom.xml @@ -17,5 +17,9 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-classworlds</artifactId> </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-embedder</artifactId> + </dependency> </dependencies> </project> diff --git a/maven-packager-utils/pom.xml b/maven-packager-utils/pom.xml index 6c3cb16..8644467 100644 --- a/maven-packager-utils/pom.xml +++ b/maven-packager-utils/pom.xml @@ -20,7 +20,7 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> + <artifactId>maven-core</artifactId> </dependency> <dependency> <groupId>org.apache.velocity</groupId> @@ -33,12 +33,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.plugin-tools</groupId> diff --git a/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java b/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java index e7de184..9074cf4 100644 --- a/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java +++ b/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java @@ -29,9 +29,11 @@ import java.util.ArrayList; import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; + import junit.framework.TestCase; -import org.apache.commons.io.FileUtils; -import org.apache.commons.io.IOUtils; + +import org.codehaus.plexus.util.FileUtils; +import org.codehaus.plexus.util.IOUtil; import org.debian.maven.packager.util.PackageScanner; import org.debian.maven.repo.DependencyRule; @@ -343,7 +345,7 @@ public class DependenciesSolverTest extends TestCase { protected void useFile(String resource, File file) throws IOException { final FileWriter out = new FileWriter(file); final Reader in = read(resource); - IOUtils.copy(in,out); + IOUtil.copy(in,out); in.close(); out.close(); } diff --git a/pom.xml b/pom.xml index b26f257..eed1305 100644 --- a/pom.xml +++ b/pom.xml @@ -19,24 +19,6 @@ <module>maven-packager-utils</module> </modules> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>3.0.5</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-embedder</artifactId> - <version>3.0.5</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>2.0.5</version> - </dependency> - </dependencies> - <dependencyManagement> <dependencies> <dependency> @@ -51,7 +33,12 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> + <artifactId>maven-core</artifactId> + <version>3.0.5</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-embedder</artifactId> <version>3.0.5</version> </dependency> <dependency> @@ -71,12 +58,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.4</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>${maven-plugin-tools.version}</version> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
