This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository exec-maven-plugin.
commit 6de819bb243ea5d65482f3ff62476dbb2b2894be Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 26 09:18:26 2017 +0200 Refreshed the patches --- debian/changelog | 4 ++-- debian/maven.ignoreRules | 1 + debian/patches/junit-dependency.patch | 25 +++++++++++++------------ debian/patches/maven-compatibility.patch | 18 ++++++++++++++++-- debian/patches/tests-local-repository.patch | 29 ++++++----------------------- 5 files changed, 38 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5eaf304..9686a97 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -exec-maven-plugin (1.2.1-1) UNRELEASED; urgency=medium +exec-maven-plugin (1.3-1) UNRELEASED; urgency=medium * Team upload. * New upstream release - - Refreshed the patch + - Refreshed the patches - New build dependency on junit4 * Depend on libmaven3-core-java instead of libmaven2-core-java * Removed the *-java-doc package diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 3a84047..d84584b 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -17,3 +17,4 @@ org.codehaus.mojo animal-sniffer-maven-plugin org.apache.maven maven-project org.apache.maven maven-toolchain +org.apache.maven.plugins maven-plugin-plugin jar diff --git a/debian/patches/junit-dependency.patch b/debian/patches/junit-dependency.patch index b06e065..eb92a86 100644 --- a/debian/patches/junit-dependency.patch +++ b/debian/patches/junit-dependency.patch @@ -3,16 +3,17 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/pom.xml +++ b/pom.xml -@@ -152,6 +152,12 @@ - <version>1.13</version> - <scope>test</scope> - </dependency> -+ <dependency> -+ <groupId>junit</groupId> -+ <artifactId>junit</artifactId> -+ <version>4.12</version> -+ <scope>test</scope> -+ </dependency> - </dependencies> +@@ -172,7 +172,12 @@ + <version>1.19</version> + <scope>test</scope> + </dependency> +- ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>4.12</version> ++ <scope>test</scope> ++ </dependency> + </dependencies> - <properties> + <properties> diff --git a/debian/patches/maven-compatibility.patch b/debian/patches/maven-compatibility.patch index 4669fbc..004c16a 100644 --- a/debian/patches/maven-compatibility.patch +++ b/debian/patches/maven-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java +++ b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java -@@ -255,7 +255,7 @@ +@@ -239,7 +239,7 @@ private void setUpProject( File pomFile, AbstractMojo mojo ) throws Exception { @@ -14,7 +14,7 @@ Forwarded: no (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); --- a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java +++ b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java -@@ -241,7 +241,7 @@ +@@ -224,7 +224,7 @@ private void setUpProject( File pomFile, ExecMojo mojo ) throws Exception { @@ -23,3 +23,17 @@ Forwarded: no ArtifactRepositoryLayout localRepositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); +--- a/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java ++++ b/src/main/java/org/codehaus/mojo/exec/ExecJavaMojo.java +@@ -743,9 +743,9 @@ + // resolve all dependencies transitively to obtain a comprehensive list of assemblies + ArtifactResolutionResult result = + artifactResolver.resolveTransitively( dependencyArtifacts, executablePomArtifact, +- Collections.emptyMap(), this.localRepository, ++ Collections.<String, Artifact>emptyMap(), this.localRepository, + this.remoteRepositories, metadataSource, null, +- Collections.emptyList() ); ++ Collections.<org.apache.maven.artifact.resolver.ResolutionListener>emptyList() ); + executableDependencies = result.getArtifacts(); + } + catch ( Exception ex ) diff --git a/debian/patches/tests-local-repository.patch b/debian/patches/tests-local-repository.patch index 11f37ab..ae019ba 100644 --- a/debian/patches/tests-local-repository.patch +++ b/debian/patches/tests-local-repository.patch @@ -60,23 +60,6 @@ Forwarded: not-needed <scope>test</scope> </dependency> </dependencies> ---- a/src/test/projects/project12/pom.xml -+++ b/src/test/projects/project12/pom.xml -@@ -32,12 +32,12 @@ - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> -- <version>1.1</version> -+ <version>debian</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> -- <version>1.0.4</version> -+ <version>debian</version> - </dependency> - </dependencies> - --- a/src/test/projects/project13/pom.xml +++ b/src/test/projects/project13/pom.xml @@ -34,17 +34,17 @@ @@ -166,23 +149,23 @@ Forwarded: not-needed --- a/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java +++ b/src/test/java/org/codehaus/mojo/exec/ExecMojoTest.java -@@ -246,7 +246,7 @@ +@@ -229,7 +229,7 @@ ArtifactRepositoryLayout localRepositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); - String path = "src/test/repository"; + String path = "debian/maven-repo"; - ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" + - new File( path ).getAbsolutePath(), localRepositoryLayout ); + ArtifactRepository localRepository = + new DefaultArtifactRepository( "local", "file://" + new File( path ).getAbsolutePath(), --- a/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java +++ b/src/test/java/org/codehaus/mojo/exec/ExecJavaMojoTest.java -@@ -260,7 +260,7 @@ +@@ -244,7 +244,7 @@ ArtifactRepositoryLayout localRepositoryLayout = (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); - String path = "src/test/repository"; + String path = "debian/maven-repo"; - ArtifactRepository localRepository = new DefaultArtifactRepository( "local", "file://" + - new File( path ).getAbsolutePath(), localRepositoryLayout ); + ArtifactRepository localRepository = + new DefaultArtifactRepository( "local", "file://" + new File( path ).getAbsolutePath(), -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/exec-maven-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
