[gradle-1.12] 65/211: New upstream release (Closes: #667077).
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:07 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-1.12.
commit cd5187589a7756fdbaff07ead26796f8dce208fe
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun Nov 25 19:38:20 2012 +0100
New upstream release (Closes: #667077).
* New upstream release (Closes: #667077).
* d/control: Add myself as Uploader.
* d/control: Depends and B-D on new groovy (>= 1.8) (Closes: #637273).
* Update all patches for new Gradle 1.1:
- Drop d/patches/12_fix_missing_classpath.diff since its not needed anymore.
* d/control: Replace B-D on libcommons-httpclient-java to libhttpclient-java.
* d/control: Replace B-D on libgoogle-collections-java to libguava-java.
* d/control: Add B-D on libjarjar-java,
libjcifs-java, libjcip-annotations-java.
* d/control: Drop B-D on libjoptsimple-java and libjzlib-java.
* d/control: Replace B-D on maven (>= 3.0.4-4) instead of libmaven2-*.
* d/bootstrap.sh: Update to Gradle 1.1 and add Provides for libraries.
* Bump Standards-Version to 3.9.3: no changes needed.
* Generate documentation:
- d/patches/21_docs.diff: Fix links in docbook files.
- Add B-D on docbook-xsl for documentation export.
- Add B-D on libxalan2-java, libxerces2-java, libxslthl-java
and libcore-renderer-java.
* Enable new modules module cpp, ear, javascript, signing:
- Add B-D on libbcpg-java and libbcprov-java.
- Add B-D on librhino-java, libgoogle-gson-java.
* Tomcat 6 / 7 compatibility (Closes: #683595):
- Depends in libservlet2.5-java and libecj-java instead of libtomcat6-java.
* Include new d/watch from Bart Martens <bartm at debian.org>.
---
debian/bootstrap.sh | 11 +-
debian/changelog | 33 +-
debian/control | 290 +++++++++---
debian/gradle-doc.docs | 2 +
debian/gradle.install | 14 +-
debian/gradle.links | 65 +--
debian/libgradle-antlr-java.links | 2 +
debian/libgradle-code-quality-java.links | 3 +
debian/libgradle-core-java.jlibs | 1 +
debian/libgradle-core-java.links | 45 ++
debian/libgradle-cpp-java.jlibs | 1 +
debian/libgradle-ear-java.jlibs | 1 +
debian/libgradle-javascript-java.jlibs | 1 +
debian/libgradle-javascript-java.links | 2 +
debian/libgradle-jetty-java.links | 8 +
debian/libgradle-osgi-java.links | 1 +
debian/libgradle-plugins-java.links | 3 +
debian/libgradle-signing-java.jlibs | 1 +
debian/libgradle-signing-java.links | 2 +
debian/patches/01_use_debian_jars.diff | 519 +++++++++++++--------
debian/patches/02_sonar.diff | 73 ++-
debian/patches/03_plexus.diff | 9 +-
debian/patches/04_webdavlib.diff | 42 --
debian/patches/05_polyglot_maven.diff | 101 ----
debian/patches/10_fix_version.diff | 16 -
debian/patches/11_fix_jni_path.diff | 46 +-
debian/patches/12_fix_missing_classpath.diff | 32 --
debian/patches/13_fix_javadocs_links.diff | 30 +-
debian/patches/21_docs.diff | 207 +++++---
debian/patches/22_checkstyle.diff | 25 -
.../23_replace_jna-posix_with_jnr-posix.diff | 158 +++++--
debian/patches/24_pegdown.diff | 102 ++++
debian/patches/26_disable_commitid.diff | 33 ++
debian/patches/27_maven.diff | 55 +++
debian/patches/28_findbugs.diff | 66 +++
debian/patches/30_envjs.diff | 24 +
debian/patches/31_hamcrest_12.diff | 25 +
debian/patches/32_disable_it.diff | 47 ++
debian/patches/series | 12 +-
debian/rules | 27 +-
debian/watch | 4 +-
41 files changed, 1413 insertions(+), 726 deletions(-)
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 4c7a5c6..5cad40f 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -2,11 +2,10 @@
set -e
-URL="http://services.gradle.org/distributions/gradle-1.0-bin.zip"
-#URL="http://localhost/%7Emiguel/gradle/gradle-1.0-bin.zip"
+URL="http://services.gradle.org/distributions/gradle-1.1-bin.zip"
ZIP="$(basename $URL)"
DIR="$(echo $ZIP | sed 's/-bin\.zip$//')"
-VERSION="1.0~+bootstrap1"
+VERSION="1.1+bootstrap"
wget $URL -O $ZIP
unzip $ZIP
@@ -23,6 +22,12 @@ Version: $VERSION
Architecture: all
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Depends: default-jre-headless
+Provides: libgradle-code-quality-java,
+ libgradle-ide-java,
+ libgradle-ear-java,
+ libgradle-maven-java,
+ libgradle-wrapper-java,
+ libgradle-scala-java
Section: java
Priority: optional
Homepage: http://gradle.org/
diff --git a/debian/changelog b/debian/changelog
index db3e49f..28b65c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,36 @@
-gradle (1.0-1) UNRELEASED; urgency=low
+gradle (1.1-1) UNRELEASED; urgency=low
- * New upstream release.
+ * New upstream release (Closes: #667077).
+
+ [ Miguel Landaeta ]
* Replace dependencies on jna-posix library with jnr-posix. (Closes: #628662).
- -- Miguel Landaeta <miguel at miguel.cc> Mon, 02 Jul 2012 20:34:46 -0430
+ [ Damien Raude-Morvan ]
+ * d/control: Add myself as Uploader.
+ * d/control: Depends and B-D on new groovy (>= 1.8) (Closes: #637273).
+ * Update all patches for new Gradle 1.1:
+ - Drop d/patches/12_fix_missing_classpath.diff since its not needed anymore.
+ * d/control: Replace B-D on libcommons-httpclient-java to libhttpclient-java.
+ * d/control: Replace B-D on libgoogle-collections-java to libguava-java.
+ * d/control: Add B-D on libjarjar-java,
+ libjcifs-java, libjcip-annotations-java.
+ * d/control: Drop B-D on libjoptsimple-java and libjzlib-java.
+ * d/control: Replace B-D on maven (>= 3.0.4-4) instead of libmaven2-*.
+ * d/bootstrap.sh: Update to Gradle 1.1 and add Provides for libraries.
+ * Bump Standards-Version to 3.9.3: no changes needed.
+ * Generate documentation:
+ - d/patches/21_docs.diff: Fix links in docbook files.
+ - Add B-D on docbook-xsl for documentation export.
+ - Add B-D on libxalan2-java, libxerces2-java, libxslthl-java
+ and libcore-renderer-java.
+ * Enable new modules module cpp, ear, javascript, signing:
+ - Add B-D on libbcpg-java and libbcprov-java.
+ - Add B-D on librhino-java, libgoogle-gson-java.
+ * Tomcat 6 / 7 compatibility (Closes: #683595):
+ - Depends in libservlet2.5-java and libecj-java instead of libtomcat6-java.
+ * Include new d/watch from Bart Martens <bartm at debian.org>.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sat, 01 Sep 2012 00:49:07 +0200
gradle (1.0~m3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index bedfd90..15ca818 100644
--- a/debian/control
+++ b/debian/control
@@ -1,50 +1,106 @@
Source: gradle
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Miguel Landaeta <miguel at miguel.cc>
+Uploaders: Miguel Landaeta <miguel at miguel.cc>,
+ Damien Raude-Morvan <drazzib at debian.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 7.0.50~), default-jdk, javahelper, gradle,
- libgradle-code-quality-java, libgradle-ide-java, libgradle-maven-java,
- libgradle-wrapper-java, libgradle-scala-java, unzip, ant (>= 1.8),
- libantlr-java, libasm3-java, libcommons-cli-java, libcommons-io-java,
- libdom4j-java, libgoogle-collections-java (>= 1.0), groovy (>= 1.7.4), ivy,
- libjaxen-java, libjoptsimple-java, libslf4j-java, liblogback-java (>= 1:0.9.28),
- junit4, libxmlunit-java, libcommons-httpclient-java, libcommons-codec-java,
- libjsch-java, libjzlib-java, testng, libcommons-collections3-java,
- libmaven-ant-tasks-java, libjansi-java, libjnr-posix-java, libtomcat6-java,
- libplexus-containers-java, libmaven2-core-java, libplexus-component-api-java,
- libplexus-utils-java, libwagon-java, libcodenarc-groovy-java,
- checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd,
- libservlet2.5-java, libjetty-java, libjetty-extra-java, ant-optional (>= 1.8),
- default-jdk-doc, groovy-doc, libmaven2-core-java-doc
-Standards-Version: 3.9.2
+Build-Depends: ant (>= 1.8),
+ ant-optional (>= 1.8),
+ bnd,
+ checkstyle (>= 5.1),
+ debhelper (>= 7.0.50~),
+ default-jdk,
+ default-jdk-doc,
+ docbook-xsl,
+ gradle,
+ groovy (>= 1.8),
+ groovy-doc,
+ ivy,
+ javahelper,
+ junit4,
+ libantlr-java,
+ libasm3-java,
+ 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,
+ libdom4j-java,
+ libecj-java,
+ libgoogle-gson-java,
+ libgradle-code-quality-java,
+ libgradle-ear-java,
+ libgradle-ide-java,
+ libgradle-maven-java,
+ libgradle-scala-java,
+ libgradle-wrapper-java,
+ libguava-java,
+ libhttpclient-java (>= 4.2.1),
+ libjansi-java,
+ libjarjar-java,
+ libjaxen-java,
+ libjcifs-java,
+ libjcip-annotations-java,
+ libjetty-extra-java,
+ libjetty-java,
+ libjna-java,
+ libjnr-posix-java (>= 1.1.8~0),
+ libjsch-java,
+ liblogback-java (>= 1:0.9.28),
+ libmaven-ant-tasks-java,
+ libnekohtml-java,
+ libplexus-cipher-java,
+ libplexus-containers1.5-java,
+ libplexus-interpolation-java,
+ libplexus-sec-dispatcher-java,
+ libplexus-utils2-java,
+ libpolyglot-maven-java,
+ librhino-java,
+ libservlet2.5-java,
+ libslf4j-java,
+ libspock-java,
+ libwagon-java,
+ libxalan2-java,
+ libxerces2-java,
+ libxmlunit-java,
+ libxslthl-java,
+ maven (>= 3.0.4-4),
+ testng,
+ unzip
+Standards-Version: 3.9.3
Homepage: http://gradle.org/
Vcs-Git: git://git.debian.org/git/pkg-java/gradle.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/gradle.git
Package: gradle
Architecture: all
-Depends: default-jre-headless, groovy (>= 1.7.4), ant (>= 1.8),
- ant-optional (>= 1.8), libgradle-core-java (= ${binary:Version}),
- libgradle-plugins-java (= ${binary:Version}), libantlr-java, libasm3-java,
- libcommons-cli-java, libcommons-io-java, libdom4j-java,
- libgoogle-collections-java (>= 1.0), ivy, libjaxen-java, libjoptsimple-java,
- libslf4j-java, liblogback-java (>= 1:0.9.28), junit4, libtomcat6-java,
- libcommons-httpclient-java, libcommons-codec-java, libjsch-java, libjzlib-java,
- testng, libcommons-collections3-java, libmaven-ant-tasks-java, libjansi-java,
- libjnr-posix-java, libplexus-containers-java, libmaven2-core-java,
- libplexus-component-api-java, libwagon-java, libcodenarc-groovy-java,
- checkstyle (>= 5.1), libcommons-beanutils-java, libsvnkit-java, bnd, bsh,
- libservlet2.5-java, libjetty-java, libjetty-extra-java, ${misc:Depends}
+Depends: ant (>= 1.8),
+ default-jre-headless,
+ libdom4j-java,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ libjaxen-java,
+ libjna-java,
+ libjnr-posix-java (>= 1.1.8-1),
+ libwagon-java,
+ ${misc:Depends}
Recommends: libgradle-announce-java (= ${binary:Version}),
- libgradle-antlr-java (= ${binary:Version}),
- libgradle-code-quality-java (= ${binary:Version}),
- libgradle-ide-java (= ${binary:Version}),
- libgradle-jetty-java (= ${binary:Version}),
- libgradle-maven-java (= ${binary:Version}),
- libgradle-osgi-java (= ${binary:Version}),
- libgradle-scala-java (= ${binary:Version}),
- libgradle-wrapper-java (= ${binary:Version})
+ libgradle-antlr-java (= ${binary:Version}),
+ libgradle-code-quality-java (= ${binary:Version}),
+ libgradle-cpp-java (= ${binary:Version}),
+ libgradle-ear-java (= ${binary:Version}),
+ libgradle-ide-java (= ${binary:Version}),
+ libgradle-javascript-java (= ${binary:Version}),
+ libgradle-jetty-java (= ${binary:Version}),
+ libgradle-maven-java (= ${binary:Version}),
+ libgradle-osgi-java (= ${binary:Version}),
+ libgradle-scala-java (= ${binary:Version}),
+ libgradle-signing-java (= ${binary:Version}),
+ libgradle-wrapper-java (= ${binary:Version})
Description: Groovy based build system
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -55,12 +111,35 @@ Description: Groovy based build system
Package: libgradle-core-java
Architecture: all
-Depends: liblogback-java (>= 1:0.9.28), libgoogle-collections-java (>= 1.0),
- groovy, libjoptsimple-java, libcommons-collections3-java,
- libcommons-httpclient-java, libcommons-io-java, libcommons-lang-java, ivy,
- ant, libjansi-java, libasm3-java, libslf4j-java, libmaven-ant-tasks-java,
- libmaven2-core-java, libplexus-component-api-java, libplexus-utils-java,
- ${misc:Depends}
+Depends: ant,
+ groovy (>= 1.8),
+ ivy,
+ libasm3-java,
+ libcommons-codec-java,
+ libcommons-collections3-java,
+ libcommons-io-java,
+ libcommons-lang-java,
+ libguava-java,
+ libhttpclient-java (>= 4.2.1),
+ libjansi-java,
+ libjarjar-java,
+ libjcifs-java,
+ libjcip-annotations-java,
+ libjsch-java,
+ liblogback-java (>= 1:0.9.28),
+ libmaven-ant-tasks-java,
+ libnekohtml-java,
+ libplexus-cipher-java,
+ libplexus-containers1.5-java,
+ libplexus-interpolation-java,
+ libplexus-sec-dispatcher-java,
+ libplexus-utils2-java,
+ libpolyglot-maven-java,
+ libslf4j-java,
+ libxerces2-java,
+ libxml-commons-external-java,
+ maven (>= 3.0.4-4),
+ ${misc:Depends}
Recommends: gradle (= ${binary:Version})
Suggests: gradle-doc (= ${binary:Version})
Description: Groovy based build system - Core library
@@ -75,7 +154,9 @@ Description: Groovy based build system - Core library
Package: libgradle-announce-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
+Depends: libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
Description: Groovy based build system - Announce plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -90,8 +171,11 @@ Description: Groovy based build system - Announce plugin
Package: libgradle-antlr-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
-Suggests: antlr
+Depends: ant-optional (>= 1.8),
+ libantlr-java,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
Description: Groovy based build system - ANTLR plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -105,8 +189,12 @@ Description: Groovy based build system - ANTLR plugin
Package: libgradle-code-quality-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
-Suggests: libcodenarc-groovy-java, checkstyle (>= 5.1)
+Depends: checkstyle (>= 5.1),
+ libcodenarc-groovy-java (>= 0.17),
+ libgmetrics-groovy-java,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
Description: Groovy based build system - Code quality plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -121,11 +209,15 @@ Description: Groovy based build system - Code quality plugin
Package: libgradle-ide-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
+Depends: libgradle-core-java (= ${binary:Version}),
+ libgradle-ear-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ libgradle-scala-java (= ${binary:Version}),
+ ${misc:Depends}
Recommends: eclipse-jdt
Suggests: eclipse
-Breaks: libgradle-idea-java (<< 1.0~), libgradle-eclipse-java (<< 1.0~)
-Replaces: libgradle-idea-java (<< 1.0~), libgradle-eclipse-java (<< 1.0~)
+Breaks: libgradle-eclipse-java (<< 1.0~), libgradle-idea-java (<< 1.0~)
+Replaces: libgradle-eclipse-java (<< 1.0~), libgradle-idea-java (<< 1.0~)
Description: Groovy based build system - IDE support plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -139,8 +231,13 @@ Description: Groovy based build system - IDE support plugin
Package: libgradle-jetty-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
-Suggests: libjetty-java
+Depends: libecj-java,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ libjetty-extra-java,
+ libjetty-java,
+ libservlet2.5-java,
+ ${misc:Depends}
Description: Groovy based build system - Jetty plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -155,8 +252,10 @@ Description: Groovy based build system - Jetty plugin
Package: libgradle-maven-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
-Suggests: maven2
+Depends: libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
+Suggests: maven
Description: Groovy based build system - Maven plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -171,8 +270,10 @@ Description: Groovy based build system - Maven plugin
Package: libgradle-osgi-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
-Suggests: bnd
+Depends: bnd,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
Description: Groovy based build system - OSGi plugin
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -188,7 +289,10 @@ Description: Groovy based build system - OSGi plugin
Package: libgradle-plugins-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
+Depends: libcommons-cli-java,
+ libgradle-core-java (= ${binary:Version}),
+ ${misc:Depends}
+Suggests: junit4, testng
Description: Groovy based build system - Core plugins
Gradle is a build system written in Groovy. It uses Groovy
also as the language for its build scripts. It has a powerful
@@ -201,7 +305,9 @@ Description: Groovy based build system - Core plugins
Package: libgradle-scala-java
Architecture: all
-Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
+Depends: libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
Suggests: scala
Description: Groovy based build system - Scala plugin
Gradle is a build system written in Groovy. It uses Groovy
@@ -218,6 +324,72 @@ Description: Groovy based build system - Scala plugin
source. This means your project can contain Scala classes which use Java
classes, and vice versa.
+Package: libgradle-cpp-java
+Architecture: all
+Depends: libgradle-core-java (= ${binary:Version}),
+ libgradle-ide-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
+Description: Groovy based build system - C++ plugin
+ Gradle is a build system written in Groovy. It uses Groovy
+ also as the language for its build scripts. It has a powerful
+ multi-project build support. It has a layer on top of Ivy
+ that provides a build-by-convention integration for Ivy. It
+ gives you always the choice between the flexibility of Ant
+ and the convenience of a build-by-convention behavior.
+ .
+ Adds C++ source compilation capabilities to a project.
+
+Package: libgradle-ear-java
+Architecture: all
+Depends: libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
+Description: Groovy based build system - EAR plugin
+ Gradle is a build system written in Groovy. It uses Groovy
+ also as the language for its build scripts. It has a powerful
+ multi-project build support. It has a layer on top of Ivy
+ that provides a build-by-convention integration for Ivy. It
+ gives you always the choice between the flexibility of Ant
+ and the convenience of a build-by-convention behavior.
+ .
+ Adds support for building J2EE applications.
+
+Package: libgradle-javascript-java
+Architecture: all
+Depends: libgoogle-gson-java,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ librhino-java,
+ ${misc:Depends}
+Description: Groovy based build system - Javascript plugin
+ Gradle is a build system written in Groovy. It uses Groovy
+ also as the language for its build scripts. It has a powerful
+ multi-project build support. It has a layer on top of Ivy
+ that provides a build-by-convention integration for Ivy. It
+ gives you always the choice between the flexibility of Ant
+ and the convenience of a build-by-convention behavior.
+ .
+ Adds the ability to check and minify Javascript files.
+
+Package: libgradle-signing-java
+Architecture: all
+Depends: libbcpg-java,
+ libbcprov-java,
+ libgradle-core-java (= ${binary:Version}),
+ libgradle-maven-java (= ${binary:Version}),
+ libgradle-plugins-java (= ${binary:Version}),
+ ${misc:Depends}
+Description: Groovy based build system - Signing plugin
+ Gradle is a build system written in Groovy. It uses Groovy
+ also as the language for its build scripts. It has a powerful
+ multi-project build support. It has a layer on top of Ivy
+ that provides a build-by-convention integration for Ivy. It
+ gives you always the choice between the flexibility of Ant
+ and the convenience of a build-by-convention behavior.
+ .
+ Adds the ability to digitally sign built files and artifacts.
+
Package: libgradle-wrapper-java
Architecture: all
Depends: libgradle-core-java (= ${binary:Version}), ${misc:Depends}
@@ -239,7 +411,7 @@ Architecture: all
Section: doc
Depends: ${misc:Depends}
Recommends: libgradle-core-java (= ${binary:Version})
-Suggests: default-jdk-doc, groovy-doc, libmaven2-core-java-doc
+Suggests: default-jdk-doc, groovy-doc
Description: Documentation for gradle
Documentation for the Gradle core library.
.
diff --git a/debian/gradle-doc.docs b/debian/gradle-doc.docs
index 802d9f2..9ec4adb 100644
--- a/debian/gradle-doc.docs
+++ b/debian/gradle-doc.docs
@@ -1 +1,3 @@
build/distributions/all/gradle-*/docs/groovydoc
+build/distributions/all/gradle-*/docs/dsl
+build/distributions/all/gradle-*/docs/userguide
diff --git a/debian/gradle.install b/debian/gradle.install
index 0fc317c..212653d 100644
--- a/debian/gradle.install
+++ b/debian/gradle.install
@@ -1,8 +1,10 @@
build/distributions/bin/gradle-*/bin/gradle usr/share/gradle/bin
-build/distributions/bin/gradle-*/lib/gradle-launcher-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-open-api-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-tooling-api-*.jar usr/share/gradle/lib
-build/distributions/bin/gradle-*/lib/gradle-ui-*.jar usr/share/gradle/lib
-
-build/distributions/bin/gradle-*/lib/core-impl/gradle-core-impl-*.jar usr/share/gradle/lib/core-impl
+build/distributions/bin/gradle-*/lib/gradle-base-services-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-cli-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-launcher-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-messaging-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-native-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-open-api-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-tooling-api-*.jar usr/share/gradle/lib
+build/distributions/bin/gradle-*/lib/gradle-ui-*.jar usr/share/gradle/lib
diff --git a/debian/gradle.links b/debian/gradle.links
index b799f36..7569869 100644
--- a/debian/gradle.links
+++ b/debian/gradle.links
@@ -1,62 +1,13 @@
usr/share/gradle/bin/gradle usr/bin/gradle
-usr/share/java/ant.jar usr/share/gradle/lib/ant.jar
-usr/share/java/ant-launcher.jar usr/share/gradle/lib/ant-launcher.jar
-usr/share/java/asm3-all.jar usr/share/gradle/lib/asm3-all.jar
-usr/share/java/commons-cli.jar usr/share/gradle/lib/commons-cli.jar
-usr/share/java/commons-codec.jar usr/share/gradle/lib/commons-codec.jar
-usr/share/java/commons-collections3.jar usr/share/gradle/lib/commons-collections3.jar
-usr/share/java/commons-httpclient.jar usr/share/gradle/lib/commons-httpclient.jar
-usr/share/java/commons-io.jar usr/share/gradle/lib/commons-io.jar
-usr/share/java/commons-lang.jar usr/share/gradle/lib/commons-lang.jar
-usr/share/java/dom4j.jar usr/share/gradle/lib/dom4j.jar
-usr/share/java/google-collections.jar usr/share/gradle/lib/google-collections.jar
-usr/share/java/groovy-all.jar usr/share/gradle/lib/groovy-all.jar
-usr/share/java/ivy.jar usr/share/gradle/lib/ivy.jar
-usr/share/java/jansi.jar usr/share/gradle/lib/jansi.jar
-usr/share/java/jaxen.jar usr/share/gradle/lib/jaxen.jar
-usr/share/java/jcl-over-slf4j.jar usr/share/gradle/lib/jcl-over-slf4j.jar
+# gradle-native
usr/share/java/jna.jar usr/share/gradle/lib/jna.jar
usr/share/java/jnr-posix.jar usr/share/gradle/lib/jnr-posix.jar
-usr/share/java/jnr-posix.jar usr/share/gradle/lib/jna-posix.jar
-usr/share/java/joptsimple.jar usr/share/gradle/lib/joptsimple.jar
-usr/share/java/jsch.jar usr/share/gradle/lib/jsch.jar
-usr/share/java/jul-to-slf4j.jar usr/share/gradle/lib/jul-to-slf4j.jar
-usr/share/java/junit4.jar usr/share/gradle/lib/junit4.jar
-usr/share/java/jzlib.jar usr/share/gradle/lib/jzlib.jar
-usr/share/java/log4j-over-slf4j.jar usr/share/gradle/lib/log4j-over-slf4j.jar
-usr/share/java/logback-classic.jar usr/share/gradle/lib/logback-classic.jar
-usr/share/java/logback-core.jar usr/share/gradle/lib/logback-core.jar
-usr/share/java/slf4j-api.jar usr/share/gradle/lib/slf4j-api.jar
-
-usr/share/java/maven-ant-tasks.jar usr/share/gradle/lib/core-impl/maven-ant-tasks.jar
-usr/share/java/maven-artifact.jar usr/share/gradle/lib/core-impl/maven-artifact.jar
-usr/share/java/maven-artifact-manager.jar usr/share/gradle/lib/core-impl/maven-artifact-manager.jar
-usr/share/java/maven-model.jar usr/share/gradle/lib/core-impl/maven-model.jar
-usr/share/java/maven-project.jar usr/share/gradle/lib/core-impl/maven-project.jar
-usr/share/java/maven-settings.jar usr/share/gradle/lib/core-impl/maven-settings.jar
-usr/share/java/plexus-component-annotations.jar usr/share/gradle/lib/core-impl/plexus-component-annotations.jar
-usr/share/java/plexus-component-api.jar usr/share/gradle/lib/core-impl/plexus-component-api.jar
-usr/share/java/plexus-utils.jar usr/share/gradle/lib/core-impl/plexus-utils.jar
-usr/share/java/wagon-provider-api.jar usr/share/gradle/lib/core-impl/wagon-provider-api.jar
-
-usr/share/java/annotations-api.jar usr/share/gradle/lib/plugins/annotations-api.jar
-usr/share/java/ant-antlr.jar usr/share/gradle/lib/plugins/ant-antlr.jar
-usr/share/java/antlr.jar usr/share/gradle/lib/plugins/antlr.jar
-usr/share/java/bnd.jar usr/share/gradle/lib/plugins/bnd.jar
-usr/share/java/bsh.jar usr/share/gradle/lib/plugins/bsh.jar
-usr/share/java/checkstyle.jar usr/share/gradle/lib/plugins/checkstyle.jar
-usr/share/java/commons-beanutils.jar usr/share/gradle/lib/plugins/commons-beanutils.jar
-usr/share/java/CodeNarc.jar usr/share/gradle/lib/plugins/CodeNarc.jar
-usr/share/java/GMetrics.jar usr/share/gradle/lib/plugins/GMetrics.jar
-usr/share/java/jetty.jar usr/share/gradle/lib/plugins/jetty.jar
-usr/share/java/jetty-annotations.jar usr/share/gradle/lib/plugins/jetty-annotations.jar
-usr/share/java/jetty-naming.jar usr/share/gradle/lib/plugins/jetty-naming.jar
-usr/share/java/jetty-plus.jar usr/share/gradle/lib/plugins/jetty-plus.jar
-usr/share/java/jetty-util.jar usr/share/gradle/lib/plugins/jetty-util.jar
-usr/share/java/jsp-api-2.1.jar usr/share/gradle/lib/plugins/jsp-api-2.1.jar
-usr/share/java/junit4.jar usr/share/gradle/lib/plugins/junit4.jar
-usr/share/java/servlet-api-2.5.jar usr/share/gradle/lib/plugins/servlet-api-2.5.jar
-usr/share/java/testng.jar usr/share/gradle/lib/plugins/testng.jar
+usr/share/java/constantine.jar usr/share/gradle/lib/constantine.jar
+usr/share/java/jaffl.jar usr/share/gradle/lib/jaffl.jar
+usr/share/java/jffi.jar usr/share/gradle/lib/jffi.jar
+usr/share/java/jansi.jar usr/share/gradle/lib/jansi.jar
-# Probably a link to eclipse-jdt jar is needed, I'm not sure yet.
+# gradle-ui
+usr/share/java/dom4j.jar usr/share/gradle/lib/dom4j.jar
+usr/share/java/jaxen.jar usr/share/gradle/lib/jaxen.jar
diff --git a/debian/libgradle-antlr-java.links b/debian/libgradle-antlr-java.links
new file mode 100644
index 0000000..4113995
--- /dev/null
+++ b/debian/libgradle-antlr-java.links
@@ -0,0 +1,2 @@
+usr/share/java/ant-antlr.jar usr/share/gradle/lib/plugins/ant-antlr.jar
+usr/share/java/antlr.jar usr/share/gradle/lib/plugins/antlr.jar
\ No newline at end of file
diff --git a/debian/libgradle-code-quality-java.links b/debian/libgradle-code-quality-java.links
new file mode 100644
index 0000000..de41441
--- /dev/null
+++ b/debian/libgradle-code-quality-java.links
@@ -0,0 +1,3 @@
+usr/share/java/checkstyle.jar usr/share/gradle/lib/plugins/checkstyle.jar
+usr/share/java/CodeNarc.jar usr/share/gradle/lib/plugins/CodeNarc.jar
+usr/share/java/GMetrics.jar usr/share/gradle/lib/plugins/GMetrics.jar
\ No newline at end of file
diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs
index d50323c..4aea04c 100644
--- a/debian/libgradle-core-java.jlibs
+++ b/debian/libgradle-core-java.jlibs
@@ -1 +1,2 @@
build/distributions/bin/gradle-*/lib/gradle-core-*.jar
+build/distributions/bin/gradle-*/lib/plugins/gradle-core-impl-*.jar
diff --git a/debian/libgradle-core-java.links b/debian/libgradle-core-java.links
new file mode 100644
index 0000000..a5b1403
--- /dev/null
+++ b/debian/libgradle-core-java.links
@@ -0,0 +1,45 @@
+# gradle-core
+usr/share/java/asm3-all.jar usr/share/gradle/lib/asm3-all.jar
+usr/share/java/ant.jar usr/share/gradle/lib/ant.jar
+usr/share/java/commons-collections3.jar usr/share/gradle/lib/commons-collections3.jar
+usr/share/java/commons-io.jar usr/share/gradle/lib/commons-io.jar
+usr/share/java/commons-lang.jar usr/share/gradle/lib/commons-lang.jar
+usr/share/java/ivy.jar usr/share/gradle/lib/ivy.jar
+usr/share/java/logback-core.jar usr/share/gradle/lib/logback-core.jar
+usr/share/java/logback-classic.jar usr/share/gradle/lib/logback-classic.jar
+usr/share/java/guava.jar usr/share/gradle/lib/guava.jar
+usr/share/java/jcip.jar usr/share/gradle/lib/jcip.jar
+usr/share/java/jul-to-slf4j.jar usr/share/gradle/lib/jul-to-slf4j.jar
+usr/share/java/jarjar.jar usr/share/gradle/lib/jarjar.jar
+usr/share/java/groovy-all.jar usr/share/gradle/lib/groovy-all.jar
+usr/share/java/slf4j-api.jar usr/share/gradle/lib/slf4j-api.jar
+usr/share/java/log4j-over-slf4j.jar usr/share/gradle/lib/log4j-over-slf4j.jar
+usr/share/java/jcl-over-slf4j.jar usr/share/gradle/lib/jcl-over-slf4j.jar
+usr/share/java/ant-launcher.jar usr/share/gradle/lib/ant-launcher.jar
+usr/share/java/jsch.jar usr/share/gradle/lib/jsch.jar
+
+# gradle-core-impl
+usr/share/java/httpclient.jar usr/share/gradle/lib/plugins/httpclient.jar
+# commons-lang
+# commons-io
+# ivy
+# slf4j-api
+usr/share/java/maven-ant-tasks.jar usr/share/gradle/lib/plugins/maven-ant-tasks.jar
+usr/share/java/nekohtml.jar usr/share/gradle/lib/plugins/nekohtml.jar
+usr/share/java/maven-settings-builder-3.x.jar usr/share/gradle/lib/plugins/maven-settings-builder-3.x.jar
+# groovy-all
+# jcl-over-slf4j
+usr/share/java/jcifs.jar usr/share/gradle/lib/plugins/jcifs.jar
+usr/share/java/commons-codec.jar usr/share/gradle/lib/plugins/commons-codec.jar
+usr/share/java/httpcore.jar usr/share/gradle/lib/plugins/httpcore.jar
+# jsch
+usr/share/java/xercesImpl.jar usr/share/gradle/lib/plugins/xercesImpl.jar
+usr/share/java/jaxp-1.4.jar usr/share/gradle/lib/plugins/jaxp-1.4.jar
+usr/share/java/plexus-utils2.jar usr/share/gradle/lib/plugins/plexus-utils2.jar
+usr/share/java/plexus-cipher.jar usr/share/gradle/lib/plugins/plexus-cipher.jar
+usr/share/java/plexus-interpolation.jar usr/share/gradle/lib/plugins/plexus-interpolation.jar
+usr/share/java/maven-settings-3.x.jar usr/share/gradle/lib/plugins/maven-settings-3.x.jar
+usr/share/java/plexus-component-annotations-1.5.jar usr/share/gradle/lib/plugins/plexus-component-annotations-1.5.jar
+usr/share/java/plexus-sec-dispatcher.jar usr/share/gradle/lib/plugins/plexus-sec-dispatcher.jar
+usr/share/java/pmaven-common.jar usr/share/gradle/lib/plugins/pmaven-common.jar
+usr/share/java/pmaven-groovy.jar usr/share/gradle/lib/plugins/pmaven-groovy.jar
diff --git a/debian/libgradle-cpp-java.jlibs b/debian/libgradle-cpp-java.jlibs
new file mode 100644
index 0000000..8fdbe3f
--- /dev/null
+++ b/debian/libgradle-cpp-java.jlibs
@@ -0,0 +1 @@
+build/distributions/bin/gradle-*/lib/plugins/gradle-cpp-*.jar
diff --git a/debian/libgradle-ear-java.jlibs b/debian/libgradle-ear-java.jlibs
new file mode 100644
index 0000000..2c1e8a7
--- /dev/null
+++ b/debian/libgradle-ear-java.jlibs
@@ -0,0 +1 @@
+build/distributions/bin/gradle-*/lib/plugins/gradle-ear-*.jar
diff --git a/debian/libgradle-javascript-java.jlibs b/debian/libgradle-javascript-java.jlibs
new file mode 100644
index 0000000..2743ac6
--- /dev/null
+++ b/debian/libgradle-javascript-java.jlibs
@@ -0,0 +1 @@
+build/distributions/bin/gradle-*/lib/plugins/gradle-javascript-*.jar
diff --git a/debian/libgradle-javascript-java.links b/debian/libgradle-javascript-java.links
new file mode 100644
index 0000000..2fac09d
--- /dev/null
+++ b/debian/libgradle-javascript-java.links
@@ -0,0 +1,2 @@
+usr/share/java/js-1.7R3.jar usr/share/gradle/lib/plugins/js-1.7R3.jar
+usr/share/java/gson.jar usr/share/gradle/lib/plugins/gson.jar
\ No newline at end of file
diff --git a/debian/libgradle-jetty-java.links b/debian/libgradle-jetty-java.links
new file mode 100644
index 0000000..330ce65
--- /dev/null
+++ b/debian/libgradle-jetty-java.links
@@ -0,0 +1,8 @@
+usr/share/java/jetty.jar usr/share/gradle/lib/plugins/jetty.jar
+usr/share/java/jetty-util.jar usr/share/gradle/lib/plugins/jetty-util.jar
+usr/share/java/servlet-api-2.5.jar usr/share/gradle/lib/plugins/servlet-api-2.5.jar
+usr/share/java/jetty-plus.jar usr/share/gradle/lib/plugins/jetty-plus.jar
+usr/share/java/jsp-api-2.1.jar usr/share/gradle/lib/plugins/jsp-api-2.1.jar
+usr/share/java/jetty-annotations.jar usr/share/gradle/lib/plugins/jetty-annotations.jar
+usr/share/java/jetty-naming.jar usr/share/gradle/lib/plugins/jetty-naming.jar
+usr/share/java/eclipse-ecj.jar usr/share/gradle/lib/plugins/eclipse-ecj.jar
\ No newline at end of file
diff --git a/debian/libgradle-osgi-java.links b/debian/libgradle-osgi-java.links
new file mode 100644
index 0000000..ce021db
--- /dev/null
+++ b/debian/libgradle-osgi-java.links
@@ -0,0 +1 @@
+usr/share/java/bndlib.jar usr/share/gradle/lib/plugins/bndlib.jar
\ No newline at end of file
diff --git a/debian/libgradle-plugins-java.links b/debian/libgradle-plugins-java.links
new file mode 100644
index 0000000..85563c7
--- /dev/null
+++ b/debian/libgradle-plugins-java.links
@@ -0,0 +1,3 @@
+usr/share/java/junit4.jar usr/share/gradle/lib/plugins/junit4.jar
+usr/share/java/testng.jar usr/share/gradle/lib/plugins/testng.jar
+usr/share/java/commons-cli.jar usr/share/gradle/lib/plugins/commons-cli.jar
diff --git a/debian/libgradle-signing-java.jlibs b/debian/libgradle-signing-java.jlibs
new file mode 100644
index 0000000..ada39d7
--- /dev/null
+++ b/debian/libgradle-signing-java.jlibs
@@ -0,0 +1 @@
+build/distributions/bin/gradle-*/lib/plugins/gradle-signing-*.jar
diff --git a/debian/libgradle-signing-java.links b/debian/libgradle-signing-java.links
new file mode 100644
index 0000000..7ae659c
--- /dev/null
+++ b/debian/libgradle-signing-java.links
@@ -0,0 +1,2 @@
+usr/share/java/bcpg.jar usr/share/gradle/lib/plugins/bcpg.jar
+usr/share/java/bcprov.jar usr/share/gradle/lib/plugins/bcprov.jar
\ No newline at end of file
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index 467b180..a3f121f 100644
--- a/debian/patches/01_use_debian_jars.diff
+++ b/debian/patches/01_use_debian_jars.diff
@@ -1,68 +1,154 @@
Description: Build Gradle using libraries available in Debian
Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-05-24
+Author: Damien Raude-Morvan <drazzib at debian.org
+Forwarded: not-needed
+Last-Update: 2012-08-18
---- gradle-1.0~m3.orig/build.gradle
-+++ gradle-1.0~m3/build.gradle
-@@ -20,6 +20,7 @@ import org.gradle.build.Install
- import org.gradle.build.Git
- import java.util.jar.Attributes
- import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency
+--- a/build.gradle
++++ b/build.gradle
+@@ -16,6 +16,7 @@
+
+ import org.gradle.build.Install
+ import org.gradle.build.TestReportAggregator
+import org.apache.ivy.plugins.resolver.FileSystemResolver
/**
* For building Gradle you usually don't need to specify any properties. Only certain functionality of the Gradle requires
-@@ -47,22 +48,25 @@ libraries = [
- ant_launcher: 'org.apache.ant:ant-launcher:1.8.2 at jar',
- ant_antlr: 'org.apache.ant:ant-antlr:1.8.2 at jar',
- antlr: 'antlr:antlr:2.7.7 at jar',
-- asm_all: 'asm:asm-all:3.3.1 at jar',
-+ asm_all: 'asm:asm3-all:3.2 at jar',
- commons_cli: 'commons-cli:commons-cli:1.2 at jar',
- commons_io: 'commons-io:commons-io:1.4 at jar',
+@@ -32,21 +33,21 @@
+
+ ext {
+ versions = [
+- commons_io: 'commons-io:commons-io:1.4'
++ commons_io: 'commons-io:commons-io:debian'
+ ]
+ libraries = [
+- ant: dependencies.module('org.apache.ant:ant:1.8.4') {
+- dependency 'org.apache.ant:ant-launcher:1.8.4 at jar'
++ ant: dependencies.module('org.apache.ant:ant:debian') {
++ dependency 'org.apache.ant:ant-launcher:debian at jar'
+ },
+- asm: 'asm:asm-all:3.3.1 at jar',
+- commons_cli: 'commons-cli:commons-cli:1.2 at jar',
++ asm: 'asm:asm3-all:3.x at jar',
++ commons_cli: 'commons-cli:commons-cli:debian at jar',
+ commons_io: dependencies.module(versions.commons_io),
- commons_lang: 'commons-lang:commons-lang:2.6 at jar',
-+ commons_lang: 'commons-lang:commons-lang:2.4 at jar',
- dom4j: 'dom4j:dom4j:1.6.1 at jar',
-- guava: 'com.google.guava:guava:r08 at jar',
-+ // Guava is a super set of Google Collections library,
-+ // it can be used until Guava is packaged
-+ //guava: 'com.google.guava:guava:r08 at jar',
-+ guava: 'com.google.guava:google-collections:1.0 at jar',
- groovy: 'org.codehaus.groovy:groovy-all:1.7.10 at jar',
- ivy: 'org.apache.ivy:ivy:2.2.0 at jar',
+- commons_collections: 'commons-collections:commons-collections:3.2.1 at jar',
+- ivy: dependencies.module('org.apache.ivy:ivy:2.2.0'){
+- dependency "com.jcraft:jsch:0.1.46"
++ commons_lang: 'commons-lang:commons-lang:debian at jar',
++ commons_collections: 'commons-collections:commons-collections3:3.x at jar',
++ ivy: dependencies.module('org.apache.ivy:ivy:debian'){
++ dependency "com.jcraft:jsch:debian"
+ },
+- jcip: "net.jcip:jcip-annotations:1.0 at jar",
++ jcip: "net.jcip:jcip:debian at jar",
+ ]
+
+ }
+@@ -69,61 +70,63 @@
+ }
+
+ // Jetty
+-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
+-libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
++libraries.servlet_api = "javax.servlet:servlet-api:2.5 at jar"
++libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.x") {
+ dependency libraries.slf4j_api
+ dependency libraries.servlet_api
+ }
+-libraries.jetty = dependencies.module("org.mortbay.jetty:jetty:6.1.25") {
++libraries.jetty = dependencies.module("org.mortbay.jetty:jetty:6.x") {
+ dependency libraries.jetty_util
+ dependency libraries.servlet_api
+ }
+
+-libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpclient:4.2.1') {
+- dependency "org.apache.httpcomponents:httpcore:4.2.1 at jar"
++libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpclient:debian') {
++ dependency "org.apache.httpcomponents:httpcore:debian"
+ dependency libraries.jcl_to_slf4j
+- dependency "commons-codec:commons-codec:1.6 at jar"
+- dependency "org.samba.jcifs:jcifs:1.3.17"
++ dependency "commons-codec:commons-codec:debian"
++ dependency "org.samba.jcifs:jcifs:debian"
+ }
+
+-libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:2.1.3") {
++libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:debian") {
+ libraries.ant
+ }
+
+ libraries += [
+- ant_junit: 'org.apache.ant:ant-junit:1.8.4 at jar',
+- ant_antlr: 'org.apache.ant:ant-antlr:1.8.4 at jar',
+- antlr: 'antlr:antlr:2.7.7 at jar',
+- dom4j: 'dom4j:dom4j:1.6.1 at jar',
+- guava: 'com.google.guava:guava:11.0.2 at jar',
+- jsr305: 'com.google.code.findbugs:jsr305:1.3.9',
+- groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
- jaxen: 'jaxen:jaxen:1.1 at jar',
-+ jaxen: 'jaxen:jaxen:1.1.2 at jar',
- slf4j_api: 'org.slf4j:slf4j-api:1.6.1 at jar',
- jcl_to_slf4j: 'org.slf4j:jcl-over-slf4j:1.6.1 at jar',
- jul_to_slf4j: 'org.slf4j:jul-to-slf4j:1.6.1 at jar',
- log4j_to_slf4j: 'org.slf4j:log4j-over-slf4j:1.6.1 at jar',
- logback_classic: 'ch.qos.logback:logback-classic:0.9.28 at jar',
- logback_core: 'ch.qos.logback:logback-core:0.9.28 at jar',
-- junit: 'junit:junit:4.8.2',
-+ junit: 'junit:junit4:4.8.2',
- xmlunit: 'xmlunit:xmlunit:1.3',
+- jcip: "net.jcip:jcip-annotations:1.0",
++ ant_junit: 'org.apache.ant:ant-junit:debian at jar',
++ ant_antlr: 'org.apache.ant:ant-antlr:debian at jar',
++ antlr: 'antlr:antlr:debian at jar',
++ dom4j: 'dom4j:dom4j:debian at jar',
++ guava: 'com.google.guava:guava:debian at jar',
++ jsr305: 'com.google.code.findbugs:jsr305:debian',
++ groovy: 'org.codehaus.groovy:groovy-all:debian at jar',
++ jaxen: 'jaxen:jaxen:debian at jar',
++ jcip: "net.jcip:jcip:debian",
+ jna: 'net.java.dev.jna:jna:3.2.7 at jar',
+- junit: 'junit:junit:4.10',
+- xmlunit: 'xmlunit:xmlunit:1.3',
+- nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14'
++ junit: 'junit:junit4:4.x',
++ xmlunit: 'xmlunit:xmlunit:debian',
++ nekohtml: dependencies.module('net.sourceforge.nekohtml:nekohtml:debian') {
++ dependency "xerces:xercesImpl:debian at jar"
++ }
]
-@@ -79,9 +83,9 @@ libraries.jmock = ['org.jmock:jmock:2.5.
+-libraries.maven3_settings_builder = dependencies.module("org.apache.maven:maven-settings-builder:3.0.4") {
+- dependency "org.apache.maven:maven-settings:3.0.4 at jar"
+- dependency "org.codehaus.plexus:plexus-utils:2.0.6 at jar"
+- dependency "org.codehaus.plexus:plexus-interpolation:1.14 at jar"
+- dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5 at jar"
+- dependency "org.sonatype.plexus:plexus-cipher:1.4 at jar"
+- dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3 at jar"
++libraries.maven3_settings_builder = dependencies.module("org.apache.maven:maven-settings-builder:3.x") {
++ dependency "org.apache.maven:maven-settings:3.x at jar"
++ dependency "org.codehaus.plexus:plexus-utils2:debian at jar"
++ dependency "org.codehaus.plexus:plexus-interpolation:debian at jar"
++ dependency "org.codehaus.plexus:plexus-component-annotations-1.5:debian at jar"
++ dependency "org.sonatype.plexus:plexus-cipher:debian at jar"
++ dependency "org.sonatype.plexus:plexus-sec-dispatcher:debian at jar"
+ }
+
+ libraries.spock = ['org.spockframework:spock-core:0.6-groovy-1.8 at jar',
+ libraries.groovy,
'org.objenesis:objenesis:1.2',
'cglib:cglib-nodep:2.2']
- libraries.groovy_depends = [libraries.groovy, libraries.commons_cli]
--libraries.jetty_depends = ["org.mortbay.jetty:jetty:6.1.25 at jar",
-- "org.mortbay.jetty:jetty-util:6.1.25 at jar",
-- "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"]
-+libraries.jetty_depends = ["org.mortbay.jetty:jetty:6.1.24 at jar",
-+ "org.mortbay.jetty:jetty-util:6.1.24 at jar",
-+ "javax.servlet:servlet-api:2.5 at jar"]
-
- allprojects {
- group = 'org.gradle'
-@@ -92,7 +96,12 @@ allprojects {
+-libraries.jmock = ['org.jmock:jmock:2.5.1',
++libraries.jmock = ['org.jmock:jmock2:2.5.1',
+ 'org.hamcrest:hamcrest-core:1.1',
+ 'org.hamcrest:hamcrest-library:1.1',
+- 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('org.jmock:jmock2-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
++ 'org.jmock:jmock2-legacy:2.5.1',
+ 'org.objenesis:objenesis:1.2',
+ 'cglib:cglib-nodep:2.2']
+
+@@ -136,8 +139,14 @@
}
repositories {
-- mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
-+ //mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
+- maven { url 'http://repo.gradle.org/gradle/libs' }
+- maven { url 'http://repository.codehaus.org/' }
++ //maven { url 'http://repo.gradle.org/gradle/libs' }
++ //maven { url 'http://repository.codehaus.org/' }
++ //maven { url '/usr/share/maven-repo/' }
+ add(new FileSystemResolver()) {
+ name = 'repo'
+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
@@ -71,8 +157,8 @@ Last-Update: 2011-05-24
}
version = this.version
---- gradle-1.0~m3.orig/buildSrc/build.gradle
-+++ gradle-1.0~m3/buildSrc/build.gradle
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -80,13 +166,16 @@ Last-Update: 2011-05-24
+import org.apache.ivy.plugins.resolver.FileSystemResolver
apply plugin: 'groovy'
- apply plugin: 'code-quality'
-@@ -20,16 +21,31 @@ apply plugin: 'idea'
+ apply plugin: 'checkstyle'
+@@ -21,8 +22,14 @@
apply plugin: 'eclipse'
repositories {
-- mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
-+ //mavenRepo(urls: 'http://repo.gradle.org/gradle/libs')
+- maven { url 'http://repo.gradle.org/gradle/libs' }
+- mavenCentral()
++ //maven { url 'http://repo.gradle.org/gradle/libs' }
++ //mavenCentral()
++ //maven { url '/usr/share/maven-repo/' }
+ add(new FileSystemResolver()) {
+ name = 'repo'
+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
@@ -95,152 +184,192 @@ Last-Update: 2011-05-24
}
dependencies {
- compile gradleApi()
- compile 'com.google.collections:google-collections:1.0 at jar'
+@@ -30,7 +37,7 @@
+ compile 'com.google.guava:guava:11.0.2 at jar'
+ compile 'commons-lang:commons-lang:2.6 at jar'
groovy localGroovy()
-- testCompile 'junit:junit:4.8.2 at jar'
-- testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
-+ testCompile 'junit:junit4:4.8.2 at jar'
-+ //testCompile 'org.spockframework:spock-core:0.5-groovy-1.7 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
- }
-
--apply from: '../gradle/compile.gradle'
-+// All tests for this subproject are disabled because they depend on Spock
-+// Framework and that software is not available in Debian yet.
-+compileTestGroovy {
-+ exclude '**'
-+}
-+
-+test {
-+ testReport = false
-+}
-+
-+//apply from: '../gradle/compile.gradle'
- apply from: '../gradle/codeQuality.gradle'
---- gradle-1.0~m3.orig/subprojects/osgi/osgi.gradle
-+++ gradle-1.0~m3/subprojects/osgi/osgi.gradle
-@@ -21,7 +21,7 @@ dependencies {
- compile project(':plugins')
- compile libraries.slf4j_api
+- testCompile 'junit:junit:4.10 at jar'
++ testCompile 'junit:junit4:4.x at jar'
+ testCompile 'org.spockframework:spock-core:0.6-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
+
+ compile "org.pegdown:pegdown:1.1.0"
+--- a/subprojects/core/core.gradle
++++ b/subprojects/core/core.gradle
+@@ -54,7 +54,7 @@
-- compile 'biz.aQute:bndlib:1.15.0 at jar'
-+ compile 'biz.aQute:bnd:0.0.384 at jar'
-
- testCompile project(path: ':core', configuration: 'testFixtures')
- testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
---- gradle-1.0~m3.orig/subprojects/jetty/jetty.gradle
-+++ gradle-1.0~m3/subprojects/jetty/jetty.gradle
-@@ -21,14 +21,12 @@ dependencies {
-
- compile libraries.slf4j_api,
- libraries.jetty_depends,
-- "org.mortbay.jetty:jetty-plus:6.1.25 at jar"
-+ "org.mortbay.jetty:jetty-plus:6.1.24 at jar"
-
-- runtime "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar",
-- "org.mortbay.jetty:jsp-2.1:6.1.14 at jar",
-- "org.eclipse.jdt:core:3.1.1 at jar",
-- "org.mortbay.jetty:jetty-naming:6.1.25 at jar",
-- "org.mortbay.jetty:jetty-annotations:6.1.25 at jar",
-- "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
-+ runtime "org.mortbay.jetty:jsp-api:2.1 at jar",
-+ "org.mortbay.jetty:jetty-naming:6.1.24 at jar",
-+ "org.mortbay.jetty:jetty-annotations:6.1.24 at jar"
-+ "javax.annotations:annotations-api:6.0.32 at jar"
-
- testCompile project(path: ':core', configuration: 'testFixtures')
- testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
---- gradle-1.0~m3.orig/subprojects/plugins/plugins.gradle
-+++ gradle-1.0~m3/subprojects/plugins/plugins.gradle
-@@ -31,9 +31,9 @@ dependencies {
- libraries.asm_all,
- libraries.junit,
- libraries.ant,
-- 'org.testng:testng:5.14.10'
-+ 'org.testng:testng:5.11'
+ integTestCompile project(":internalIntegTesting")
- reports 'css3-pie:css3-pie:1.0beta3'
+ //reports 'css3-pie:css3-pie:1.0beta3'
- testCompile libraries.xmlunit, 'net.sourceforge.nekohtml:nekohtml:1.9.14'
-
- testCompile project(path: ':core', configuration: 'testFixtures')
---- gradle-1.0~m3.orig/subprojects/code-quality/code-quality.gradle
-+++ gradle-1.0~m3/subprojects/code-quality/code-quality.gradle
-@@ -30,7 +30,7 @@ dependencies {
- runtime "com.puppycrawl.tools:checkstyle:5.3 at jar",
- libraries.guava,
- libraries.antlr,
-- "commons-beanutils:commons-beanutils-core:1.8.3 at jar"
-+ "commons-beanutils:commons-beanutils:1.8.3 at jar"
-
- testCompile project(path: ':core', configuration: 'testFixtures')
- testRuntime project(path: ':core', configuration: 'testFixturesRuntime')
---- gradle-1.0~m3.orig/subprojects/core-impl/core-impl.gradle
-+++ gradle-1.0~m3/subprojects/core-impl/core-impl.gradle
-@@ -10,8 +10,19 @@ dependencies {
- compile "org.apache.maven:maven-ant-tasks:2.1.1 at jar"
+ }
+
+ useTestFixtures()
+--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
++++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
+@@ -223,15 +223,18 @@
+ }
+
+ private File findExternalJar(String name) {
+- Pattern pattern = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
++ Pattern patternVersion = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar");
++ Pattern pattern = Pattern.compile(Pattern.quote(name) + ".jar");
+ for (File file : classpath) {
+- if (pattern.matcher(file.getName()).matches()) {
++ if (patternVersion.matcher(file.getName()).matches()
++ || pattern.matcher(file.getName()).matches()) {
+ return file;
+ }
+ }
+ for (File libDir : libDirs) {
+ for (File file : libDir.listFiles()) {
+- if (pattern.matcher(file.getName()).matches()) {
++ if (patternVersion.matcher(file.getName()).matches()
++ || pattern.matcher(file.getName()).matches()) {
+ return file;
+ }
+ }
+--- a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java
++++ b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java
+@@ -30,7 +30,7 @@
+ HtmlReportRenderer renderer = new HtmlReportRenderer();
+ renderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css"));
+ renderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js"));
+- renderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
++ //renderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
+ renderer.requireResource(getClass().getResource("style.css"));
+ renderer.renderer(new ProfilePageRenderer()).writeTo(buildProfile, file);
+ }
+--- a/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css
++++ b/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css
+@@ -68,7 +68,7 @@
+ margin-right: 25px;
+ border: solid 1px #d4d4d4;
+ background-color: #f0f0f0;
+- behavior: url(css3-pie-1.0beta3.htc);
++ /*behavior: url(css3-pie-1.0beta3.htc);*/
+ }
+
+ ul.tabLinks li:hover {
+--- a/subprojects/javascript/javascript.gradle
++++ b/subprojects/javascript/javascript.gradle
+@@ -17,7 +17,7 @@
+ dependencies {
+ groovy libraries.groovy
+
+- compile "org.mozilla:rhino:1.7R3"
++ compile "org.mozilla:js:1.7R3"
+ compile "com.google.code.gson:gson:2.2.1" // used by JsHint
+ compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
+ compile project(':core'), project(":plugins")
+@@ -26,4 +26,4 @@
+ compile project(':coreImpl')
+ }
+
+-useTestFixtures()
+\ No newline at end of file
++useTestFixtures()
+--- a/subprojects/jetty/jetty.gradle
++++ b/subprojects/jetty/jetty.gradle
+@@ -23,22 +23,22 @@
+ compile libraries.jetty
+ compile libraries.jetty_util
+ compile libraries.servlet_api
+- compile module("org.mortbay.jetty:jetty-plus:6.1.25") {
++ compile module("org.mortbay.jetty:jetty-plus:6.x") {
+ dependency libraries.jetty
+- module("org.mortbay.jetty:jetty-naming:6.1.25") {
++ module("org.mortbay.jetty:jetty-naming:6.x") {
+ dependency libraries.jetty
+ }
+ }
+
+- runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
+- dependency "org.eclipse.jdt:core:3.1.1 at jar"
+- dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14 at jar"
++ runtime module("org.mortbay.jetty:jsp-api:2.1") {
++ dependency "org.eclipse.jdt:eclipse-ecj:3.1.1 at jar"
++ dependency "org.mortbay.jetty:jsp-api-2.1:6.x at jar"
+ dependency libraries.jetty_util
+ dependency libraries.servlet_api
+ }
+
+- runtime "org.mortbay.jetty:jetty-annotations:6.1.25 at jar"
+- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
++ runtime "org.mortbay.jetty:jetty-annotations:6.x at jar"
++ //runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0 at jar"
+ }
+
+-useTestFixtures()
+\ No newline at end of file
++useTestFixtures()
+--- a/subprojects/maven/maven.gradle
++++ b/subprojects/maven/maven.gradle
+@@ -25,7 +25,7 @@
+ compile libraries.maven_ant_tasks
compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
- compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
-+ //compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
-+ compile "org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7 at jar"
-+ compile "org.codehaus.plexus:plexus-component-api:1.0-alpha-22 at jar"
-+ compile "org.codehaus.plexus:plexus-utils:1.5.15 at jar"
-+ compile "org.apache.maven:maven-model:2.2.1 at jar"
-+ compile "org.apache.maven:maven-settings:2.2.1 at jar"
-+ compile "org.apache.maven:maven-project:2.2.1 at jar"
-+ compile "org.apache.maven:maven-artifact:2.2.1 at jar"
-+ compile "org.apache.maven:maven-artifact-manager:2.2.1 at jar"
-+ compile "org.apache.maven:maven-settings:2.2.1 at jar"
-+ compile "org.apache.maven.wagon:wagon-provider-api:1.0-beta-6 at jar"
-+
-
- testCompile libraries.junit
- testCompile project(path: ':core', configuration: 'testFixtures')
--}
-\ No newline at end of file
-+}
---- gradle-1.0~m3.orig/subprojects/core/core.gradle
-+++ gradle-1.0~m3/subprojects/core/core.gradle
-@@ -36,7 +36,7 @@ configurations {
- dependencies {
- groovy libraries.groovy_depends
-
-- compile "commons-httpclient:commons-httpclient:3.0 at jar", "commons-codec:commons-codec:1.2 at jar", libraries.jcl_to_slf4j
-+ compile "commons-httpclient:commons-httpclient:3.1 at jar", "commons-codec:commons-codec:1.5 at jar", libraries.jcl_to_slf4j
-
- compile libraries.ivy, "com.jcraft:jsch:0.1.42 at jar", 'com.jcraft:jzlib:1.0.7 at jar'
-
-@@ -48,15 +48,15 @@ dependencies {
- libraries.jul_to_slf4j,
- libraries.commons_io,
- libraries.commons_lang,
-- "commons-codec:commons-codec:1.2 at jar",
-+ "commons-codec:commons-codec:1.5 at jar",
- libraries.guava,
-- "commons-collections:commons-collections:3.2.1 at jar",
-+ "commons-collections:commons-collections3:3.2.1 at jar",
- "slide:webdavlib:2.0 at jar",
- libraries.asm_all,
-- 'org.fusesource.jansi:jansi:1.2.1',
-- 'org.jruby.ext.posix:jna-posix:1.0.3'
-+ 'org.fusesource.jansi:jansi:1.4',
-+ 'org.jruby.ext.posix:jna-posix:1.0.1'
-
-- runtime 'net.java.dev.jna:jna:3.2.2'
-+ runtime 'net.java.dev.jna:jna:3.2.7'
-
- runtime libraries.log4j_to_slf4j, libraries.jcl_to_slf4j
-
---- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
-+++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/api/internal/AbstractClassPathProvider.java
-@@ -63,7 +63,8 @@ public abstract class AbstractClassPathP
- protected static List<Pattern> toPatterns(String... patternStrings) {
- List<Pattern> patterns = new ArrayList<Pattern>();
- for (String patternString : patternStrings) {
-- patterns.add(Pattern.compile(patternString + "-.+"));
-+ //patterns.add(Pattern.compile(patternString + "-.+"));
-+ patterns.add(Pattern.compile(patternString + "-?.*"));
- }
- return patterns;
++ compile "org.codehaus.plexus:plexus-component-annotations-1.5:debian at jar"
+ }
+
+ useTestFixtures()
+--- a/subprojects/osgi/osgi.gradle
++++ b/subprojects/osgi/osgi.gradle
+@@ -21,7 +21,7 @@
+ compile project(':plugins')
+ compile libraries.slf4j_api
+
+- compile module('biz.aQute:bndlib:1.50.0')
++ compile module('biz.aQute:bndlib:debian')
+ }
+
+ useTestFixtures()
+--- a/subprojects/plugins/plugins.gradle
++++ b/subprojects/plugins/plugins.gradle
+@@ -36,7 +36,7 @@
+ compile libraries.commons_lang
+ compile libraries.junit
+ compile libraries.slf4j_api
+- compile 'org.testng:testng:6.3.1'
++ compile 'org.testng:testng:5.11 at jar'
+
+ provided files(Jvm.current().toolsJar) // for SunJavaCompiler
+
+--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java
++++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java
+@@ -36,7 +36,7 @@
+ public DefaultTestReport() {
+ htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js"));
+ htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css"));
+- htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
++ //htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/css3-pie-1.0beta3.htc"));
+ htmlRenderer.requireResource(getClass().getResource("style.css"));
}
+
+--- a/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css
++++ b/subprojects/plugins/src/main/resources/org/gradle/api/internal/tasks/testing/junit/report/style.css
+@@ -41,7 +41,7 @@
+ border: solid 2px #d0d0d0;
+ -moz-border-radius: 10px;
+ border-radius: 10px;
+- behavior: url(css3-pie-1.0beta3.htc);
++ /*behavior: url(css3-pie-1.0beta3.htc);*/
+ }
+
+ #successRate {
+--- a/subprojects/signing/signing.gradle
++++ b/subprojects/signing/signing.gradle
+@@ -21,9 +21,9 @@
+ compile project(":plugins")
+ compile project(":maven")
+
+- compile module("org.bouncycastle:bcpg-jdk15:1.46") {
+- dependency "org.bouncycastle:bcprov-jdk15:1.46 at jar"
++ compile module("org.bouncycastle:bcpg:debian") {
++ dependency "org.bouncycastle:bcprov:debian at jar"
+ }
+ }
+
+-useTestFixtures()
+\ No newline at end of file
++useTestFixtures()
diff --git a/debian/patches/02_sonar.diff b/debian/patches/02_sonar.diff
index 90e3dbd..0e28d56 100644
--- a/debian/patches/02_sonar.diff
+++ b/debian/patches/02_sonar.diff
@@ -1,28 +1,75 @@
Description: Disable Sonar features since it is not available in Debian yet
Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-05-22
+Author: Damien Raude-Morvan <drazzib at debian.org
+Forwarded: not-needed
+Last-Update: 2012-08-18
---- gradle-1.0~m3.orig/build.gradle
-+++ gradle-1.0~m3/build.gradle
-@@ -602,7 +602,8 @@ def runtimeProjects() {
+--- a/build.gradle
++++ b/build.gradle
+@@ -496,7 +496,8 @@
}
def pluginProjects() {
-- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar'].collect {
-+ //['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar'].collect {
-+ ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala'].collect {
+- ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear', 'javascript'].collect {
++ //['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear', 'javascript'].collect {
++ ['plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', 'ide', 'announce', 'scala', 'signing', 'cpp', 'ear', 'javascript'].collect {
project(it)
}
}
---- gradle-1.0~m3.orig/settings.gradle
-+++ gradle-1.0~m3/settings.gradle
-@@ -31,7 +31,7 @@ include 'openApi'
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -34,7 +34,7 @@
include 'toolingApi'
include 'docs'
include 'integTest'
-include 'sonar'
+//include 'sonar'
+ include 'signing'
+ include 'cpp'
+ include 'ear'
+--- a/subprojects/docs/src/docs/dsl/dsl.xml
++++ b/subprojects/docs/src/docs/dsl/dsl.xml
+@@ -271,9 +271,11 @@
+ <tr>
+ <td>org.gradle.plugins.signing.Sign</td>
+ </tr>
++<!--
+ <tr>
+ <td>org.gradle.api.plugins.sonar.SonarAnalyze</td>
+ </tr>
++-->
+ <tr>
+ <td>org.gradle.api.tasks.Sync</td>
+ </tr>
+@@ -410,4 +412,4 @@
+ </para>
+ </section>
- rootProject.name = 'gradle'
- rootProject.children.each {project ->
+-</book>
+\ No newline at end of file
++</book>
+--- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml
++++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml
+@@ -147,9 +147,8 @@
+ <tr>
+ <td><literal>sonarAnalyze</literal></td>
+ <td>-</td>
+- <td><apilink class="org.gradle.api.plugins.sonar.SonarAnalyze"/></td>
+ <td>Analyzes a project hierarchy and stores the results in the Sonar database.</td>
+ </tr>
+ </table>
+ </section>
+-</chapter>
+\ No newline at end of file
++</chapter>
+--- a/subprojects/docs/src/docs/userguide/userguide.xml
++++ b/subprojects/docs/src/docs/userguide/userguide.xml
+@@ -69,7 +69,7 @@
+ <xi:include href='findBugsPlugin.xml'/>
+ <xi:include href='jdependPlugin.xml'/>
+ <xi:include href='pmdPlugin.xml'/>
+- <xi:include href='sonarPlugin.xml'/>
++<!-- <xi:include href='sonarPlugin.xml'/> -->
+ <xi:include href='osgi.xml'/>
+ <xi:include href='eclipsePlugin.xml'/>
+ <xi:include href='ideaPlugin.xml'/>
diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff
index a5f139d..7a98a38 100644
--- a/debian/patches/03_plexus.diff
+++ b/debian/patches/03_plexus.diff
@@ -1,12 +1,11 @@
Description: Plexus compatibility
Author: Miguel Landaeta <miguel at miguel.cc>
+Author: Damien Raude-Morvan <drazzib at debian.org
Forwarded: no
-Last-Update: 2010-08-23
+Last-Update: 2012-08-18
-Index: b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java
-===================================================================
---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-22 16:17:01.000000000 -0430
-+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/PlexusLoggerAdapter.java 2010-08-23 19:18:30.000000000 -0430
+--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
++++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
@@ -98,4 +98,8 @@
public String getName() {
return logger.getName();
diff --git a/debian/patches/04_webdavlib.diff b/debian/patches/04_webdavlib.diff
deleted file mode 100644
index 6f9b709..0000000
--- a/debian/patches/04_webdavlib.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Disable Jakarta Slide WebDAV library
- Jakarta Slide WebDAV library is not available in Debian,
- and this project was retired by its upstream developers.
- Please see http://jakarta.apache.org/slide/.
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: not-needed
-Last-Update: 2011-05-10
-
---- gradle-1.0~m3.orig/subprojects/core/core.gradle
-+++ gradle-1.0~m3/subprojects/core/core.gradle
-@@ -51,7 +51,7 @@ dependencies {
- "commons-codec:commons-codec:1.5 at jar",
- libraries.guava,
- "commons-collections:commons-collections3:3.2.1 at jar",
-- "slide:webdavlib:2.0 at jar",
-+ //"slide:webdavlib:2.0 at jar",
- libraries.asm_all,
- 'org.fusesource.jansi:jansi:1.4',
- 'org.jruby.ext.posix:jna-posix:1.0.1'
---- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
-+++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/api/internal/artifacts/repositories/WebdavRepository.java
-@@ -17,7 +17,6 @@ package org.gradle.api.internal.artifact
-
- import org.apache.commons.httpclient.HttpsURL;
- import org.apache.ivy.plugins.repository.url.URLRepository;
--import org.apache.webdav.lib.WebdavResource;
-
- import java.io.File;
- import java.io.IOException;
-@@ -52,9 +51,12 @@ public class WebdavRepository extends UR
- String destinationFileName = destination.substring(fileNameStart + 1);
- HttpsURL hrl = new HttpsURL(baseUrl);
- hrl.setUserinfo(user, userPassword);
-+ /*
- WebdavResource wdr = new WebdavResource(hrl);
- wdr.putMethod(wdr.getPath() + '/' + destinationFileName, source);
- wdr.close();
-+ */
-+ throw new UnsupportedOperationException("put");
- }
-
- // Alternative implementation with httpclient only. Unfortunately this is slower.
diff --git a/debian/patches/05_polyglot_maven.diff b/debian/patches/05_polyglot_maven.diff
deleted file mode 100644
index 910dd70..0000000
--- a/debian/patches/05_polyglot_maven.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Disable Polyglot Maven features
- Polyglot Maven is not packaged in Debian yet.
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: not-needed
-Last-Update: 2011-05-21
-
---- gradle-1.0~m3.orig/subprojects/core-impl/core-impl.gradle
-+++ gradle-1.0~m3/subprojects/core-impl/core-impl.gradle
-@@ -8,8 +8,8 @@ dependencies {
- compile libraries.commons_lang
- compile libraries.ivy
- compile "org.apache.maven:maven-ant-tasks:2.1.1 at jar"
-- compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
-- compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
-+ //compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
-+ //compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
- //compile "org.codehaus.plexus:plexus-component-annotations:1.5.2 at jar"
- compile "org.codehaus.plexus:plexus-component-annotations:1.0-beta-3.0.7 at jar"
- compile "org.codehaus.plexus:plexus-component-api:1.0-alpha-22 at jar"
---- gradle-1.0~m3.orig/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
-+++ gradle-1.0~m3/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/ModelFactory.java
-@@ -17,27 +17,31 @@ package org.gradle.api.internal.artifact
-
- import groovy.util.FactoryBuilderSupport;
- import org.apache.maven.model.Model;
--import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory;
-+//import org.sonatype.maven.polyglot.groovy.builder.factory.NamedFactory;
-
- import java.util.Map;
-
- /**
- * This is a slightly modified version as shipped with polyglot Maven.
- */
--public class ModelFactory extends NamedFactory {
-+//public class ModelFactory extends NamedFactory {
-+public class ModelFactory {
- private Model model;
-
- public ModelFactory(Model model) {
-+ /*
- super("project");
- this.model = model;
-+ */
-+ throw new UnsupportedOperationException("ModelFactory");
- }
-
- public Object newInstance(FactoryBuilderSupport builder, Object name, Object value, Map attrs) throws InstantiationException, IllegalAccessException {
- return model;
- }
-
-- @Override
-+ //@Override
- public void onNodeCompleted(FactoryBuilderSupport builder, Object parent, Object node) {
- Model model = (Model)node;
- }
--}
-\ No newline at end of file
-+}
---- gradle-1.0~m3.orig/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
-+++ gradle-1.0~m3/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/publish/maven/pombuilder/CustomModelBuilder.java
-@@ -19,9 +19,11 @@ import groovy.util.FactoryBuilderSupport
- import org.apache.maven.model.Model;
- import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
- import org.slf4j.LoggerFactory;
-+/*
- import org.sonatype.maven.polyglot.execute.ExecuteManager;
- import org.sonatype.maven.polyglot.execute.ExecuteManagerImpl;
- import org.sonatype.maven.polyglot.groovy.builder.ModelBuilder;
-+*/
-
- import java.lang.reflect.Field;
- import java.util.Map;
-@@ -29,9 +31,11 @@ import java.util.Map;
- /**
- * This is a slightly modified version as shipped with polyglot Maven.
- */
--public class CustomModelBuilder extends ModelBuilder {
-+//public class CustomModelBuilder extends ModelBuilder {
-+public class CustomModelBuilder {
-
- public CustomModelBuilder(Model model) {
-+ /*
- ExecuteManager executeManager = new ExecuteManagerImpl();
- setProp(executeManager.getClass(), executeManager, "log",
- new PlexusLoggerAdapter(LoggerFactory.getLogger(ExecuteManagerImpl.class)));
-@@ -47,6 +51,8 @@ public class CustomModelBuilder extends
- factories.remove("project");
- ModelFactory modelFactory = new ModelFactory(model);
- registerFactory(modelFactory.getName(), null, modelFactory);
-+ */
-+ throw new UnsupportedOperationException("CustomModelBuilder");
- }
-
- public static void setProp(Class c, Object obj, String fieldName, Object value) {
-@@ -78,4 +84,4 @@ public class CustomModelBuilder extends
- throw new RuntimeException(e);
- }
- }
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/10_fix_version.diff b/debian/patches/10_fix_version.diff
deleted file mode 100644
index ffd4729..0000000
--- a/debian/patches/10_fix_version.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove build timestamp from the version string
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2010-12-20
-
---- gradle-0.9.orig/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
-+++ gradle-0.9/buildSrc/src/main/groovy/org/gradle/build/Version.groovy
-@@ -48,7 +48,7 @@ class Version {
- if (graph.hasTask(':releaseVersion')) {
- release = true
- } else {
-- this.versionNumber += "-" + getTimestamp()
-+ //this.versionNumber += "-" + getTimestamp()
- release = false
- }
- }
diff --git a/debian/patches/11_fix_jni_path.diff b/debian/patches/11_fix_jni_path.diff
index 599ee1f..a49ecc1 100644
--- a/debian/patches/11_fix_jni_path.diff
+++ b/debian/patches/11_fix_jni_path.diff
@@ -1,31 +1,31 @@
Description: Set the correct path to locate jnidispatch.so library
Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-05-23
+Author: Damien Raude-Morvan <drazzib at debian.org
+Forwarded: not-needed
+Last-Update: 2012-08-18
---- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
-+++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
-@@ -107,7 +107,8 @@ public class LoggingServiceRegistry exte
- protected OutputEventRenderer createOutputEventRenderer() {
- Spec<FileDescriptor> terminalDetector;
+--- a/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
++++ b/subprojects/core/src/main/groovy/org/gradle/logging/LoggingServiceRegistry.java
+@@ -123,7 +123,7 @@
+ TerminalDetector terminalDetector;
if (detectConsole) {
-- terminalDetector = new TerminalDetector(StartParameter.DEFAULT_GRADLE_USER_HOME);
-+ //terminalDetector = new TerminalDetector(StartParameter.DEFAULT_GRADLE_USER_HOME);
-+ terminalDetector = new TerminalDetector(new java.io.File("/usr/lib"));
+ StartParameter startParameter = new StartParameter();
+- JnaBootPathConfigurer jnaConfigurer = new JnaBootPathConfigurer(startParameter.getGradleUserHomeDir());
++ JnaBootPathConfigurer jnaConfigurer = new JnaBootPathConfigurer(new java.io.File("/usr/lib"));
+ terminalDetector = new TerminalDetectorFactory().create(jnaConfigurer);
} else {
- terminalDetector = Specs.satisfyNone();
- }
---- gradle-1.0~m3.orig/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
-+++ gradle-1.0~m3/subprojects/core/src/main/groovy/org/gradle/logging/internal/TerminalDetector.java
-@@ -29,8 +29,9 @@ import java.io.*;
- public class TerminalDetector implements Spec<FileDescriptor> {
- public TerminalDetector(File libCacheDir) {
- // Some hackery to prevent JNA from creating a shared lib in the tmp dir, as it does not clean things up
-- File tmpDir = new File(libCacheDir, "jna");
+ terminalDetector = new NoOpTerminalDetector();
+--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java
++++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/jna/JnaBootPathConfigurer.java
+@@ -45,8 +45,9 @@
+ }
+
+ public void configure() throws NativeIntegrationUnavailableException {
+- File tmpDir = new File(storageDir, "jna");
- tmpDir.mkdirs();
-+ //File tmpDir = new File(libCacheDir, "jna");
-+ File tmpDir = new File(libCacheDir, "jni");
++ //File tmpDir = new File(storageDir, "jna");
++ File tmpDir = new File(storageDir, "jni");
+ //tmpDir.mkdirs();
- String libName = System.mapLibraryName("jnidispatch");
- File libFile = new File(tmpDir, libName);
+ String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch");
+ File libFile = new File(tmpDir, jnaLibName);
if (!libFile.exists()) {
diff --git a/debian/patches/12_fix_missing_classpath.diff b/debian/patches/12_fix_missing_classpath.diff
deleted file mode 100644
index 21c31ef..0000000
--- a/debian/patches/12_fix_missing_classpath.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Set missing Class-Path in jars
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-05-24
-
---- gradle-1.0~m3.orig/build.gradle
-+++ gradle-1.0~m3/build.gradle
-@@ -122,10 +122,20 @@ configure(groovyProjects()) {
- }
-
- tasks.withType(Jar).each { jar ->
-- jar.manifest.mainAttributes([
-- (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
-- (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
-- ])
-+ // Set missing Class-Path in jars
-+ if (jar.getArchiveName() ==~ /^gradle-core-[0-9].*/) {
-+ jar.manifest.mainAttributes([
-+ (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
-+ (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
-+ (Attributes.Name.CLASS_PATH.toString()): 'logback-core.jar logback-classic.jar google-collections.jar joptsimple.jar commons-collections3.jar commons-httpclient.jar commons-io.jar commons-lang.jar jansi.jar asm3-all.jar jcl-over-slf4j.jar log4j-over-slf4j.jar slf4j-log4j12.jar jul-to-slf4j.jar maven-ant-tasks.jar maven-artifact-manager.jar maven-artifact.jar maven-model.jar maven-project.jar plexus-component-api.jar plexus-utils.jar libplexus-utils.jar',
-+ ])
-+ } else {
-+ jar.manifest.mainAttributes([
-+ (Attributes.Name.IMPLEMENTATION_TITLE.toString()): 'Gradle',
-+ (Attributes.Name.IMPLEMENTATION_VERSION.toString()): version,
-+ (Attributes.Name.CLASS_PATH.toString()): 'grails-core.jar',
-+ ])
-+ }
- }
- }
-
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
index 251492e..a0ecb7d 100644
--- a/debian/patches/13_fix_javadocs_links.diff
+++ b/debian/patches/13_fix_javadocs_links.diff
@@ -1,19 +1,31 @@
Description: Link javadocs with local -doc packages
Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-05-29
+Author: Damien Raude-Morvan <drazzib at debian.org
+Forwarded: not-needed
+Last-Update: 2012-08-18
---- gradle-1.0~m3.orig/subprojects/docs/docs.gradle
-+++ gradle-1.0~m3/subprojects/docs/docs.gradle
-@@ -238,8 +238,9 @@ task javadoc(type: Javadoc) {
+--- a/subprojects/docs/docs.gradle
++++ b/subprojects/docs/docs.gradle
+@@ -226,8 +226,10 @@
+ classpath = configurations.userGuideTask
+ }
+
+-def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
+-def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
++//def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
++def javaApiUrl = "file:///usr/share/doc/default-jdk-doc/api"
++//def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
++def groovyApiUrl = "file:///usr/share/doc/groovy-doc/gapi/"
+
+ task javadoc(type: Javadoc) {
+ ext.stylesheetFile = file("src/docs/css/javadoc.css")
+@@ -249,8 +251,7 @@
include 'org/gradle/testfixtures/**'
include 'org/gradle/tooling/**'
exclude '**/internal/**'
-- options.links("http://download.oracle.com/javase/1.5.0/docs/api", "http://groovy.codehaus.org/gapi/", "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
+- options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
- "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
-+ //options.links("http://download.oracle.com/javase/1.5.0/docs/api", "http://groovy.codehaus.org/gapi/", "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
-+ // "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
-+ options.links("file:///usr/share/doc/default-jdk-doc/api", "file:///usr/share/doc/groovy-doc/gapi/", "file:///usr/share/doc/libmaven2-core-java/api")
++ options.links(javaApiUrl, groovyApiUrl, "file:///usr/share/doc/libmaven2-core-java/api")
doFirst {
title = "Gradle API $version"
}
diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff
index 3f0b787..9577c03 100644
--- a/debian/patches/21_docs.diff
+++ b/debian/patches/21_docs.diff
@@ -1,79 +1,49 @@
-Description: Generate javadocs and groovydocs only
- I still have to figure out how to build the rest of the documentation
- using DocBook and other libraries available in Debian.
+Description: Fix build of documentation to build everything
+ using docbook-xsl, xalan2 and xhtmlrenderer from Debian
Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-05-10
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-08-18
---- gradle-1.0~m3.orig/build.gradle
-+++ gradle-1.0~m3/build.gradle
-@@ -393,7 +393,7 @@ binDistImage = copySpec {
- from('src/toplevel') {
- expand(version: version)
- }
-- from project(':docs').distDocs.destFile
-+ //from project(':docs').distDocs.destFile
- into('bin') {
- from startScriptsDir
- fileMode = 0755
-@@ -422,14 +422,16 @@ allDistImage = copySpec {
- }
- }
-
--task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs', 'docs:samples']) {
-+//task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs', 'docs:samples']) {
-+task allZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs']) {
- classifier = 'all'
- into(zipRootFolder) {
- with allDistImage
- }
- }
-
--task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:distDocs']) {
-+//task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:distDocs']) {
-+task binZip(type: Zip, dependsOn: ['launcher:startScripts', 'docs:docs']) {
- classifier = 'bin'
- into(zipRootFolder) {
- with binDistImage
-@@ -495,7 +497,8 @@ def guessMaxForks() {
-
- task testedDists(dependsOn: [assemble, check, integTests])
-
--task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs'])
-+//task nightlyBuild(dependsOn: [clean, testedDists, ':docs:uploadDocs'])
-+task nightlyBuild(dependsOn: [clean, testedDists])
-
- task install(type: Install) {
- description = 'Installs the minimal distribution into directory $gradle_installPath'
-@@ -579,7 +582,8 @@ task releaseArtifacts {
- task release {
- description = 'Builds, tests and uploads the release artifacts'
- group = 'release'
-- dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs'
-+ //dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists, ':docs:uploadDocs'
-+ dependsOn releaseVersion, tag, releaseArtifacts, testedDists, uploadArchives, uploadDists
- }
+--- a/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
++++ b/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
+@@ -71,8 +71,8 @@
+ jvmArgs '-Xmx256m'
+ classpath ClasspathUtil.getClasspathForClass(XslTransformer)
+ classpath this.classpath
+- classpath new File(stylesheetsDir, 'extensions/xalan27.jar')
+- systemProperty 'xslthl.config', new File("$stylesheetsDir/highlighting/xslthl-config.xml").toURI()
++ classpath new File('/usr/share/java/xalan2.jar')
++ systemProperty 'xslthl.config', new File("/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/xslthl-config.xml").toURI()
+ systemProperty 'org.apache.xerces.xni.parser.XMLParserConfiguration', 'org.apache.xerces.parsers.XIncludeParserConfiguration'
+ }
+ }
+--- a/subprojects/docs/docs.gradle
++++ b/subprojects/docs/docs.gradle
+@@ -27,18 +27,18 @@
+ apply plugin: 'jsoup'
- task wrapper(type: Wrapper) {
---- gradle-1.0~m3.orig/subprojects/docs/docs.gradle
-+++ gradle-1.0~m3/subprojects/docs/docs.gradle
-@@ -28,6 +28,7 @@ configurations {
+ configurations {
+- userGuideStyleSheets
++ //userGuideStyleSheets
userGuideTask
}
-+/*
dependencies {
- userGuideTask 'xalan:xalan:2.7.1', 'xerces:xercesImpl:2.9.1'
- userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
-@@ -37,6 +38,7 @@ dependencies {
+- userGuideTask 'xalan:xalan:2.7.1', 'xerces:xercesImpl:2.9.1'
+- userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
++ userGuideTask 'xalan:xalan2:2.7.1', 'xerces:xercesImpl:2.9.1'
++ userGuideTask module('xhtmlrenderer:core-renderer:R8') {
+ dependency 'itext:itext:2.0.8 at jar'
+ }
+ userGuideTask 'xslthl:xslthl:2.0.1 at jar'
- userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
+- userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
++ //userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
}
-+*/
-
- RemoteLocations remoteLocations = new RemoteLocations(version: version)
-@@ -94,10 +96,10 @@ task userguideStyleSheets(type: Copy) {
+ ext {
+@@ -116,10 +116,10 @@
from(cssSrcDir) {
include '*.css'
}
@@ -88,13 +58,100 @@ Last-Update: 2011-05-10
}
task samplesDocbook(type: AssembleSamplesDocTask) {
-@@ -332,7 +334,8 @@ task userguide {
- }
+--- a/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
++++ b/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
+@@ -14,7 +14,7 @@
+ ~ limitations under the License.
+ -->
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0">
+- <xsl:import href="html/chunkfast.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/>
+ <xsl:import href="userGuideHtmlCommon.xsl"/>
- task docs {
-- dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml
-+ //dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml
-+ dependsOn javadoc, groovydoc
- description = 'Generates all documentation'
- group = 'documentation'
- }
+ <xsl:output method="html" doctype-system="http://www.w3.org/TR/html4/strict.dtd"
+@@ -209,4 +209,4 @@
+ <dt><xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>:</dt>
+ <dd><xsl:apply-templates/></dd>
+ </xsl:template>
+-</xsl:stylesheet>
+\ No newline at end of file
++</xsl:stylesheet>
+--- a/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl
++++ b/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl
+@@ -17,7 +17,7 @@
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ version="1.0">
+- <xsl:import href="html/docbook.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/>
+ <xsl:import href="userGuideHtmlCommon.xsl"/>
+
+ <xsl:param name="section.autolabel">0</xsl:param>
+@@ -36,4 +36,4 @@
+ <xi:include href="userguide.css" parse="text"/>
+ </style>
+ </xsl:template>
+-</xsl:stylesheet>
+\ No newline at end of file
++</xsl:stylesheet>
+--- a/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl
++++ b/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl
+@@ -15,7 +15,7 @@
+ -->
+ <xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+- <xsl:import href="html/chunkfast.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/>
+ <xsl:import href="userGuideHtmlCommon.xsl"/>
+
+ <xsl:param name="root.filename">userguide</xsl:param>
+@@ -84,4 +84,4 @@
+ </div>
+ </xsl:template>
+
+-</xsl:stylesheet>
+\ No newline at end of file
++</xsl:stylesheet>
+--- a/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl
++++ b/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl
+@@ -16,8 +16,8 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:xslthl="http://xslthl.sf.net"
+ version="1.0">
+- <xsl:import href="highlighting/common.xsl"/>
+- <xsl:import href="html/highlight.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/common.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/highlight.xsl"/>
+
+ <xsl:output method="html"
+ encoding="UTF-8"
+--- a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
++++ b/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
+@@ -14,7 +14,7 @@
+ ~ limitations under the License.
+ -->
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+- <xsl:import href="xhtml/docbook.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/docbook.xsl"/>
+ <xsl:import href="userGuideHtmlCommon.xsl"/>
+
+ <xsl:output method="xml"
+@@ -59,4 +59,4 @@
+ <xsl:apply-templates select=".." mode="title.markup"/>
+ </h1>
+ </xsl:template>
+-</xsl:stylesheet>
+\ No newline at end of file
++</xsl:stylesheet>
+--- a/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl
++++ b/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl
+@@ -15,6 +15,6 @@
+ -->
+ <xsl:stylesheet
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+- <xsl:import href="html/docbook.xsl"/>
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/>
+ <xsl:import href="userGuideHtmlCommon.xsl"/>
+-</xsl:stylesheet>
+\ No newline at end of file
++</xsl:stylesheet>
diff --git a/debian/patches/22_checkstyle.diff b/debian/patches/22_checkstyle.diff
deleted file mode 100644
index a5848fe..0000000
--- a/debian/patches/22_checkstyle.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Disable checkstyle features
- There is a conflict due to classpath issues with Checkstyle and ANTLR.
- While I debug this problem, checkstyle checks over Gradle source code are not
- performed.
-Author: Miguel Landaeta <miguel at miguel.cc>
-Forwarded: no
-Last-Update: 2011-03-22
-
---- gradle-0.9.2.orig/buildSrc/build.gradle
-+++ gradle-0.9.2/buildSrc/build.gradle
-@@ -16,7 +16,7 @@
- import org.apache.ivy.plugins.resolver.FileSystemResolver
-
- apply plugin: 'groovy'
--apply plugin: 'code-quality'
-+//apply plugin: 'code-quality'
- apply plugin: 'idea'
- apply plugin: 'eclipse'
-
-@@ -43,4 +43,4 @@ compileTestGroovy {
- }
-
- //apply from: '../gradle/compile.gradle'
--apply from: '../gradle/codeQuality.gradle'
-+//apply from: '../gradle/codeQuality.gradle'
diff --git a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
index 09bc7e1..0a056ad 100644
--- a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
+++ b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
@@ -1,56 +1,130 @@
Description: Replace jna-posix library with jnr-posix
jna-posix is not longer supported and was replaced with jnr-posix.
+Bug-vendor: http://issues.gradle.org/browse/GRADLE-2422
Author: Miguel Landaeta <miguel at miguel.cc>
+Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: no
-Last-Update: 2011-06-02
+Last-Update: 2012-08-18
-diff --git a/subprojects/core/core.gradle b/subprojects/core/core.gradle
-index 4260cbd..ba3c9e0 100644
---- a/subprojects/core/core.gradle
-+++ b/subprojects/core/core.gradle
-@@ -54,7 +54,8 @@ dependencies {
- //"slide:webdavlib:2.0 at jar",
- libraries.asm_all,
- 'org.fusesource.jansi:jansi:1.4',
-- 'org.jruby.ext.posix:jna-posix:1.0.1'
-+ 'org.jruby.ext.posix:jnr-posix:1.1.4',
-+ 'com.kenai.constantine:constantine:0.7'
-
- runtime 'net.java.dev.jna:jna:3.2.7'
-
-diff --git a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
-index 720e287..2f5aa9a 100644
---- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
-@@ -35,7 +35,8 @@ public class WorkerProcessClassPathProvider extends AbstractClassPathProvider {
-
- public WorkerProcessClassPathProvider(CacheRepository cacheRepository) {
- this.cacheRepository = cacheRepository;
-- add("WORKER_PROCESS", toPatterns("gradle-core", "slf4j-api", "logback-classic", "logback-core", "jul-to-slf4j", "jansi", "jna", "jna-posix"));
-+ //add("WORKER_PROCESS", toPatterns("gradle-core", "slf4j-api", "logback-classic", "logback-core", "jul-to-slf4j", "jansi", "jna", "jna-posix"));
-+ add("WORKER_PROCESS", toPatterns("gradle-core", "slf4j-api", "logback-classic", "logback-core", "jul-to-slf4j", "jansi", "jna", "jnr-posix"));
+--- a/build.gradle
++++ b/build.gradle
+@@ -101,7 +101,7 @@
+ groovy: 'org.codehaus.groovy:groovy-all:debian at jar',
+ jaxen: 'jaxen:jaxen:debian at jar',
+ jcip: "net.jcip:jcip:debian",
+- jna: 'net.java.dev.jna:jna:3.2.7 at jar',
++ jna: 'net.java.dev.jna:jna:debian at jar',
+ junit: 'junit:junit4:4.x',
+ xmlunit: 'xmlunit:xmlunit:debian',
+ nekohtml: dependencies.module('net.sourceforge.nekohtml:nekohtml:debian') {
+--- a/subprojects/native/native.gradle
++++ b/subprojects/native/native.gradle
+@@ -10,10 +10,13 @@
+ compile libraries.commons_io
+ compile libraries.slf4j_api
+ compile libraries.jna
+- compile module('org.jruby.ext.posix:jna-posix:1.0.3') {
++ compile module('org.jruby.ext.posix:jnr-posix:debian') {
+ dependency libraries.jna
++ dependency 'org.jruby.extras:constantine:debian'
++ dependency 'org.jruby.extras:jaffl:debian'
++ dependency 'org.jruby.extras:jffi:debian'
}
+- compile module('org.fusesource.jansi:jansi:1.2.1') {
++ compile module('org.fusesource.jansi:jansi:debian') {
+ dependency libraries.jna
+ }
+ compile libraries.guava
+--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
++++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/FileSystemServices.java
+@@ -23,8 +23,6 @@
+ import org.gradle.internal.os.OperatingSystem;
+ import org.gradle.internal.service.DefaultServiceRegistry;
+ import org.gradle.internal.service.ServiceRegistry;
+-import org.jruby.ext.posix.BaseNativePOSIX;
+-import org.jruby.ext.posix.JavaPOSIX;
+ import org.jruby.ext.posix.POSIX;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
+@@ -61,7 +59,7 @@
+ if (operatingSystem.isLinux() || operatingSystem.isMacOsX()) {
+ FilePathEncoder filePathEncoder = createEncoder(libC);
+ serviceRegistry.add(Chmod.class, new LibcChmod(libC, filePathEncoder));
+- serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, (BaseNativePOSIX) PosixUtil.current(), filePathEncoder));
++ serviceRegistry.add(Stat.class, new LibCStat(libC, operatingSystem, PosixUtil.current(), filePathEncoder));
+ return;
+ }
- public Set<File> findClassPath(String name) {
-diff --git a/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java b/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java
-index 96c90a8..62eb360 100644
---- a/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/util/PosixUtil.java
-@@ -24,6 +24,8 @@ import java.io.File;
- import java.io.InputStream;
- import java.io.PrintStream;
+@@ -95,7 +93,7 @@
+
+ private static Stat createStat() {
+ POSIX posix = PosixUtil.current();
+- if (posix instanceof JavaPOSIX) {
++ if (posix.getClass().toString().equals("org.jruby.ext.posix.JavaPOSIX")) {
+ return new FallbackStat();
+ } else {
+ return new PosixStat(posix);
+--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
++++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/LibCStat.java
+@@ -18,9 +18,8 @@
+
+ import org.gradle.internal.nativeplatform.jna.LibC;
+ import org.gradle.internal.os.OperatingSystem;
+-import org.jruby.ext.posix.BaseNativePOSIX;
+ import org.jruby.ext.posix.FileStat;
+-import org.jruby.ext.posix.Linux64FileStat;
++import org.jruby.ext.posix.POSIX;
+
+ import java.io.File;
+ import java.io.IOException;
+@@ -29,9 +28,9 @@
+ private final LibC libc;
+ private final FilePathEncoder encoder;
+ private final OperatingSystem operatingSystem;
+- private final BaseNativePOSIX nativePOSIX;
++ private final POSIX nativePOSIX;
+
+- public LibCStat(LibC libc, OperatingSystem operatingSystem, BaseNativePOSIX nativePOSIX, FilePathEncoder encoder) {
++ public LibCStat(LibC libc, OperatingSystem operatingSystem, POSIX nativePOSIX, FilePathEncoder encoder) {
+ this.libc = libc;
+ this.operatingSystem = operatingSystem;
+ this.nativePOSIX = nativePOSIX;
+@@ -39,17 +38,7 @@
+ }
+
+ public int getUnixMode(File f) throws IOException {
+- FileStat stat = nativePOSIX.allocateStat();
+- initPlatformSpecificStat(stat, encoder.encode(f));
++ FileStat stat = nativePOSIX.stat(new String(encoder.encode(f)));
+ return stat.mode() & 0777;
+ }
+-
+- private void initPlatformSpecificStat(FileStat stat, byte[] encodedFilePath) {
+- if (operatingSystem.isMacOsX()) {
+- libc.stat(encodedFilePath, stat);
+- } else {
+- final int statVersion = stat instanceof Linux64FileStat ? 3 : 0;
+- libc.__xstat64(statVersion, encodedFilePath, stat);
+- }
+- }
+ }
+--- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
++++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/filesystem/PosixUtil.java
+@@ -20,6 +20,8 @@
+ import org.jruby.ext.posix.POSIXFactory;
+ import org.jruby.ext.posix.POSIXHandler;
+import com.kenai.constantine.platform.Errno;
+
- public class PosixUtil {
- private static final POSIX POSIX = POSIXFactory.getPOSIX(new POSIXHandlerImpl(), true);
-
-@@ -32,7 +34,7 @@ public class PosixUtil {
+ import java.io.File;
+ import java.io.InputStream;
+ import java.io.PrintStream;
+@@ -32,7 +34,7 @@
}
-
+
private static class POSIXHandlerImpl implements POSIXHandler {
-- public void error(POSIX.ERRORS errors, String message) {
-+ public void error(Errno error, String extraData) {
- throw new UnsupportedOperationException();
+- public void error(POSIX.ERRORS error, String message) {
++ public void error(Errno error, String message) {
+ throw new UnsupportedOperationException(error + " - " + message);
}
diff --git a/debian/patches/24_pegdown.diff b/debian/patches/24_pegdown.diff
new file mode 100644
index 0000000..1ae9ac0
--- /dev/null
+++ b/debian/patches/24_pegdown.diff
@@ -0,0 +1,102 @@
+Description: Disable release notes and PegDown
+ org.pegdown is not available in Debian yet, so
+ disable release notes inclusion during build
+ and remove PegDownProcessor.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Bug-Debian: http://bugs.debian.org/685874
+Forwarded: not-needed
+Last-Update: 2012-08-18
+
+--- a/buildSrc/build.gradle
++++ b/buildSrc/build.gradle
+@@ -40,7 +40,6 @@
+ testCompile 'junit:junit4:4.x at jar'
+ testCompile 'org.spockframework:spock-core:0.6-groovy-1.8 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 "com.googlecode.jarjar:jarjar:1.3"
+ }
+--- a/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy
++++ b/buildSrc/src/main/groovy/org/gradle/plugins/pegdown/PegDown.groovy
+@@ -21,9 +21,9 @@
+ import org.gradle.api.tasks.SourceTask
+ import org.gradle.api.tasks.OutputFile
+ import org.gradle.api.tasks.TaskAction
+-import org.pegdown.Extensions
++//import org.pegdown.Extensions
+ import org.gradle.api.InvalidUserDataException
+-import org.pegdown.PegDownProcessor
++//import org.pegdown.PegDownProcessor
+
+ class PegDown extends SourceTask {
+
+@@ -50,11 +50,12 @@
+
+ @TaskAction
+ void process() {
+- int optionsValue = getCalculatedOptions()
++ /*int optionsValue = getCalculatedOptions()
+ PegDownProcessor processor = new PegDownProcessor(optionsValue)
+ String markdown = getSource().singleFile.getText(getInputEncoding())
+ String html = processor.markdownToHtml(markdown)
+- getDestination().write(html, getOutputEncoding())
++ getDestination().write(html, getOutputEncoding())*/
++ throw new UnsupportedOperationException("PegDown");
+ }
+
+ int getCalculatedOptions() {
+@@ -63,11 +64,11 @@
+
+ protected int toOptionValue(String optionName) {
+ String upName = val.toUpperCase()
+- try {
++ /*try {
+ Extensions."$upName"
+ } catch (MissingPropertyException e) {
+ throw new InvalidUserDataException("$optionName is not a valid PegDown extension name")
+- }
++ }*/
+ }
+
+ void options(String... options) {
+--- a/subprojects/docs/docs.gradle
++++ b/subprojects/docs/docs.gradle
+@@ -23,7 +23,6 @@
+ import org.gradle.internal.os.OperatingSystem
+
+ apply plugin: 'base'
+-apply plugin: 'pegdown'
+ apply plugin: 'jsoup'
+
+ configurations {
+@@ -62,7 +61,7 @@
+ builtBy 'distDocs'
+ }
+ outputs.docs = files(docsDir) {
+- builtBy 'javadoc', 'groovydoc', 'userguide', 'dslHtml', 'releaseNotes'
++ builtBy 'javadoc', 'groovydoc', 'userguide', 'dslHtml'
+ }
+
+ tasks.withType(Docbook2Xhtml) {
+@@ -336,10 +335,9 @@
+ from project.outputs.docs
+ }
+
+-import org.gradle.plugins.pegdown.PegDown
+ import org.gradle.plugins.jsoup.Jsoup
+
+-task editReleaseNotes() << {
++/* task editReleaseNotes() << {
+ Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md"))
+ }
+
+@@ -370,7 +368,7 @@
+
+ task viewReleaseNotes(dependsOn: releaseNotes) << {
+ Class.forName("java.awt.Desktop").newInstance().browse(new File(releaseNotes.destinationDir, releaseNotes.fileName).toURI())
+-}
++}*/
+
+ class Xhtml2Pdf extends DefaultTask {
+ @InputFile
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
new file mode 100644
index 0000000..4ac450a
--- /dev/null
+++ b/debian/patches/26_disable_commitid.diff
@@ -0,0 +1,33 @@
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-08-18
+
+--- a/build.gradle
++++ b/build.gradle
+@@ -224,7 +224,7 @@
+ testResultsDir = file("${buildDir}/test-results")
+ projects = subprojects
+ }
+-
++/*
+ task determineCommitId {
+ ext.commitId = null
+
+@@ -269,14 +269,15 @@
+ }
+ }
+ }
++*/
+
+-task createBuildReceipt(dependsOn: determineCommitId) {
++task createBuildReceipt {
+ ext.receiptFile = file("$buildDir/build-receipt.properties")
+ outputs.file receiptFile
+ outputs.upToDateWhen { false }
+ doLast {
+ def data = [
+- commitId: determineCommitId.commitId,
++ commitId: "UNKNOWN",
+ versionNumber: version,
+ buildTimestamp: buildTimestamp,
+ username: System.properties["user.name"],
diff --git a/debian/patches/27_maven.diff b/debian/patches/27_maven.diff
new file mode 100644
index 0000000..9d699e9
--- /dev/null
+++ b/debian/patches/27_maven.diff
@@ -0,0 +1,55 @@
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-08-18
+
+--- a/subprojects/core-impl/core-impl.gradle
++++ b/subprojects/core-impl/core-impl.gradle
+@@ -20,7 +20,7 @@
+ compile libraries.nekohtml
+
+ testCompile libraries.junit
+-
++/*
+ compile files(["$buildDir/libs/jarjar/jarjar-maven-settings-3.0.4.jar",
+ "$buildDir/libs/jarjar/jarjar-maven-settings-builder-3.0.4.jar",
+ "$buildDir/libs/jarjar/jarjar-plexus-cipher-1.4.jar",
+@@ -30,18 +30,19 @@
+ "$buildDir/libs/jarjar/jarjar-plexus-utils-2.0.6.jar"]) {
+ builtBy tasks.withType(JarJar)
+ }
++*/
+
+- mvn3Input libraries.maven3_settings_builder
++ compile libraries.maven3_settings_builder
+ }
+-configurations.mvn3Input.files.each{libFile->
++/*configurations.mvn3Input.files.each{libFile->
+ task "jarjar-${libFile.name}"(type: JarJar) {
+ inputFile = libFile
+ outputFile = file("$buildDir/libs/jarjar/jarjar-${libFile.name}")
+ rule('org.**', 'jarjar.org. at 1')
+ }
+-}
++}*/
+
+-def allJarJars = tasks.withType(JarJar)
+-ideaModule.dependsOn allJarJars // I expected that buildable file collections links the ideaModule to the allJarJars already.
++//def allJarJars = tasks.withType(JarJar)
++//ideaModule.dependsOn allJarJars // I expected that buildable file collections links the ideaModule to the allJarJars already.
+
+-useTestFixtures()
+\ No newline at end of file
++useTestFixtures()
+--- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java
++++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultLocalMavenRepositoryLocator.java
+@@ -15,8 +15,8 @@
+ */
+ package org.gradle.api.internal.artifacts.mvnsettings;
+
+-import jarjar.org.apache.maven.settings.Settings;
+-import jarjar.org.apache.maven.settings.building.*;
++import org.apache.maven.settings.Settings;
++import org.apache.maven.settings.building.*;
+
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
diff --git a/debian/patches/28_findbugs.diff b/debian/patches/28_findbugs.diff
new file mode 100644
index 0000000..dfb145d
--- /dev/null
+++ b/debian/patches/28_findbugs.diff
@@ -0,0 +1,66 @@
+Description: Disable findbugs build.
+ com.google.code.findbugs is not available in Debian yet, so
+ disable findbugs build in code-quality plugin.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-08-18
+
+--- a/subprojects/code-quality/code-quality.gradle
++++ b/subprojects/code-quality/code-quality.gradle
+@@ -25,8 +25,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.0 at jar"
+- provided "com.google.code.findbugs:bcel:2.0.0 at jar"
++ // provided "com.google.code.findbugs:findbugs:2.0.0 at jar"
++ // provided "com.google.code.findbugs:bcel:2.0.0 at jar"
+ provided "dom4j:dom4j:1.6.1 at jar"
+ provided "jaxen:jaxen:1.1.1 at jar"
+ }
+--- a/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java
++++ b/subprojects/code-quality/src/main/groovy/org/gradle/api/plugins/quality/internal/findbugs/FindBugsExecuter.java
+@@ -16,10 +16,12 @@
+
+ package org.gradle.api.plugins.quality.internal.findbugs;
+
++/*
+ import edu.umd.cs.findbugs.FindBugs;
+ import edu.umd.cs.findbugs.FindBugs2;
+ import edu.umd.cs.findbugs.IFindBugsEngine;
+ import edu.umd.cs.findbugs.TextUICommandLine;
++*/
+
+ import java.io.IOException;
+ import java.io.Serializable;
+@@ -36,7 +38,7 @@
+ final List<String> args = spec.getArguments();
+ String[] strArray = new String[args.size()];
+ args.toArray(strArray);
+-
++/*
+ Thread.currentThread().setContextClassLoader(FindBugs2.class.getClassLoader());
+ FindBugs2 findBugs2 = new FindBugs2();
+ TextUICommandLine commandLine = new TextUICommandLine();
+@@ -44,15 +46,19 @@
+ findBugs2.execute();
+
+ return createFindbugsResult(findBugs2);
++*/
++ return null;
+ } finally {
+ Thread.currentThread().setContextClassLoader(contextClassLoader);
+ }
+ }
+
++/*
+ FindBugsResult createFindbugsResult(IFindBugsEngine findBugs) {
+ int bugCount = findBugs.getBugCount();
+ int missingClassCount = findBugs.getMissingClassCount();
+ int errorCount = findBugs.getErrorCount();
+ return new FindBugsResult(bugCount, missingClassCount, errorCount);
+ }
+-}
+\ No newline at end of file
++*/
++}
diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff
new file mode 100644
index 0000000..d54a43c
--- /dev/null
+++ b/debian/patches/30_envjs.diff
@@ -0,0 +1,24 @@
+Description: Disable envjs build.
+ org.simpleframework is not available in Debian yet, so
+ disable envjs build in javascript plugin.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-08-18
+
+--- a/subprojects/javascript/javascript.gradle
++++ b/subprojects/javascript/javascript.gradle
+@@ -19,11 +19,13 @@
+
+ compile "org.mozilla:js:1.7R3"
+ compile "com.google.code.gson:gson:2.2.1" // used by JsHint
+- compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
++ //compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
+ compile project(':core'), project(":plugins")
+
+ // Required by JavaScriptExtension#getGoogleApisRepository()
+ compile project(':coreImpl')
+ }
+
++sourceSets.main.groovy.excludes = ['**/org/gradle/plugins/javascript/envjs/**']
++
+ useTestFixtures()
diff --git a/debian/patches/31_hamcrest_12.diff b/debian/patches/31_hamcrest_12.diff
new file mode 100644
index 0000000..83c7802
--- /dev/null
+++ b/debian/patches/31_hamcrest_12.diff
@@ -0,0 +1,25 @@
+Description: Small fixes for Hamcrest 1.2 compat
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Forwarded: not-needed
+Last-Update: 2012-09-03
+
+--- a/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
++++ b/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
+@@ -258,7 +258,7 @@
+ }
+
+ @Factory
+- public static Matcher<Task> dependsOn(final Matcher<? extends Iterable<String>> matcher) {
++ public static Matcher<Task> dependsOn(final Matcher matcher) {
+ return new BaseMatcher<Task>() {
+ public boolean matches(Object o) {
+ Task task = (Task) o;
+@@ -288,7 +288,7 @@
+ }
+
+ @Factory
+- public static <T extends Buildable> Matcher<T> builtBy(final Matcher<? extends Iterable<String>> matcher) {
++ public static <T extends Buildable> Matcher<T> builtBy(final Matcher matcher) {
+ return new BaseMatcher<T>() {
+ public boolean matches(Object o) {
+ Buildable task = (Buildable) o;
diff --git a/debian/patches/32_disable_it.diff b/debian/patches/32_disable_it.diff
new file mode 100644
index 0000000..0bf4e4f
--- /dev/null
+++ b/debian/patches/32_disable_it.diff
@@ -0,0 +1,47 @@
+Description: Disable integration tests until Apache SSHD
+ and littleproxy are packaged in Debian.
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Bug-Debian: http://bugs.debian.org/683639
+Forwarded: not-needed
+Last-Update: 2012-09-03
+
+--- a/gradle/integTest.gradle
++++ b/gradle/integTest.gradle
+@@ -19,7 +19,7 @@
+ }
+
+ dependencies {
+- integTestCompile project(":internalIntegTesting")
++ //integTestCompile project(":internalIntegTesting")
+ }
+
+ plugins.withType(org.gradle.plugins.ide.idea.IdeaPlugin) { // lazy as plugin not applied yet
+--- a/settings.gradle
++++ b/settings.gradle
+@@ -40,7 +40,7 @@
+ include 'ear'
+ include 'native'
+ include 'internalTesting'
+-include 'internalIntegTesting'
++//include 'internalIntegTesting'
+ include 'performance'
+ include 'javascript'
+ include 'migration'
+--- a/subprojects/core/core.gradle
++++ b/subprojects/core/core.gradle
+@@ -52,7 +52,7 @@
+ testFixturesCompile project(":internalTesting")
+ testFixturesRuntime project(':coreImpl')
+
+- integTestCompile project(":internalIntegTesting")
++ //integTestCompile project(":internalIntegTesting")
+
+ //reports 'css3-pie:css3-pie:1.0beta3'
+ }
+@@ -98,4 +98,4 @@
+ def generate() {
+ propertiesFile.withOutputStream { pluginProperties.save(it, 'plugin definitions') }
+ }
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 966d8a3..662d359 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,12 +1,14 @@
01_use_debian_jars.diff
02_sonar.diff
03_plexus.diff
-04_webdavlib.diff
-05_polyglot_maven.diff
-10_fix_version.diff
11_fix_jni_path.diff
-12_fix_missing_classpath.diff
13_fix_javadocs_links.diff
21_docs.diff
-22_checkstyle.diff
23_replace_jna-posix_with_jnr-posix.diff
+24_pegdown.diff
+26_disable_commitid.diff
+27_maven.diff
+28_findbugs.diff
+30_envjs.diff
+31_hamcrest_12.diff
+32_disable_it.diff
diff --git a/debian/rules b/debian/rules
index c2193d6..743940a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,19 @@
VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/')
UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/~m/-milestone-/')
-JARS := announce antlr code-quality ide jetty maven osgi plugins scala
+JARS := announce antlr code-quality cpp ear ide javascript jetty maven osgi plugins scala signing
export JAVA_HOME=/usr/lib/jvm/default-java
+export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m
+export GRADLE_USER_HOME=$(CURDIR)/.gradlehome
+DEB_GRADLE_OPTS := --project-prop notSnapshot=true --project-prop version=$(UPSTREAM_VERSION) --stacktrace --offline
%:
dh $@ --with javahelper
override_dh_auto_build:
- gradle assemble -g $(CURDIR)/.gradlehome
+ find /usr/share/gradle -type l ! -exec test -r {} \; -print
+ mkdir $(CURDIR)/.gradlehome
+ gradle $(DEB_GRADLE_OPTS) assemble
unzip build/distributions/gradle-*-bin.zip -d build/distributions/bin
unzip build/distributions/gradle-*-all.zip -d build/distributions/all
pod2man -c '' -r '' debian/gradle.pod > build/gradle.1
@@ -17,24 +22,22 @@ override_dh_auto_build:
override_dh_auto_clean:
dh_auto_clean
- -gradle clean -g $(CURDIR)/.gradlehome
- -rm -rf .gradle buildSrc/.gradle buildSrc/build .gradlehome build
+ -gradle $(DEB_GRADLE_OPTS) clean
+ -rm -rf .gradle buildSrc/.gradle buildSrc/build $(CURDIR)/.gradlehome build
override_dh_link:
dh_link
# plugins symlinks
- cd debian/gradle/usr/share/gradle/lib/plugins && \
for j in $(JARS); do \
- ln -s ../../../java/gradle-$$j.jar gradle-$$j-$(VERSION).jar; \
+ dh_link -plibgradle-$$j-java usr/share/java/gradle-$$j.jar \
+ usr/share/gradle/lib/plugins/gradle-$$j-$(VERSION).jar; \
done ;
+ dh_link -plibgradle-core-java usr/share/java/gradle-core-impl.jar \
+ usr/share/gradle/lib/plugins/gradle-core-impl-$(VERSION).jar; \
# core and wrapper jars symlinks
- # the second link in the loop is for compatibility with upstream,
- # it can be removed when 1.0 is released
- cd debian/gradle/usr/share/gradle/lib && \
for j in core wrapper; do \
- ln -s ../../java/gradle-$$j.jar gradle-$$j-$(VERSION).jar; \
- ln -s ../../java/gradle-$$j.jar \
- gradle-$$j-$(UPSTREAM_VERSION).jar; \
+ dh_link -pgradle usr/share/java/gradle-$$j.jar \
+ usr/share/gradle/lib/gradle-$$j-$(VERSION).jar; \
done ;
override_jh_installlibs:
diff --git a/debian/watch b/debian/watch
index c789e16..fa7adaf 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,3 @@
version=3
-opts=uversionmangle=s/-([\w]+)-([0-9])+/~$1$2/ \
- http://www.gradle.org/downloads \
- http://services.gradle.org/distributions/gradle-([\w\.-]+)-src.zip \
+http://www.gradle.org/downloads .*/gradle-(\d.*)-src\.(?:tgz|tar\.(?:gz|bz2|xz)|zip) \
debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git
More information about the pkg-java-commits
mailing list