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 b99e14b9e16308ba393e284cdfcb708beb74b8f7 Author: Damien Raude-Morvan <[email protected]> Date: Sat Jan 5 01:22:39 2013 +0100 * Don't try to download new fonts. * Change artifactId of xhtmlrender and xalan. * Upgrade Maven dependencies to Maven 3.x --- debian/bootstrap.sh | 7 +- debian/changelog | 11 + debian/control | 362 ++++++++----------------------- debian/gradle.install | 2 +- debian/gradle.links | 1 + debian/libgradle-announce-java.jlibs | 1 - debian/libgradle-antlr-java.jlibs | 1 - debian/libgradle-antlr-java.links | 2 - debian/libgradle-code-quality-java.jlibs | 1 - debian/libgradle-code-quality-java.links | 3 - debian/libgradle-core-java.install | 1 + debian/libgradle-core-java.jlibs | 1 + debian/libgradle-core-java.links | 10 +- debian/libgradle-cpp-java.jlibs | 1 - debian/libgradle-ear-java.jlibs | 1 - debian/libgradle-ide-java.jlibs | 1 - debian/libgradle-javascript-java.jlibs | 1 - debian/libgradle-javascript-java.links | 2 - debian/libgradle-jetty-java.jlibs | 1 - debian/libgradle-jetty-java.links | 8 - debian/libgradle-maven-java.jlibs | 1 - debian/libgradle-osgi-java.jlibs | 1 - debian/libgradle-osgi-java.links | 1 - debian/libgradle-plugins-java.jlibs | 17 ++ debian/libgradle-plugins-java.links | 31 +++ debian/libgradle-scala-java.jlibs | 1 - debian/libgradle-signing-java.jlibs | 1 - debian/libgradle-signing-java.links | 2 - debian/libgradle-wrapper-java.jlibs | 1 - debian/patches/01_use_debian_jars.diff | 71 ++++-- debian/patches/11_fix_jni_path.diff | 36 +-- debian/patches/21_docs.diff | 45 +++- debian/patches/27_maven.diff | 152 +------------ debian/rules | 29 ++- 34 files changed, 296 insertions(+), 511 deletions(-) diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh index 054fdca..2918ed8 100755 --- a/debian/bootstrap.sh +++ b/debian/bootstrap.sh @@ -22,12 +22,7 @@ Version: $VERSION Architecture: all Maintainer: Debian Java Maintainers <[email protected]> Depends: default-jre-headless -Provides: libgradle-code-quality-java, - libgradle-ide-java, - libgradle-ear-java, - libgradle-maven-java, - libgradle-wrapper-java, - libgradle-scala-java +Provides: libgradle-plugins-java Section: java Priority: optional Homepage: http://gradle.org/ diff --git a/debian/changelog b/debian/changelog index 2337ffe..f42bd57 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,18 @@ gradle (1.3-1) UNRELEASED; urgency=low * New upstream release. + * Merge all plugins packages into gradle-plugins: there is not real value + in providing all those small packages since libgradle-core-java Depends + on most of plugins dependencies. * d/control: Build-Depends on libasm4-java instead of libasm3-java. + * d/control: Add Build-Depends on libnative-platform-java and + libnative-platform-jni. + * d/control: Build-Depends on libjarjar-java (>= 1.4+svn142-1) to build + Gradle with jarjar which handle correctly updating the fully qualified + class names in the jar's resources. Otherwise, we get errors during plexus + startup. + * d/rules: Add support for DEB_BUILD_OPTIONS parallel=n using new Gradle + parallel feature. -- Damien Raude-Morvan <[email protected]> Fri, 04 Jan 2013 00:13:00 +0100 diff --git a/debian/control b/debian/control index 98997d0..34cff79 100644 --- a/debian/control +++ b/debian/control @@ -32,16 +32,12 @@ Build-Depends: ant (>= 1.8), 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, + libgradle-plugins-java, libguava-java, libhttpclient-java (>= 4.2.1), libjansi-java, - libjarjar-java, + libjarjar-java (>= 1.4+svn142), + libjaffl-java (>= 0.5.9-2), libjaxen-java, libjcifs-java, libjcip-annotations-java, @@ -49,10 +45,11 @@ Build-Depends: ant (>= 1.8), libjetty-java, libjmock2-java, libjna-java, - libjnr-posix-java (>= 1.1.8~0), + libjnr-posix-java (>= 1.1.8), libjsch-java, liblogback-java (>= 1:0.9.28), libmaven-ant-tasks-java, + libnative-platform-java, libnekohtml-java, libplexus-cipher-java, libplexus-containers1.5-java, @@ -87,22 +84,11 @@ Depends: ant (>= 1.8), libgradle-plugins-java (= ${binary:Version}), libjaxen-java, libjna-java, - libjnr-posix-java (>= 1.1.8-1), + libjnr-posix-java (>= 1.1.8), + libjaffl-java (>= 0.5.9-2), + libnative-platform-java, libwagon-java, ${misc:Depends} -Recommends: libgradle-announce-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 @@ -142,6 +128,8 @@ Depends: ant, libxml-commons-external-java, maven (>= 3.0.4-4), ${misc:Depends} +Breaks: libgradle-wrapper-java (<< 1.3~) +Replaces: libgradle-wrapper-java (<< 1.3~) Recommends: gradle (= ${binary:Version}) Suggests: gradle-doc (= ${binary:Version}) Description: Groovy based build system - Core library @@ -154,259 +142,95 @@ Description: Groovy based build system - Core library . This package contains the Gradle Core API library. -Package: libgradle-announce-java -Architecture: all -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 - 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. - . - This package contains the Gradle announce plugin and - enables you to publish messages on succeeded tasks to your favourite - platforms. It supports Twitter, Ubuntu Notify, Snarl and Growl. - -Package: libgradle-antlr-java -Architecture: all -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 - 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. - . - This package contains the Gradle ANTLR plugin that extends the Java - plugin to add support for generating parsers using ANTLR. - -Package: libgradle-code-quality-java -Architecture: all -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 - 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. - . - This package contains the Gradle code quality plugin that adds - tasks which perform code quality checks and generate reports from these - checks. The following tools are supported: CodeNarc and checkstyle. - -Package: libgradle-ide-java -Architecture: all -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-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 - 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. - . - This package contains plugins that provide integration with - common used IDEs like Eclipse and IDEA IntelliJ. - -Package: libgradle-jetty-java -Architecture: all -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 - 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. - . - This package contains the Gradle Jetty plugin that extends the - War plugin to add tasks which allow you to deploy your web application - to a Jetty web container embedded in the build. - -Package: libgradle-maven-java -Architecture: all -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 - 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. - . - This package contains the Gradle Maven plugin. With Gradle you can deploy - to remote Maven repositories or install to your local Maven repository. This - includes all Maven metadata manipulation and works also for Maven snapshots. - -Package: libgradle-osgi-java -Architecture: all -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 - 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. - . - This package contains the Gradle OSGi plugin. If the Java plugins is - applied, the OSGi plugin replaces the manifest object of the default jar - with an OsgiManifest object. The replaced manifest is merged into the new - one. The OSGi plugin makes heavy use of Peter Kriens BND tool. - Package: libgradle-plugins-java Architecture: all 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 - 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. - . - This package contains the Gradle core plugins. - -Package: libgradle-scala-java -Architecture: all -Depends: libgradle-core-java (= ${binary:Version}), - libgradle-plugins-java (= ${binary:Version}), - ${misc:Depends} +Recommends: ant-optional (>= 1.8), + bnd, + checkstyle (>= 5.1), + junit4, + libantlr-java, + libbcpg-java, + libbcprov-java, + libcodenarc-groovy-java (>= 0.17), + libecj-java, + libgmetrics-groovy-java, + libgoogle-gson-java, + libjetty-extra-java, + libjetty-java, + librhino-java, + libservlet2.5-java, + testng Suggests: scala -Description: Groovy based build system - Scala 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. - . - This package contains the Gradle Scala plugin that extends the - Java Plugin to add support for Scala projects. It can deal with Scala-only - projects and with mixed Java/Scala projects. It can even deal with Java-only - projects. The Scala plugin supports joint compilation of Java and Scala - 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} -Description: Groovy based build system - Wrapper 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. - . - This package contains the Gradle Wrapper plugin that provides tasks - that can download the gradle source distribution or check out Gradle from - SVN. This is useful in those cases when Gradle is needed to build - a project, but Gradle is not installed. +Breaks: libgradle-announce-java (<< 1.3~), + libgradle-antlr-java (<< 1.3~), + libgradle-code-quality-java (<< 1.3~), + libgradle-cpp-java (<< 1.3~), + libgradle-ear-java (<< 1.3~), + libgradle-eclipse-java (<< 1.0~), + libgradle-ide-java (<< 1.3~), + libgradle-idea-java (<< 1.0~), + libgradle-javascript-java (<< 1.3~), + libgradle-jetty-java (<< 1.3~), + libgradle-maven-java (<< 1.3~), + libgradle-osgi-java (<< 1.3~), + libgradle-scala-java (<< 1.3~), + libgradle-signing-java (<< 1.3~) +Replaces: libgradle-announce-java (<< 1.3~), + libgradle-antlr-java (<< 1.3~), + libgradle-code-quality-java (<< 1.3~), + libgradle-cpp-java (<< 1.3~), + libgradle-ear-java (<< 1.3~), + libgradle-eclipse-java (<< 1.0~), + libgradle-ide-java (<< 1.3~), + libgradle-idea-java (<< 1.0~), + libgradle-javascript-java (<< 1.3~), + libgradle-jetty-java (<< 1.3~), + libgradle-maven-java (<< 1.3~), + libgradle-osgi-java (<< 1.3~), + libgradle-scala-java (<< 1.3~), + libgradle-signing-java (<< 1.3~) +Description: Groovy based build system - All plugins + Gradle is a build system written in Groovy. It uses Groovy + also as the language for its build scripts. It has a powerful + 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. + . + This package contains the Gradle Plugins : + * announce plugin: enables you to publish messages on succeeded + tasks to your favourite platforms. + It supports Twitter, Ubuntu Notify, Snarl and Growl. + * ANTLR plugin that extends the Java plugin to add support for + generating parsers using ANTLR + * code-quality plugin that adds + tasks which perform code quality checks and generate reports from these + checks. The following tools are supported: CodeNarc and checkstyle + * ide plugins that provide integration with + common used IDEs like Eclipse and IDEA IntelliJ. + * jetty plugin that extends the + War plugin to add tasks which allow you to deploy your web application + to a Jetty web container embedded in the build. + * maven plugin. With Gradle you can deploy + to remote Maven repositories or install to your local Maven repository. This + includes all Maven metadata manipulation and works also for Maven snapshots + * osgi plugin: if the Java plugins is + applied, the OSGi plugin replaces the manifest object of the default jar + with an OsgiManifest object. The replaced manifest is merged into the new + one. The OSGi plugin makes heavy use of Peter Kriens BND tool + * scala plugin that extends the + Java Plugin to add support for Scala projects. It can deal with Scala-only + projects and with mixed Java/Scala projects. It can even deal with Java-only + projects. The Scala plugin supports joint compilation of Java and Scala + source. This means your project can contain Scala classes which use Java + classes, and vice versa. + * cpp plugin: C++ source compilation capabilities to a project. + * ear plugin: Adds support for building J2EE applications. + * javascript plugin: Adds the ability to check and minify Javascript files. + * signing plugin: Adds the ability to digitally sign built files and artifacts. Package: gradle-doc Architecture: all diff --git a/debian/gradle.install b/debian/gradle.install index 572dcde..212653d 100644 --- a/debian/gradle.install +++ b/debian/gradle.install @@ -1,5 +1,5 @@ - build/distributions/bin/gradle-*/bin/gradle usr/share/gradle/bin + 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 diff --git a/debian/gradle.links b/debian/gradle.links index 7569869..f1086d1 100644 --- a/debian/gradle.links +++ b/debian/gradle.links @@ -7,6 +7,7 @@ usr/share/java/constantine.jar usr/share/gradle/lib/constantin 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 +usr/share/java/native-platform.jar usr/share/gradle/lib/native-platform.jar # gradle-ui usr/share/java/dom4j.jar usr/share/gradle/lib/dom4j.jar diff --git a/debian/libgradle-announce-java.jlibs b/debian/libgradle-announce-java.jlibs deleted file mode 100644 index 95bd0b9..0000000 --- a/debian/libgradle-announce-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-announce-*.jar diff --git a/debian/libgradle-antlr-java.jlibs b/debian/libgradle-antlr-java.jlibs deleted file mode 100644 index eaa71b7..0000000 --- a/debian/libgradle-antlr-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-antlr-*.jar diff --git a/debian/libgradle-antlr-java.links b/debian/libgradle-antlr-java.links deleted file mode 100644 index 4113995..0000000 --- a/debian/libgradle-antlr-java.links +++ /dev/null @@ -1,2 +0,0 @@ -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.jlibs b/debian/libgradle-code-quality-java.jlibs deleted file mode 100644 index 0cf5e91..0000000 --- a/debian/libgradle-code-quality-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-code-quality-*.jar diff --git a/debian/libgradle-code-quality-java.links b/debian/libgradle-code-quality-java.links deleted file mode 100644 index de41441..0000000 --- a/debian/libgradle-code-quality-java.links +++ /dev/null @@ -1,3 +0,0 @@ -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.install b/debian/libgradle-core-java.install new file mode 100644 index 0000000..d3c128e --- /dev/null +++ b/debian/libgradle-core-java.install @@ -0,0 +1 @@ +build/distributions/bin/gradle-*/lib/plugins/jarjar-*.jar /usr/share/gradle/lib/plugins/ \ No newline at end of file diff --git a/debian/libgradle-core-java.jlibs b/debian/libgradle-core-java.jlibs index 4aea04c..9f04945 100644 --- a/debian/libgradle-core-java.jlibs +++ b/debian/libgradle-core-java.jlibs @@ -1,2 +1,3 @@ build/distributions/bin/gradle-*/lib/gradle-core-*.jar +build/distributions/bin/gradle-*/lib/gradle-wrapper-*.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 index a5b1403..4c181bd 100644 --- a/debian/libgradle-core-java.links +++ b/debian/libgradle-core-java.links @@ -1,5 +1,5 @@ # gradle-core -usr/share/java/asm3-all.jar usr/share/gradle/lib/asm3-all.jar +usr/share/java/asm4-all.jar usr/share/gradle/lib/asm4-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 @@ -11,6 +11,7 @@ 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/atinject-jsr330-api.jar usr/share/gradle/lib/atinject-jsr330-api.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 @@ -26,7 +27,6 @@ usr/share/java/httpclient.jar usr/share/gradle/lib/plugins/ht # 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 @@ -35,11 +35,7 @@ usr/share/java/httpcore.jar usr/share/gradle/lib/plugins/ht # 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 +usr/share/java/xbean-reflect.jar usr/share/gradle/lib/plugins/xbean-reflect.jar diff --git a/debian/libgradle-cpp-java.jlibs b/debian/libgradle-cpp-java.jlibs deleted file mode 100644 index 8fdbe3f..0000000 --- a/debian/libgradle-cpp-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-cpp-*.jar diff --git a/debian/libgradle-ear-java.jlibs b/debian/libgradle-ear-java.jlibs deleted file mode 100644 index 2c1e8a7..0000000 --- a/debian/libgradle-ear-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-ear-*.jar diff --git a/debian/libgradle-ide-java.jlibs b/debian/libgradle-ide-java.jlibs deleted file mode 100644 index ac31f0f..0000000 --- a/debian/libgradle-ide-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-ide-*.jar diff --git a/debian/libgradle-javascript-java.jlibs b/debian/libgradle-javascript-java.jlibs deleted file mode 100644 index 2743ac6..0000000 --- a/debian/libgradle-javascript-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-javascript-*.jar diff --git a/debian/libgradle-javascript-java.links b/debian/libgradle-javascript-java.links deleted file mode 100644 index 2fac09d..0000000 --- a/debian/libgradle-javascript-java.links +++ /dev/null @@ -1,2 +0,0 @@ -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.jlibs b/debian/libgradle-jetty-java.jlibs deleted file mode 100644 index 55ca1e4..0000000 --- a/debian/libgradle-jetty-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-jetty-*.jar diff --git a/debian/libgradle-jetty-java.links b/debian/libgradle-jetty-java.links deleted file mode 100644 index 330ce65..0000000 --- a/debian/libgradle-jetty-java.links +++ /dev/null @@ -1,8 +0,0 @@ -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-maven-java.jlibs b/debian/libgradle-maven-java.jlibs deleted file mode 100644 index c3c9401..0000000 --- a/debian/libgradle-maven-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-maven-*.jar diff --git a/debian/libgradle-osgi-java.jlibs b/debian/libgradle-osgi-java.jlibs deleted file mode 100644 index b1ff47b..0000000 --- a/debian/libgradle-osgi-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-osgi-*.jar diff --git a/debian/libgradle-osgi-java.links b/debian/libgradle-osgi-java.links deleted file mode 100644 index ce021db..0000000 --- a/debian/libgradle-osgi-java.links +++ /dev/null @@ -1 +0,0 @@ -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.jlibs b/debian/libgradle-plugins-java.jlibs index 588ee8f..c1b7d00 100644 --- a/debian/libgradle-plugins-java.jlibs +++ b/debian/libgradle-plugins-java.jlibs @@ -1 +1,18 @@ +build/distributions/bin/gradle-*/lib/plugins/gradle-announce-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-antlr-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-build-comparison-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-code-quality-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-cpp-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-diagnostics-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-ear-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-ide-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-ivy-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-javascript-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-jetty-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-maven-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-osgi-*.jar build/distributions/bin/gradle-*/lib/plugins/gradle-plugins-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-publish-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-reporting-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-scala-*.jar +build/distributions/bin/gradle-*/lib/plugins/gradle-signing-*.jar diff --git a/debian/libgradle-plugins-java.links b/debian/libgradle-plugins-java.links index 85563c7..f1a1785 100644 --- a/debian/libgradle-plugins-java.links +++ b/debian/libgradle-plugins-java.links @@ -1,3 +1,34 @@ +# gradle-antlr +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 + +# gradle-codequality +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 + +# gradle-js +usr/share/java/js.jar usr/share/gradle/lib/plugins/js.jar +usr/share/java/gson.jar usr/share/gradle/lib/plugins/gson.jar + +# gradle-jetty +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 + +# gradle-osgi +usr/share/java/bndlib.jar usr/share/gradle/lib/plugins/bndlib.jar + +#gradle-plugins 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 + +# gradle-signing +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/libgradle-scala-java.jlibs b/debian/libgradle-scala-java.jlibs deleted file mode 100644 index 79acb67..0000000 --- a/debian/libgradle-scala-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-scala-*.jar diff --git a/debian/libgradle-signing-java.jlibs b/debian/libgradle-signing-java.jlibs deleted file mode 100644 index ada39d7..0000000 --- a/debian/libgradle-signing-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/plugins/gradle-signing-*.jar diff --git a/debian/libgradle-signing-java.links b/debian/libgradle-signing-java.links deleted file mode 100644 index 7ae659c..0000000 --- a/debian/libgradle-signing-java.links +++ /dev/null @@ -1,2 +0,0 @@ -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/libgradle-wrapper-java.jlibs b/debian/libgradle-wrapper-java.jlibs deleted file mode 100644 index 379fc06..0000000 --- a/debian/libgradle-wrapper-java.jlibs +++ /dev/null @@ -1 +0,0 @@ -build/distributions/bin/gradle-*/lib/gradle-wrapper-*.jar diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff index 2fdbb40..91189d8 100644 --- a/debian/patches/01_use_debian_jars.diff +++ b/debian/patches/01_use_debian_jars.diff @@ -19,11 +19,11 @@ Last-Update: 2012-08-18 repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } -+ add(new FileSystemResolver()) { -+ name = 'repo' -+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" -+ addArtifactPattern "/usr/share/java/[module].[ext]" -+ } ++ add(new FileSystemResolver()) { ++ name = 'repo' ++ addArtifactPattern "/usr/share/java/[module].[ext]" ++ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" ++ } } } @@ -55,8 +55,8 @@ Last-Update: 2012-08-18 + //maven { url '/usr/share/maven-repo/' } + add(new FileSystemResolver()) { + name = 'repo' -+ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" + addArtifactPattern "/usr/share/java/[module].[ext]" ++ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]" + } } @@ -102,7 +102,7 @@ Last-Update: 2012-08-18 libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { dependency libraries.slf4j_api dependency libraries.servlet_api -@@ -84,23 +84,25 @@ +@@ -84,42 +84,44 @@ jsr305: 'com.google.code.findbugs:jsr305:1.3.9', groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar', jaxen: 'jaxen:jaxen:1.1@jar', @@ -123,29 +123,32 @@ Last-Update: 2012-08-18 -libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") { - dependency "org.apache.maven:maven-settings:3.0.4@jar" - dependency "org.apache.maven:maven-settings-builder:3.0.4@jar" -+libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.x") { -+ dependency "org.apache.maven:maven-settings:3.x@jar" -+ dependency "org.apache.maven:maven-settings-builder:3.x@jar" ++libraries.maven3 = dependencies.module("org.apache.maven:maven-core-3.x:3.x") { ++ dependency "org.apache.maven:maven-settings-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-settings-builder-3.x:3.x@jar" //plexus: - dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" + dependency "org.codehaus.plexus:plexus-utils2:debian@jar" dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar" - dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar" +- dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar" +- dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar" + dependency "org.codehaus.plexus:plexus-component-annotations-1.5:debian@jar" - dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar" - dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar" ++ dependency "org.codehaus.plexus:plexus-container-default-1.5:debian@jar" ++ dependency "org.codehaus.plexus:plexus-classworlds2:2.4@jar" -@@ -109,17 +111,17 @@ + //sonatype plexus + dependency "org.sonatype.plexus:plexus-cipher:1.7@jar" dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3@jar" //core: - dependency "org.apache.maven:maven-core:3.0.4@jar" - dependency "org.apache.maven:maven-model-builder:3.0.4@jar" - dependency "org.apache.maven:maven-model:3.0.4@jar" -+ dependency "org.apache.maven:maven-core:3.x@jar" -+ dependency "org.apache.maven:maven-model-builder:3.x@jar" -+ dependency "org.apache.maven:maven-model:3.x@jar" ++ dependency "org.apache.maven:maven-core-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-model-builder-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-model-3.x:3.x@jar" //somewhat core: - dependency "org.apache.maven:maven-artifact:3.0.4@jar" @@ -154,15 +157,39 @@ Last-Update: 2012-08-18 - dependency "org.apache.maven:maven-plugin-api:3.0.4@jar" - dependency "org.apache.maven:maven-aether-provider:3.0.4@jar" - dependency "org.apache.maven.wagon:wagon-provider-api:2.2@jar" -+ dependency "org.apache.maven:maven-artifact:3.x@jar" -+ dependency "org.apache.maven:maven-compat:3.x@jar" -+ dependency "org.apache.maven:maven-repository-metadata:3.x@jar" -+ dependency "org.apache.maven:maven-plugin-api:3.x@jar" -+ dependency "org.apache.maven:maven-aether-provider:3.x@jar" -+ dependency "org.apache.maven.wagon:wagon-provider-api:2.x@jar" ++ dependency "org.apache.maven:maven-artifact-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-compat-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-repository-metadata-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-plugin-api-3.x:3.x@jar" ++ dependency "org.apache.maven:maven-aether-provider-3.x:3.x@jar" ++ dependency "org.apache.maven.wagon:wagon-provider-api-2.x:2.x@jar" //eather: dependency "org.sonatype.aether:aether-api:1.13.1@jar" +@@ -135,11 +137,11 @@ + 'cglib:cglib-nodep:2.2.2' + ] + libraries.jmock = [ +- 'org.jmock:jmock:2.5.1', ++ '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' + ] +--- a/subprojects/core-impl/core-impl.gradle ++++ b/subprojects/core-impl/core-impl.gradle +@@ -68,4 +68,4 @@ + move(file: plexusSecNoComps, tofile: plexusSec) + } + } +-} +\ No newline at end of file ++} --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -57,7 +57,7 @@ diff --git a/debian/patches/11_fix_jni_path.diff b/debian/patches/11_fix_jni_path.diff index e053fbe..ae00925 100644 --- a/debian/patches/11_fix_jni_path.diff +++ b/debian/patches/11_fix_jni_path.diff @@ -1,28 +1,30 @@ -Description: Set the correct path to locate jnidispatch.so library +Description: Try to search jnidispatch.so library first in /usr/lib/jni + instead of storageDir. If found in /usr/lib/jni, set + jna.boot.library.path. Author: Miguel Landaeta <[email protected]> Author: Damien Raude-Morvan <[email protected] -Forwarded: not-needed -Last-Update: 2012-08-18 +Forwarded: no +Last-Update: 2013-01-12 --- 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 -@@ -40,7 +40,7 @@ +@@ -39,9 +39,17 @@ + */ public void configure(File storageDir) { String nativePrefix = OperatingSystem.current().getNativePrefix(); - File tmpDir = new File(storageDir, String.format("jna/%s", nativePrefix)); +- File tmpDir = new File(storageDir, String.format("jna/%s", nativePrefix)); - tmpDir.mkdirs(); -+ //tmpDir.mkdirs(); ++ File tmpDir = new File(storageDir, "jni/"); String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch"); ++ ++ // Try to load /usr/lib/jni/jnidispatch.so first before storageDir ++ File usrDir = new File("/usr/lib/jni/"); ++ File usrLibFile = new File(usrDir, jnaLibName); ++ if (usrLibFile.isFile()) { ++ System.setProperty("jna.boot.library.path", usrDir.getAbsolutePath()); ++ return; ++ } ++ File libFile = new File(tmpDir, jnaLibName); if (!libFile.exists()) { ---- a/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java -+++ b/subprojects/native/src/main/java/org/gradle/internal/nativeplatform/services/NativeServices.java -@@ -48,7 +48,7 @@ - * of a native service. Also initializes the Native-Platform library using the passed user home directory. - */ - public static void initialize(File userHomeDir) { -- File nativeDir = new File(userHomeDir, "native"); -+ File nativeDir = new File("/usr/lib"); - if (USE_NATIVE_PLATFORM) { - try { - net.rubygrapefruit.platform.Native.init(nativeDir); + String resourceName = "/com/sun/jna/" + nativePrefix + "/" + jnaLibName; diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff index df55625..c3a261f 100644 --- a/debian/patches/21_docs.diff +++ b/debian/patches/21_docs.diff @@ -20,7 +20,7 @@ Last-Update: 2012-08-18 } --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle -@@ -40,7 +40,7 @@ +@@ -40,23 +40,23 @@ } configurations { @@ -28,8 +28,16 @@ Last-Update: 2012-08-18 + //userGuideStyleSheets userGuideTask jquery - fonts -@@ -53,7 +53,7 @@ +- fonts ++ //fonts + } + + 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:R8rc1') { + dependency 'itext:itext:2.0.8@jar' } userGuideTask 'xslthl:xslthl:2.0.1@jar' @@ -37,7 +45,20 @@ Last-Update: 2012-08-18 + //userGuideStyleSheets 'docbook:docbook-xsl:1.75.2@zip' jquery "jquery:jquery.min:1.8.0@js" - fonts \ +- fonts \ ++ /*fonts \ + "lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ@ttf", + "lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw@ttf", + "lato:bold:6:DvlFBScY1r-FMtZSYIYoYw@ttf", +@@ -64,7 +64,7 @@ + "ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E@ttf", + "ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0@ttf", + "ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4@ttf", +- "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc@ttf" ++ "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc@ttf"*/ + } + + ext { @@ -91,7 +91,7 @@ } @@ -47,6 +68,22 @@ Last-Update: 2012-08-18 classpath = configurations.userGuideTask stylesheetsDir = userguideStyleSheets.destinationDir } +@@ -121,12 +121,12 @@ + [it.name, it.bytes.encodeBase64().toString()] + } + +- def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries { ++ /*def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries { + def id = it.moduleVersion.id + ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()] +- } ++ }*/ + +- ext.tokens = images + fonts ++ ext.tokens = images // + fonts + css.inputs.property 'tokens', tokens + css.filter org.apache.tools.ant.filters.ReplaceTokens, tokens: tokens + } @@ -166,10 +166,10 @@ include '*.xsl' } diff --git a/debian/patches/27_maven.diff b/debian/patches/27_maven.diff index 6b7c098..f1c9402 100644 --- a/debian/patches/27_maven.diff +++ b/debian/patches/27_maven.diff @@ -4,146 +4,12 @@ Last-Update: 2012-08-18 --- a/subprojects/core-impl/core-impl.gradle +++ b/subprojects/core-impl/core-impl.gradle -@@ -22,14 +22,14 @@ - - testCompile libraries.junit - -- compile fileTree("$buildDir/libs/jarjar") { -+ /*compile fileTree("$buildDir/libs/jarjar") { - builtBy 'jarJarMaven3' -- } -+ }*/ - -- mvn3Input libraries.maven3 -+ compile libraries.maven3 - } - --task jarJarMaven3(type: JarJar) { -+/*task jarJarMaven3(type: JarJar) { - inputJars = configurations.mvn3Input - outputDir = file("$buildDir/libs/jarjar") - -@@ -41,14 +41,14 @@ - rule('org.sonatype.**', 'org.gradle.mvn3.org.sonatype.@1') - - avoidConflictingPlexusComponents(it) --} -+}*/ - --classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521 -+//classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521 - - //adding explicit task dependencies due to http://issues.gradle.org/browse/GRADLE-2481 - def allJarJars = tasks.withType(JarJar) --ideaModule.dependsOn allJarJars --eclipseClasspath.dependsOn allJarJars -+//ideaModule.dependsOn allJarJars -+//eclipseClasspath.dependsOn allJarJars - useTestFixtures() - - def avoidConflictingPlexusComponents(JarJar task) { ---- 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 org.gradle.mvn3.org.apache.maven.settings.Settings; --import org.gradle.mvn3.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; - ---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenSettingsProvider.java -+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/DefaultMavenSettingsProvider.java -@@ -15,8 +15,8 @@ - */ - package org.gradle.api.internal.artifacts.mvnsettings; - --import org.gradle.mvn3.org.apache.maven.settings.Settings; --import org.gradle.mvn3.org.apache.maven.settings.building.*; -+import org.apache.maven.settings.Settings; -+import org.apache.maven.settings.building.*; - - /** - * @author Szczepan Faber/Steve Ebersole ---- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/MavenSettingsProvider.java -+++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/MavenSettingsProvider.java -@@ -15,8 +15,8 @@ - */ - package org.gradle.api.internal.artifacts.mvnsettings; - --import org.gradle.mvn3.org.apache.maven.settings.Settings; --import org.gradle.mvn3.org.apache.maven.settings.building.SettingsBuildingException; -+import org.apache.maven.settings.Settings; -+import org.apache.maven.settings.building.SettingsBuildingException; - - public interface MavenSettingsProvider { - Settings buildSettings() throws SettingsBuildingException; ---- a/subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/Maven2Gradle.groovy -+++ b/subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/Maven2Gradle.groovy -@@ -18,7 +18,7 @@ - - package org.gradle.api.plugins.maven.internal - --import org.gradle.mvn3.org.apache.maven.project.MavenProject -+import org.apache.maven.project.MavenProject - import org.gradle.util.GFileUtils - - /** -@@ -549,4 +549,4 @@ - private boolean elementHasText(it) { - return it.text().length() != 0 - } --} -\ No newline at end of file -+} ---- a/subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/MavenProjectXmlWriter.java -+++ b/subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/MavenProjectXmlWriter.java -@@ -16,8 +16,8 @@ - - package org.gradle.api.plugins.maven.internal; - --import org.gradle.mvn3.org.apache.maven.model.io.xpp3.MavenXpp3Writer; --import org.gradle.mvn3.org.apache.maven.project.MavenProject; -+import org.apache.maven.model.io.xpp3.MavenXpp3Writer; -+import org.apache.maven.project.MavenProject; - - import java.io.ByteArrayOutputStream; - import java.io.IOException; ---- a/subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/MavenProjectsCreator.java -+++ b/subprojects/maven/src/main/groovy/org/gradle/api/plugins/maven/internal/MavenProjectsCreator.java -@@ -17,19 +17,19 @@ - package org.gradle.api.plugins.maven.internal; - - import com.google.common.collect.ImmutableList; --import org.gradle.mvn3.org.apache.maven.execution.*; --import org.gradle.mvn3.org.apache.maven.model.building.ModelBuildingRequest; --import org.gradle.mvn3.org.apache.maven.project.*; --import org.gradle.mvn3.org.apache.maven.settings.Settings; --import org.gradle.mvn3.org.codehaus.plexus.ContainerConfiguration; --import org.gradle.mvn3.org.codehaus.plexus.DefaultContainerConfiguration; --import org.gradle.mvn3.org.codehaus.plexus.DefaultPlexusContainer; --import org.gradle.mvn3.org.codehaus.plexus.PlexusContainerException; --import org.gradle.mvn3.org.codehaus.plexus.classworlds.ClassWorld; --import org.gradle.mvn3.org.codehaus.plexus.component.repository.exception.ComponentLookupException; --import org.gradle.mvn3.org.codehaus.plexus.configuration.PlexusConfigurationException; --import org.gradle.mvn3.org.sonatype.aether.RepositorySystemSession; --import org.gradle.mvn3.org.sonatype.aether.util.DefaultRepositorySystemSession; -+import org.apache.maven.execution.*; -+import org.apache.maven.model.building.ModelBuildingRequest; -+import org.apache.maven.project.*; -+import org.apache.maven.settings.Settings; -+import org.codehaus.plexus.ContainerConfiguration; -+import org.codehaus.plexus.DefaultContainerConfiguration; -+import org.codehaus.plexus.DefaultPlexusContainer; -+import org.codehaus.plexus.PlexusContainerException; -+import org.codehaus.plexus.classworlds.ClassWorld; -+import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -+import org.codehaus.plexus.configuration.PlexusConfigurationException; -+import org.sonatype.aether.RepositorySystemSession; -+import org.sonatype.aether.util.DefaultRepositorySystemSession; - import org.gradle.api.GradleException; - import org.gradle.api.Transformer; - import org.gradle.util.CollectionUtils; +@@ -57,7 +57,7 @@ + //I'm removing the components.xml file from the sec-dispatcher jar. + //This file contains only single component so I think we can remove it. + task.doLast { +- def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar" ++ def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher.jar" + def plexusSecNoComps = "$plexusSec-noComps" + ant { + zip(destfile: plexusSecNoComps, update: true) { diff --git a/debian/rules b/debian/rules index 743940a..0d5fef0 100755 --- a/debian/rules +++ b/debian/rules @@ -2,12 +2,20 @@ VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/') UPSTREAM_VERSION := $(shell echo $(VERSION) | sed 's/~m/-milestone-/') -JARS := announce antlr code-quality cpp ear ide javascript jetty maven osgi plugins scala signing +PLUGINS_JARS := announce antlr build-comparison code-quality cpp diagnostics ear ide ivy javascript jetty maven osgi plugins publish reporting scala signing export JAVA_HOME=/usr/lib/jvm/default-java export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m export GRADLE_USER_HOME=$(CURDIR)/.gradlehome +# Only for debug purpose +# export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 DEB_GRADLE_OPTS := --project-prop notSnapshot=true --project-prop version=$(UPSTREAM_VERSION) --stacktrace --offline +# Support for DEB_BUILD_OPTIONS parallel=n +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMTHREADS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + DEB_GRADLE_OPTS += --parallel --parallel-threads=$(NUMTHREADS) +endif + %: dh $@ --with javahelper @@ -15,8 +23,8 @@ override_dh_auto_build: 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 + unzip -q -n build/distributions/gradle-*-bin.zip -d build/distributions/bin + unzip -q -n build/distributions/gradle-*-all.zip -d build/distributions/all pod2man -c '' -r '' debian/gradle.pod > build/gradle.1 ./debian/gradle.sed -i build/distributions/bin/gradle-*/bin/gradle @@ -28,17 +36,16 @@ override_dh_auto_clean: override_dh_link: dh_link # plugins symlinks - for j in $(JARS); do \ - dh_link -plibgradle-$$j-java usr/share/java/gradle-$$j.jar \ + for j in $(PLUGINS_JARS); do \ + dh_link -plibgradle-plugins-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 - for j in core wrapper; do \ - dh_link -pgradle usr/share/java/gradle-$$j.jar \ - usr/share/gradle/lib/gradle-$$j-$(VERSION).jar; \ - done ; + usr/share/gradle/lib/plugins/gradle-core-impl-$(VERSION).jar + dh_link -plibgradle-core-java usr/share/java/gradle-wrapper.jar \ + usr/share/gradle/lib/gradle-wrapper-$(VERSION).jar + dh_link -pgradle usr/share/java/gradle-core.jar \ + usr/share/gradle/lib/gradle-core-$(VERSION).jar override_jh_installlibs: jh_installlibs --upstream-version=$(UPSTREAM_VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
