This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit e0536ccab78c9e26f044483a0b06c2d381318e40 Author: Emmanuel Bourg <[email protected]> Date: Thu Nov 9 02:27:09 2017 +0100 Fixed the 'Cannot find JAR' error with plexus-component-annotations 1.7.1-6 --- debian/changelog | 1 + debian/control | 2 +- debian/patches/maven-3.3-compatibility.patch | 2 +- debian/patches/use_local_artifacts.diff | 3 +-- debian/substituteDependencies.gradle | 6 +----- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5db6288..04baab6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gradle (3.2.1-4) UNRELEASED; urgency=medium * Team upload. + * Fixed the 'Cannot find JAR' error with plexus-component-annotations 1.7.1-6 * Depend on libxbean-reflect-java instead of libxbean-java * Standards-Version updated to 4.1.1 diff --git a/debian/control b/debian/control index 961abc2..437a998 100644 --- a/debian/control +++ b/debian/control @@ -56,7 +56,7 @@ Build-Depends: ant, libnekohtml-java, libobjenesis-java, libpegdown-java, - libplexus-component-annotations-java, + libplexus-component-annotations-java (>= 1.7.1-6~), libplexus-container-default1.5-java, libplexus-interpolation-java, libplexus-utils-java, diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch index c80929d..6609603 100644 --- a/debian/patches/maven-3.3-compatibility.patch +++ b/debian/patches/maven-3.3-compatibility.patch @@ -6,7 +6,7 @@ Forwarded: no @@ -109,9 +109,15 @@ dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar" - dependency "org.codehaus.plexus:plexus-component-annotations-1.5:1.6@jar" + dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar" - dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar" dependency "org.codehaus.plexus:plexus-classworlds2:2.x@jar" diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index c9576ce..e741e34 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -123,8 +123,7 @@ Last-Update: 2016-10-20 //plexus: dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar" -- dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar" -+ dependency "org.codehaus.plexus:plexus-component-annotations-1.5:1.6@jar" + dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar" dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar" - dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar" + dependency "org.codehaus.plexus:plexus-classworlds2:2.x@jar" diff --git a/debian/substituteDependencies.gradle b/debian/substituteDependencies.gradle index 35acdc8..583f553 100644 --- a/debian/substituteDependencies.gradle +++ b/debian/substituteDependencies.gradle @@ -4,11 +4,7 @@ configurations.all { def dependency = details.requested if (dependency.group == 'org.gradle') return if (dependency.version.contains('.x')) return - if (dependency.group == 'org.codehaus.plexus' && - dependency.name == 'plexus-component-annotations-1.5') { - return - } details.useVersion 'debian' } } -} \ No newline at end of file +} -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
