[gradle] 01/01: Rebuild for jessie-backports

Mon Apr 18 06:31:53 UTC 2016

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/2.10-2_bpo8+1
in repository gradle.

commit cdf2f226a22a42dd8315b83e463a5a932ab23ef7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Apr 18 01:42:57 2016 +0200

    Rebuild for jessie-backports
---
 debian/changelog                           |  6 ++++
 debian/control                             |  6 ++--
 debian/patches/disable_buildSrc_tests.diff | 33 ++++++++++++++++++
 debian/patches/series                      |  2 ++
 debian/patches/use-bndlib-1.50.0.patch     | 55 ++++++++++++++++++++++++++++++
 debian/patches/use_local_artifacts.diff    |  3 +-
 6 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd44cb5..42913ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gradle (2.10-2~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 17 Apr 2016 23:46:02 +0200
+
 gradle (2.10-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index d4c5f63..786fc8e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Miguel Landaeta <miguel at miguel.cc>,
 Section: java
 Priority: optional
 Build-Depends: ant,
-               bnd (>= 2.1.0),
+               bnd,
                checkstyle,
                debhelper (>= 9),
                default-jdk (>= 1:1.6),
@@ -65,7 +65,7 @@ Build-Depends: ant,
                librhino-java,
                libservlet3.1-java,
                libslf4j-java,
-               libspock-java (>= 0.7),
+               libspock-java,
                libtomcat8-java,
                libxalan2-java,
                libxbean-java,
@@ -146,7 +146,7 @@ Description: Powerful build system for the JVM - Core libraries
 
 Package: libgradle-plugins-java
 Architecture: all
-Depends: bnd (>= 2.1.0),
+Depends: bnd,
          findbugs,
          junit4,
          libantlr-java,
diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff
new file mode 100644
index 0000000..4c3f81a
--- /dev/null
+++ b/debian/patches/disable_buildSrc_tests.diff
@@ -0,0 +1,33 @@
+Description:
+  Runing a build scripts always run the tests of buildSrc, which produces
+  error because current version of Spock Framework (0.6-groovy-1.8) is not
+  compatible with Groovy 2.
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-06-03
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -28,8 +28,6 @@
+     compile 'com.google.guava:guava:[14.0.1, )'
+     compile 'commons-lang:commons-lang:2.6 at jar'
+     compile localGroovy()
+-    testCompile 'junit:junit:4.12 at jar'
+-    testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib3-nodep', 'org.objenesis:objenesis:1.2'
+ 
+     compile "org.pegdown:pegdown:[1.1.0, )"
+     compile "org.jsoup:jsoup:1.6.3"
+@@ -42,3 +40,15 @@
+ apply from: '../gradle/compile.gradle'
+ apply from: '../gradle/taskOrdering.gradle'
+ apply from: '../gradle/classycle.gradle'
++
++// Disable buildSrc tests
++sourceSets {
++    test {
++        groovy {
++            exclude "**"
++        }
++        resources {
++            exclude "**"
++        }
++    }
++}
diff --git a/debian/patches/series b/debian/patches/series
index b0ccea3..8bcb352 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 use_local_artifacts.diff
 34_disable_code_quality.diff
+disable_buildSrc_tests.diff
 30_envjs.diff
 33_scala_zinc.diff
 disable_tests.diff
@@ -12,6 +13,7 @@ jcommander.diff
 nekohtml.diff
 relax_warnings.diff
 eclipse-aether.diff
+use-bndlib-1.50.0.patch
 generate_classpath.diff
 generate_pom.diff
 ivy-2.4.0.patch
diff --git a/debian/patches/use-bndlib-1.50.0.patch b/debian/patches/use-bndlib-1.50.0.patch
new file mode 100644
index 0000000..678bc2e
--- /dev/null
+++ b/debian/patches/use-bndlib-1.50.0.patch
@@ -0,0 +1,55 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Tue, 14 Jul 2015 13:57:27 +0200
+Subject: use bndlib 1.50.0
+
+Use bnd 1.50.0 from Debian Sid for the time being. Switch back as soon as the
+bnd2 transition is complete. Thanks to Fedora.
+http://pkgs.fedoraproject.org/cgit/gradle.git/plain/0003-Use-bndlib-1.50.0.patch
+
+Forwarded: not needed
+--- a/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java
++++ b/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/ContainedVersionAnalyzer.java
+@@ -16,7 +16,7 @@
+ 
+ package org.gradle.api.internal.plugins.osgi;
+ 
+-import aQute.bnd.osgi.Analyzer;
++import aQute.lib.osgi.Analyzer;
+ 
+ public class ContainedVersionAnalyzer extends Analyzer {
+-}
+\ No newline at end of file
++}
+--- a/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java
++++ b/subprojects/osgi/src/main/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifest.java
+@@ -15,7 +15,7 @@
+  */
+ package org.gradle.api.internal.plugins.osgi;
+ 
+-import aQute.bnd.osgi.Analyzer;
++import aQute.lib.osgi.Analyzer;
+ import org.gradle.api.file.FileCollection;
+ import org.gradle.api.internal.file.FileResolver;
+ import org.gradle.api.java.archives.Attributes;
+--- a/subprojects/osgi/src/test/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy
++++ b/subprojects/osgi/src/test/groovy/org/gradle/api/internal/plugins/osgi/DefaultOsgiManifestTest.groovy
+@@ -15,7 +15,7 @@
+  */
+ package org.gradle.api.internal.plugins.osgi
+ 
+-import aQute.bnd.osgi.Analyzer
++import aQute.lib.osgi.Analyzer
+ import org.gradle.api.file.FileCollection
+ import org.gradle.api.internal.file.FileResolver
+ import org.gradle.api.java.archives.Attributes
+--- a/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -30,7 +30,7 @@
+ }
+ 
+ libraries.asm =  'org.ow2.asm:asm4-all'
+-libraries.bndlib = dependencies.module('biz.aQute.bnd:bndlib:2.4.0')
++libraries.bndlib = dependencies.module('biz.aQute:bndlib:debian')
+ libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
+ libraries.commons_io = dependencies.module(versions.commons_io)
+ libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 9b54a10..32c08a1 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -65,8 +65,9 @@ Last-Update: 2015-07-08
  libraries.commons_io = dependencies.module(versions.commons_io)
  libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
 -libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
+-libraries.jsch = "com.jcraft:jsch:0.1.53"
 +libraries.commons_collections = 'commons-collections:commons-collections3'
- libraries.jsch = "com.jcraft:jsch:0.1.53"
++libraries.jsch = "com.jcraft:jsch:debian"
  libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
      dependency libraries.jsch
  }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git

