[gradle] 56/81: Update package dependencies
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jun 17 13:34:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit daeb21b86b1499a3fd0ff878c699a29c1771f1c9
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Wed Jun 10 20:41:19 2015 +0800
Update package dependencies
---
debian/changelog | 1 +
debian/control | 131 ++++++++++++++------------------
debian/libgradle-core-java.jlibs | 1 +
debian/libgradle-plugins-java.jlibs | 3 +-
debian/patches/use_local_artifacts.diff | 28 +++++++
debian/rules | 2 +-
6 files changed, 90 insertions(+), 76 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fbd8da3..e308ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low
* Move jars between packages
- gradle-cli.jar from gradle to libgradle-core-java
- gradle-open-api.jar from gradle to libgradle-core-java
+ - gradle-plugins.jar from libgradle-plugins-java to libgradle-core-java
- gradle-messaging.jar from gradle to libgradle-core-java
- gradle-native.jar from gradle to libgradle-core-java
- gradle-tooling-api.jar from gradle to libgradle-core-java
diff --git a/debian/control b/debian/control
index 0287405..6c5edfd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,80 +4,64 @@ Uploaders: Miguel Landaeta <miguel at miguel.cc>,
Damien Raude-Morvan <drazzib at debian.org>
Section: java
Priority: optional
-Build-Depends: ant (>= 1.8),
- ant-optional (>= 1.8),
+Build-Depends: ant,
+ ant-optional,
bnd (>= 2.1.0),
- checkstyle (>= 5.1),
debhelper (>= 9),
default-jdk (>= 1:1.6),
- default-jdk-doc,
docbook-xsl,
gradle (>= 1.5),
- groovy (>= 1.8),
- groovy-doc,
- ivy (>= 2.3),
+ groovy,
+ ivy,
javahelper,
junit4,
- libaether-java,
libantlr-java,
libasm4-java (>= 5),
+ libatinject-jsr330-api-java,
libbintray-client-java (>= 0.8.1),
libbcpg-java,
- libbcprov-java,
libclassycle-java,
- libcodenarc-groovy-java (>= 0.17),
libcommons-cli-java,
- libcommons-codec-java,
libcommons-collections3-java,
libcommons-io-java,
- libcore-renderer-java,
+ libcommons-lang-java (>= 2.6),
libdom4j-java,
- libecj-java,
- libgmetrics-groovy-java,
libgoogle-gson-java,
- libgradle-plugins-java,
libguava-java,
- libhttpclient-java (>= 4.2.1),
- libjaffl-java (>= 0.5.9-2),
+ libhttpclient-java,
+ libhttpcore-java,
libjansi-java,
- libjarjar-java (>= 1.4+svn142),
+ libjarjar-java,
libjatl-java,
- libjaxen-java,
+ libjaxon-java,
+ libjetty-java,
+ libjetty-extra-java,
libjcifs-java,
libjcip-annotations-java,
- libjetty-extra-java,
- libjetty-java,
+ libjsch-java,
+ libjsoup-java,
libjmock2-java,
libjna-java,
- libjnr-posix-java (>= 1.1.8),
- libjoda-time-java,
+ libjna-posix-java,
libjs-jquery,
- libjsch-java,
- libjsr305-java,
libkryo-java,
- liblogback-java (>= 1:0.9.28),
+ liblogback-java,
libmaven-ant-tasks-java,
- libmina2-java,
libnative-platform-java (>= 0.10),
libnekohtml-java,
- libplexus-cipher-java,
+ libpegdown-java,
libplexus-containers1.5-java,
- libplexus-interpolation-java,
- libplexus-sec-dispatcher-java,
- libplexus-utils2-java,
libpolyglot-maven-java,
- libreflectasm-java,
librhino-java,
libservlet2.5-java,
- libslf4j-java (>= 1.7.2),
- libspock-java (>= 0.6-groovy-1.8-3~),
+ libsimple-http-java,
+ libslf4j-java,
+ libspock-java,
libtomcat7-java,
- libwagon2-java,
libxalan2-java,
+ libxbean-java,
libxerces2-java,
- libxmlunit-java,
- libxslthl-java,
- maven (>= 3.0.4-4),
+ maven (>= 3),
quilt,
testng
Build-Conflicts: groovy (>= 2.0.0~)
@@ -88,21 +72,18 @@ Homepage: http://gradle.org
Package: gradle
Architecture: all
-Depends: ant (>= 1.8),
- default-jre-headless (>= 1:1.6),
+Depends: default-jre-headless (>= 1:1.6),
+ groovy (>= 1.8),
+ junit4,
+ libcommons-io-java,
libdom4j-java,
libgradle-core-java (>= ${binary:Version}),
libgradle-plugins-java (>= ${binary:Version}),
- libjaffl-java (>= 0.5.9-2),
libjaxen-java,
- libjna-java,
- libjnr-posix-java (>= 1.1.8),
- libkryo-java,
- libnative-platform-java,
- libwagon-java,
+ libslf4j-java,
${misc:Depends}
Replaces: libgradle-core-java (<< 1.12)
-Recommends: findbugs,
+Recommends: libcodenarc-groovy-java,
scala
Suggests: gradle-doc (>= ${binary:Version})
Description: Groovy based build system
@@ -117,33 +98,34 @@ Package: libgradle-core-java
Architecture: all
Depends: ant,
groovy (>= 1.8),
- ivy (>= 2.3),
- libasm4-java,
- libbintray-client-java,
- libcommons-codec-java,
+ ivy,
+ libasm4-java (>= 5),
+ libatinject-jsr330-api-java,
+ libbintray-client-java (>= 0.8.1),
+ libcommons-cli-java,
libcommons-collections3-java,
libcommons-io-java,
- libcommons-lang-java,
+ libcommons-lang-java (>= 2.6),
libguava-java,
- libhttpclient-java (>= 4.2.1),
+ libhttpclient-java,
+ libhttpcore-java,
libjansi-java,
libjarjar-java,
libjcifs-java,
libjcip-annotations-java,
+ libjna-java,
+ libjna-posix-java,
libjsch-java,
- liblogback-java (>= 1:0.9.28),
+ libkryo-java,
+ liblogback-java,
libmaven-ant-tasks-java,
+ libnative-platform-java (>= 0.10),
libnekohtml-java,
- libplexus-cipher-java,
- libplexus-containers1.5-java,
- libplexus-interpolation-java,
- libplexus-sec-dispatcher-java,
- libplexus-utils2-java,
- libpolyglot-maven-java,
libslf4j-java,
+ libxbean-java,
libxerces2-java,
- libxml-commons-external-java,
- maven (>= 3.0.4-4),
+ maven (>= 3),
+ testng,
${misc:Depends}
Breaks: libgradle-wrapper-java (<< 1.3~)
Replaces: libgradle-wrapper-java (<< 1.3~),
@@ -162,27 +144,29 @@ Description: Groovy based build system - Core library
Package: libgradle-plugins-java
Architecture: all
-Depends: ant-optional (>= 1.8),
+Depends: ant-optional,
bnd (>= 2.1.0),
- checkstyle (>= 5.1),
- junit4,
+ findbugs,
+ groovy,
libantlr-java,
+ libatinject-jsr330-api-java,
libbcpg-java,
- libbcprov-java,
- libcodenarc-groovy-java (>= 0.17),
- libcommons-cli-java,
- libecj-java,
- libgmetrics-groovy-java,
+ libdom4j-java,
libgoogle-gson-java,
libgradle-core-java (>= ${binary:Version}),
libjatl-java,
- libjetty-extra-java,
+ libjaxon-java,
libjetty-java,
+ libjetty-extra-java,
+ libmaven-ant-tasks-java,
+ libplexus-containers1.5-java,
+ libpolyglot-maven-java,
librhino-java,
libservlet2.5-java,
- testng,
+ libsimple-http-java,
+ libslf4j-java,
+ libtomcat7-java,
${misc:Depends}
-Suggests: scala
Breaks: libgradle-announce-java (<< 1.3~),
libgradle-antlr-java (<< 1.3~),
libgradle-code-quality-java (<< 1.3~),
@@ -211,6 +195,7 @@ Replaces: libgradle-announce-java (<< 1.3~),
libgradle-osgi-java (<< 1.3~),
libgradle-scala-java (<< 1.3~),
libgradle-signing-java (<< 1.3~)
+ libgradle-core-java (<< 1.12)
Description: Groovy based build system - All plugins
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs
index c73405a..a969b50 100644
--- a/debian/libgradle-core-java.jlibs
+++ b/debian/libgradle-core-java.jlibs
@@ -6,4 +6,5 @@ subprojects/base-services/build/libs/*.jar
subprojects/base-services-groovy/build/libs/*.jar
subprojects/messaging/build/libs/*.jar
subprojects/native/build/libs/*.jar
+subprojects/plugins/build/libs/*.jar
subprojects/tooling-api/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/libgradle-plugins-java.jlibs b/debian/libgradle-plugins-java.jlibs
index 697632e..6ba58e0 100644
--- a/debian/libgradle-plugins-java.jlibs
+++ b/debian/libgradle-plugins-java.jlibs
@@ -1,6 +1,5 @@
subprojects/announce/build/libs/*.jar
subprojects/antlr/build/libs/*.jar
-subprojects/announce/build/libs/*.jar
subprojects/build-comparison/build/libs/*.jar
subprojects/build-init/build/libs/*.jar
subprojects/code-quality/build/libs/*.jar
@@ -16,9 +15,9 @@ subprojects/language-base/build/libs/*.jar
subprojects/language-jvm/build/libs/*.jar
subprojects/maven/build/libs/*.jar
subprojects/osgi/build/libs/*.jar
-subprojects/plugins/build/libs/*.jar
subprojects/publish/build/libs/*.jar
subprojects/reporting/build/libs/*.jar
subprojects/resources/build/libs/*.jar
+subprojects/scala/build/libs/*.jar
subprojects/signing/build/libs/*.jar
subprojects/wrapper/build/libs/*.jar
\ No newline at end of file
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 0e1e057..2f1f6a9 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -107,6 +107,21 @@ Last-Update: 2015-05-24
//eather:
dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
+@@ -141,11 +141,11 @@
+ 'cglib:cglib-nodep:2.2.2'
+ ]
+ libraries.jmock = [
+- 'org.jmock:jmock:2.5.1',
++ 'jmock:jmock:[2.5.1, )',
+ 'org.hamcrest:hamcrest-core:1.3',
+ 'org.hamcrest:hamcrest-library:1.3',
+- dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
+- 'org.jmock:jmock-legacy:2.5.1',
++ dependencies.create('jmock:jmock-junit4:[2.5.1, )') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
++ 'jmock:jmock-legacy:[2.5.1, )',
+ libraries.objenesis,
+ 'cglib:cglib-nodep:2.2'
+ ]
--- a/subprojects/core-impl/core-impl.gradle
+++ b/subprojects/core-impl/core-impl.gradle
@@ -16,6 +16,7 @@
@@ -144,3 +159,16 @@ Last-Update: 2015-05-24
useTestFixtures()
\ No newline at end of file
+--- a/subprojects/code-quality/code-quality.gradle
++++ b/subprojects/code-quality/code-quality.gradle
+@@ -26,8 +26,8 @@
+
+ // minimal dependencies to make our code compile
+ // we don't ship these dependencies because findbugs plugin will download them (and more) at runtime
+- provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
+- provided "com.google.code.findbugs:bcel:2.0.1 at jar"
++ provided "com.google.code.findbugs:findbugs:[2.0.1, )@jar"
++ provided "org.apache.bcel:findbugs-bcel:[2.0.1, )@jar"
+ provided "dom4j:dom4j:1.6.1 at jar"
+ provided "jaxen:jaxen:1.1.1 at jar"
+ }
diff --git a/debian/rules b/debian/rules
index 8933649..214fed6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
UPSTREAM_VERSION := $(shell cat version.txt)
-SUBPROJECTS_LIST := announce antlr baseServices baseServicesGroovy buildComparison buildInit cli codeQuality core coreImpl cpp diagnostics ear ide ivy jacoco javascript jetty languageBase languageJvm launcher native openApi osgi plugins publish maven messaging reporting resources signing toolingApi ui wrapper
+SUBPROJECTS_LIST := announce antlr baseServices baseServicesGroovy buildComparison buildInit cli codeQuality core coreImpl cpp diagnostics ear ide ivy jacoco javascript jetty languageBase languageJvm launcher native openApi osgi plugins publish maven messaging reporting resources scala signing toolingApi ui wrapper
GRADLE_TASKS := $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):assemble)
GRADLE_TASKS += $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):javadoc)
GRADLE_TASKS += $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):groovydoc)
--
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