[gradle] 01/01: Rebuild for jessie-backports
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 26 09:00:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch jessie-backports
in repository gradle.
commit f7a29a07970e304e5def5b33cdbfaab61ca279c5
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 417d367..2254447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gradle (2.5-3~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 26 Nov 2015 09:40:13 +0100
+
gradle (2.5-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index c0f0a4f..900bc79 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: ant,
docbook-xsl,
findbugs,
gradle (>= 1.5),
- groovy2 (>= 2.3.10),
+ groovy2,
groovy2-doc,
ivy,
javahelper,
@@ -49,7 +49,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,
@@ -99,7 +98,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,
@@ -157,7 +156,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,
@@ -167,6 +165,7 @@ Depends: bnd,
libservlet2.5-java,
libtomcat7-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 34dbb83..2260c51 100644
--- a/debian/patches/disable_buildSrc_tests.diff
+++ b/debian/patches/disable_buildSrc_tests.diff
@@ -5,14 +5,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 a3c3ea4..1e96344 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,7 +20,4 @@ nekohtml.diff
relax_warnings.diff
disable_java9.diff
maven_testng.diff
-eclipse-aether.diff
-maven-aether-provider.diff
-maven_builder_support.diff
use-bndlib-1.50.0.patch
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index a3fb99f..e7c75de 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 = [
@@ -210,11 +212,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 {
@@ -227,8 +228,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