This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-deploy-plugin.
commit bb1c4aa5501ea2f39fcf84cab4177e9aec46e845 Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 2 16:45:08 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 2 +- debian/maven.properties | 2 ++ debian/maven.rules | 2 ++ debian/patches/01-maven-compatibility.patch | 51 +++++++++++++++++++++++++++++ debian/patches/series | 1 + 6 files changed, 58 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index db1c3c4..24b6ff2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ maven-deploy-plugin (2.8.2-2) UNRELEASED; urgency=medium + * Depend on libmaven3-core-java instead of libmaven2-core-java * Relocate the version 2.7 used by Maven to the current one * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index fd0191c..0e599fa 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 10), junit4, libmaven-plugin-testing-java, libmaven-plugin-tools-java, - libmaven2-core-java, + libmaven3-core-java, libmockito-java, maven-debian-helper Standards-Version: 4.0.0 diff --git a/debian/maven.properties b/debian/maven.properties index 37dea91..e593715 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1,3 +1,5 @@ # Include here properties to pass to Maven during the build. # For example: # maven.test.skip=true + +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules index 1398788..29a917f 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,3 +1,5 @@ junit junit jar s/3\..*/3.x/ * * junit junit jar s/4\..*/4.x/ * * +org.apache.maven maven-* * s/.*/3.x/ * * +org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * * diff --git a/debian/patches/01-maven-compatibility.patch b/debian/patches/01-maven-compatibility.patch new file mode 100644 index 0000000..3415035 --- /dev/null +++ b/debian/patches/01-maven-compatibility.patch @@ -0,0 +1,51 @@ +Description: Fixes the compilation failures with the latest version of Maven in Debian +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java ++++ b/src/test/java/org/apache/maven/plugin/deploy/stubs/ArtifactRepositoryStub.java +@@ -27,7 +27,7 @@ + import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; + + public class ArtifactRepositoryStub +- implements ArtifactRepository ++ extends org.apache.maven.plugin.testing.stubs.StubArtifactRepository + { + private boolean blacklisted; + +@@ -37,6 +37,16 @@ + + private String basedir = System.getProperty( "basedir" ); + ++ public ArtifactRepositoryStub() ++ { ++ super( null ); ++ } ++ ++ public ArtifactRepositoryStub( String dir ) ++ { ++ super( dir ); ++ } ++ + public String pathOf( Artifact artifact ) + { + return getLayout().pathOf( artifact ); +--- a/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java ++++ b/src/test/java/org/apache/maven/plugin/deploy/DeployMojoTest.java +@@ -412,7 +412,7 @@ + + + @SuppressWarnings( "unchecked" ) +- List<AttachedArtifactStub> attachedArtifacts = project.getAttachedArtifacts(); ++ List<org.apache.maven.artifact.Artifact> attachedArtifacts = project.getAttachedArtifacts(); + + ArtifactRepositoryStub repo = getRepoStub( mojo ); + +@@ -422,7 +422,7 @@ + + String packaging = project.getPackaging(); + +- for( AttachedArtifactStub attachedArtifact : attachedArtifacts ) ++ for( org.apache.maven.artifact.Artifact attachedArtifact : attachedArtifacts ) + { + File deployedArtifact = new File( remoteRepo, "basic-deploy-with-attached-artifacts" + "/" + + attachedArtifact.getGroupId().replace( '.', '/' ) + "/" + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..09d1b63 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-maven-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-deploy-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
