[gradle] 01/01: Rebuild for jessie-backports
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Dec 30 17:02:59 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/2.7-1_bpo8+1
in repository gradle.
commit f97c857ddb63217b8ffd6fefaecf54937e65aba8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 26 09:41:59 2015 +0100
Rebuild for jessie-backports
---
debian/changelog | 6 ++++++
debian/control | 7 +++----
debian/gbp.conf | 2 ++
debian/patches/disable_buildSrc_tests.diff | 8 ++++----
debian/patches/series | 3 ---
debian/patches/use_local_artifacts.diff | 29 ++++++++++++++---------------
6 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f4f68f3..c1303fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gradle (2.7-1~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 30 Dec 2015 15:12:05 +0100
+
gradle (2.7-1) unstable; urgency=low
[ Kai-Chung Yan ]
diff --git a/debian/control b/debian/control
index 6514ca8..e83ba58 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: ant,
docbook-xsl,
findbugs,
gradle (>= 2.5),
- groovy2 (>= 2.3.10),
+ groovy2,
groovy2-doc,
ivy,
javahelper,
@@ -52,7 +52,6 @@ Build-Depends: ant,
libjs-jquery,
libkryo-java,
liblogback-java,
- libmaven3-core-java (>= 3.3.3),
libnative-platform-java (>= 0.10),
libnekohtml-java,
libobjenesis-java,
@@ -103,7 +102,7 @@ Description: Powerful build system for the JVM
Package: libgradle-core-java
Architecture: all
Depends: ant,
- groovy2 (>= 2.3.10),
+ groovy2,
ivy,
libasm4-java (>= 5),
libatinject-jsr330-api-java,
@@ -161,7 +160,6 @@ Depends: bnd,
libjetty-java,
libjetty-extra-java,
libjs-jquery,
- libmaven3-core-java (>= 3.3.3),
libobjenesis-java,
libplexus-containers1.5-java,
libplexus-interpolation-java,
@@ -171,6 +169,7 @@ Depends: bnd,
libservlet3.1-java,
libtomcat8-java,
libxerces2-java,
+ maven,
testng,
${misc:Depends}
Breaks: libgradle-announce-java,
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..020d8fd
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch = jessie-backports
diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff
index 9ab63c9..be9c0a4 100644
--- a/debian/patches/disable_buildSrc_tests.diff
+++ b/debian/patches/disable_buildSrc_tests.diff
@@ -7,14 +7,14 @@ 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, )@jar'
- compile 'commons-lang:commons-lang:2.6 at jar'
+ compile 'com.google.guava:guava:debian at jar'
+ compile 'commons-lang:commons-lang:debian at jar'
compile localGroovy()
- testCompile 'junit:junit:4.12 at jar'
- testCompile 'org.spockframework:spock-core:0.7-groovy-2.0 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
- compile "org.pegdown:pegdown:[1.1.0, )"
- compile "org.jsoup:jsoup:1.6.3"
+ compile "org.pegdown:pegdown:debian"
+ compile "org.jsoup:jsoup:debian"
@@ -42,3 +40,15 @@
apply from: '../gradle/compile.gradle'
apply from: '../gradle/taskOrdering.gradle'
diff --git a/debian/patches/series b/debian/patches/series
index 11121d0..d67b5d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,9 +16,6 @@ jcommander.diff
nekohtml.diff
relax_warnings.diff
disable_java9.diff
-eclipse-aether.diff
-maven-aether-provider.diff
-maven_builder_support.diff
use-bndlib-1.50.0.patch
generate_classpath.diff
generate_pom.diff
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 6960a0f..c1b40b0 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -33,21 +33,23 @@ Last-Update: 2015-07-08
dependencies {
compile gradleApi()
- compile 'com.google.guava:guava-jdk5:14.0.1 at jar'
-+ compile 'com.google.guava:guava:[14.0.1, )@jar'
- compile 'commons-lang:commons-lang:2.6 at jar'
+- compile 'commons-lang:commons-lang:2.6 at jar'
++ compile 'com.google.guava:guava:debian at jar'
++ compile 'commons-lang:commons-lang:debian at jar'
compile localGroovy()
testCompile 'junit:junit:4.12 at jar'
testCompile 'org.spockframework:spock-core:0.7-groovy-2.0 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
- compile "org.pegdown:pegdown:1.1.0"
-+ compile "org.pegdown:pegdown:[1.1.0, )"
- compile "org.jsoup:jsoup:1.6.3"
+- compile "org.jsoup:jsoup:1.6.3"
++ compile "org.pegdown:pegdown:debian"
++ compile "org.jsoup:jsoup:debian"
//below dependency was deployed to the repo.gradle.org
//it's built from sources at: https://github.com/szczepiq/jarjar
//if code changes are needed in this library we need to figure out a better way of distributing them.
- compile "org.gradle.jarjar:jarjar:1.2.1"
-+ compile "com.googlecode.jarjar:jarjar:[1.2.1, )"
++ compile "com.googlecode.jarjar:jarjar:debian"
}
apply from: '../gradle/compile.gradle'
apply from: '../gradle/taskOrdering.gradle'
@@ -184,11 +186,11 @@ Last-Update: 2015-07-08
- dependency "org.sonatype.aether:aether-spi:1.13.1 at jar"
- dependency "org.sonatype.aether:aether-util:1.13.1 at jar"
- dependency 'org.sonatype.aether:aether-connector-wagon:1.13.1 at jar'
-+ dependency "org.eclipse.aether:eclipse-aether-api"
-+ dependency "org.eclipse.aether:eclipse-aether-impl"
-+ dependency "org.eclipse.aether:eclipse-aether-spi"
-+ dependency "org.eclipse.aether:eclipse-aether-util"
-+ dependency 'org.eclipse.aether:eclipse-aether-connector-basic'
++ dependency "org.sonatype.aether:aether-api"
++ dependency "org.sonatype.aether:aether-impl"
++ dependency "org.sonatype.aether:aether-spi"
++ dependency "org.sonatype.aether:aether-util"
++ dependency 'org.sonatype.aether:aether-connector-wagon'
}
libraries.spock = [
@@ -221,11 +223,10 @@ Last-Update: 2015-07-08
dependency libraries.bouncycastle_provider
}
-@@ -169,16 +169,4 @@
- 'com.fasterxml.jackson.core:jackson-core:2.3.2 at jar',
+@@ -170,15 +170,3 @@
'com.fasterxml.jackson.core:jackson-annotations:2.3.2 at jar',
'com.fasterxml.jackson.core:jackson-databind:2.3.2 at jar'
--] + libraries.commons_httpclient + libraries.joda
+ ] + libraries.commons_httpclient + libraries.joda
-
-allprojects {
- configurations.all {
@@ -238,8 +239,6 @@ Last-Update: 2015-07-08
- }
- }
-}
-+] + libraries.commons_httpclient + libraries.joda
-\ No newline at end of file
--- a/subprojects/jetty/jetty.gradle
+++ b/subprojects/jetty/jetty.gradle
@@ -31,14 +31,12 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list