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 147e97bf9a2853034a6453139ac8b94f2cc90c51 Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 26 09:04:48 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 2 +- debian/maven.ignoreRules | 2 ++ debian/maven.rules | 4 +++- debian/patches/maven-compatibility.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 33 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 89a6ca4..5eaf304 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ exec-maven-plugin (1.2.1-1) UNRELEASED; urgency=medium * New upstream release - Refreshed the patch - New build dependency on junit4 + * Depend on libmaven3-core-java instead of libmaven2-core-java * Removed the *-java-doc package * Build with the DH sequencer instead of CDBS * Standards-Version updated to 4.0.0 diff --git a/debian/control b/debian/control index 6113f1a..334866f 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: default-jdk, junit4, libmaven-plugin-testing-java, - libmaven2-core-java, + libmaven3-core-java, libplexus-containers1.5-java (>= 1.0-alpha-9), libplexus-utils-java, maven-debian-helper (>= 2.2) diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 4b29023..3a84047 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -15,3 +15,5 @@ # junit junit jar s/3\..*/3.x/ org.codehaus.mojo animal-sniffer-maven-plugin +org.apache.maven maven-project +org.apache.maven maven-toolchain diff --git a/debian/maven.rules b/debian/maven.rules index 026a840..9a89373 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -16,9 +16,11 @@ # and version starting with 3., replacing the version with 3.x # junit junit jar s/3\..*/3.x/ -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * +org.codehaus.plexus plexus-container-default jar s/.*/1.5.5/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * * s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * * junit junit * s/.*/4.x/ * * +org.apache.maven maven-* * s/.*/3.x/ * * +org.apache.maven s/maven-artifact-manager/maven-compat/ * s/.*/3.x/ * * diff --git a/debian/patches/maven-compatibility.patch b/debian/patches/maven-compatibility.patch new file mode 100644 index 0000000..4669fbc --- /dev/null +++ b/debian/patches/maven-compatibility.patch @@ -0,0 +1,25 @@ +Description: Fixes the compatibility with the version of Maven in Debian +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 @@ + private void setUpProject( File pomFile, AbstractMojo mojo ) + throws Exception + { +- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); ++ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.class.getName() ); + + ArtifactRepositoryLayout localRepositoryLayout = + (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 @@ + private void setUpProject( File pomFile, ExecMojo mojo ) + throws Exception + { +- MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE ); ++ MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.class.getName() ); + + ArtifactRepositoryLayout localRepositoryLayout = + (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, "default" ); diff --git a/debian/patches/series b/debian/patches/series index 321bcd2..103b7a5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ tests-local-repository.patch junit-dependency.patch +maven-compatibility.patch -- 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
