This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-antrun-extended-plugin.
commit ecee7399361b9698a436cdd4f1e7f7180ef82324 Author: Emmanuel Bourg <[email protected]> Date: Fri Jul 28 15:59:18 2017 +0200 Depend on libmaven3-core-java instead of libmaven2-core-java --- debian/changelog | 1 + debian/control | 4 +--- debian/maven.ignoreRules | 1 + debian/maven.properties | 1 + debian/maven.rules | 2 ++ debian/patches/01-plexus-compatibility.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 7 files changed, 27 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7700aa8..e360f12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ maven-antrun-extended-plugin (1.43-1) UNRELEASED; urgency=medium * Team upload. * New upstream release + * Depend on libmaven3-core-java instead of libmaven2-core-java * Build with the DH sequencer instead of CDBS * Standards-Version updated to 4.0.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 3d5b394..1cc7397 100644 --- a/debian/control +++ b/debian/control @@ -9,11 +9,9 @@ Build-Depends-Indep: ant-doc, default-jdk-doc, libcommons-collections3-java, - libmaven-embedder-java, libmaven-javadoc-plugin-java, libmaven-plugin-tools-java, - libmaven2-core-java, - libmaven2-core-java-doc + libmaven3-core-java Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-antrun-extended-plugin.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-antrun-extended-plugin.git diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index d872098..303db82 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -16,3 +16,4 @@ org.apache.maven.plugins maven-release-plugin * * * * org.jvnet.wagon-svn wagon-svn * * * * +org.apache.maven maven-embedder diff --git a/debian/maven.properties b/debian/maven.properties index 7c29bd7..e593715 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -2,3 +2,4 @@ # For example: # maven.test.skip=true +maven.test.skip=true diff --git a/debian/maven.rules b/debian/maven.rules index 305756f..0f7f976 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -20,3 +20,5 @@ org.jvnet.maven-antrun-extended-plugin maven-antrun-extended-plugin * s/.*/debia s/ant/org.apache.ant/ * * s/.*/debian/ * * s/org.apache.commons/commons-io/ commons-io * s/.*/debian/ * * commons-collections commons-collections * s/3\..*/3.x/ * * +org.apache.maven maven-plugin-api * s/.*/3.x/ * * +org.apache.maven s/maven-project/maven-compat/ * s/.*/3.x/ * * diff --git a/debian/patches/01-plexus-compatibility.patch b/debian/patches/01-plexus-compatibility.patch new file mode 100644 index 0000000..b9d3ac2 --- /dev/null +++ b/debian/patches/01-plexus-compatibility.patch @@ -0,0 +1,20 @@ +--- a/src/main/java/org/jvnet/maven/plugin/antrun/components/AntTargetConverter.java ++++ b/src/main/java/org/jvnet/maven/plugin/antrun/components/AntTargetConverter.java +@@ -148,7 +148,7 @@ + wrapper.addText( childConfiguration.getValue() ); + } + } +- catch ( PlexusConfigurationException e ) ++ catch ( Exception e ) + { + throw new ComponentConfigurationException( "Error reading text value from element '" + + childConfiguration.getName() + "'", e ); +@@ -163,7 +163,7 @@ + String v = childConfiguration.getAttribute( attrNames[a] ); + wrapper.setAttribute( attrNames[a], v ); + } +- catch ( PlexusConfigurationException e ) ++ catch ( Exception e ) + { + throw new ComponentConfigurationException( "Error getting attribute '" + attrNames[a] + + "' of tag '" + childConfiguration.getName() + "'", e ); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..993906f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-plexus-compatibility.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-antrun-extended-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
