[gradle-1.12] 67/211: - Refresh all patches for Gradle 1.3 - Upgrade bootstrap for 1.3
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 498cf7d89e54bfeaa484a244a6209112c00f74e5
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Sun Nov 25 23:03:26 2012 +0100
- Refresh all patches for Gradle 1.3
- Upgrade bootstrap for 1.3
---
.gitignore | 2 +
debian/bootstrap.sh | 4 +-
debian/patches/01_use_debian_jars.diff | 205 ++++++---------------
debian/patches/02_sonar.diff | 27 ++-
debian/patches/11_fix_jni_path.diff | 33 ++--
debian/patches/13_fix_javadocs_links.diff | 4 +-
debian/patches/21_docs.diff | 36 ++--
.../23_replace_jna-posix_with_jnr-posix.diff | 23 +--
debian/patches/24_pegdown.diff | 43 +++--
debian/patches/26_disable_commitid.diff | 41 +++--
debian/patches/27_maven.diff | 158 ++++++++++++----
debian/patches/28_findbugs.diff | 10 +-
debian/patches/30_envjs.diff | 5 +-
debian/patches/31_hamcrest_12.diff | 4 +-
debian/patches/32_disable_it.diff | 30 +--
debian/rules | 2 +-
16 files changed, 313 insertions(+), 314 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ea92cf5
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.pc
+.rej
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 5cad40f..054fdca 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -2,10 +2,10 @@
set -e
-URL="http://services.gradle.org/distributions/gradle-1.1-bin.zip"
+URL="http://services.gradle.org/distributions/gradle-1.3-bin.zip"
ZIP="$(basename $URL)"
DIR="$(echo $ZIP | sed 's/-bin\.zip$//')"
-VERSION="1.1+bootstrap"
+VERSION="1.3+bootstrap"
wget $URL -O $ZIP
unzip $ZIP
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index a3f121f..52dcb8b 100644
--- a/debian/patches/01_use_debian_jars.diff
+++ b/debian/patches/01_use_debian_jars.diff
@@ -6,157 +6,34 @@ Last-Update: 2012-08-18
--- a/build.gradle
+++ b/build.gradle
-@@ -16,6 +16,7 @@
-
+@@ -17,6 +17,7 @@
import org.gradle.build.Install
+ import org.gradle.build.BuildTypes
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
-@@ -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_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',
-- 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"
-+ }
- ]
-
--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.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 @@
- }
+ defaultTasks 'assemble'
+ apply plugin: 'java-base'
+@@ -102,7 +103,11 @@
+ group = 'org.gradle'
repositories {
- 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]"
-+ addArtifactPattern "/usr/share/java/[module].[ext]"
-+ }
++ add(new FileSystemResolver()) {
++ name = 'repo'
++ addArtifactPattern "/usr/share/java/[module]-[revision].[ext]"
++ addArtifactPattern "/usr/share/java/[module].[ext]"
++ }
}
+ }
- version = this.version
+@@ -187,4 +192,4 @@
+ installDirPropertyName = 'gradle_installPath'
+ }
+
+-apply from: "gradle/intTestImage.gradle"
+\ No newline at end of file
++apply from: "gradle/intTestImage.gradle"
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -13,6 +13,7 @@
@@ -193,9 +70,40 @@ Last-Update: 2012-08-18
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/gradle/dependencies.gradle
++++ b/gradle/dependencies.gradle
+@@ -25,7 +25,7 @@
+ dependency 'org.apache.ant:ant-launcher:1.8.4 at jar'
+ }
+
+-libraries.asm = 'org.ow2.asm:asm-all:4.0 at jar'
++libraries.asm = 'asm:asm3-all:3.0 at jar'
+ libraries.commons_cli = 'commons-cli:commons-cli:1.2 at jar'
+ libraries.commons_io = dependencies.module(versions.commons_io)
+ libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
+@@ -33,8 +33,8 @@
+ libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
+ dependency "com.jcraft:jsch:0.1.46"
+ }
+-libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
+-libraries.inject = dependencies.module('javax.inject:javax.inject:1')
++libraries.jcip = "net.jcip:jcip:1.0 at jar"
++libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api:1.0')
+
+ // Logging
+ libraries.slf4j_api = 'org.slf4j:slf4j-api:1.6.6 at jar'
+@@ -84,7 +84,7 @@
+ 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',
+- jcip: "net.jcip:jcip-annotations:1.0",
++ 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',
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
-@@ -54,7 +54,7 @@
+@@ -57,7 +57,7 @@
integTestCompile project(":internalIntegTesting")
@@ -261,13 +169,6 @@ Last-Update: 2012-08-18
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 @@
@@ -326,14 +227,14 @@ Last-Update: 2012-08-18
useTestFixtures()
--- a/subprojects/plugins/plugins.gradle
+++ b/subprojects/plugins/plugins.gradle
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,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
+ provided files(jvm.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
diff --git a/debian/patches/02_sonar.diff b/debian/patches/02_sonar.diff
index 0e28d56..5fd917c 100644
--- a/debian/patches/02_sonar.diff
+++ b/debian/patches/02_sonar.diff
@@ -6,19 +6,18 @@ Last-Update: 2012-08-18
--- a/build.gradle
+++ b/build.gradle
-@@ -496,7 +496,8 @@
- }
-
- def pluginProjects() {
-- ['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 {
+@@ -82,7 +82,7 @@
+ publishedProjects = [project(':core'), project(':toolingApi'), project(':wrapper'), project(':baseServices'), project(':messaging')]
+ pluginProjects = [
+ 'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven',
+- 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison',
++ 'ide', 'announce', 'scala', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison',
+ 'diagnostics', 'reporting', 'publish', 'ivy'
+ ].collect {
project(it)
- }
- }
--- a/settings.gradle
+++ b/settings.gradle
-@@ -34,7 +34,7 @@
+@@ -36,7 +36,7 @@
include 'toolingApi'
include 'docs'
include 'integTest'
@@ -29,7 +28,7 @@ Last-Update: 2012-08-18
include 'ear'
--- a/subprojects/docs/src/docs/dsl/dsl.xml
+++ b/subprojects/docs/src/docs/dsl/dsl.xml
-@@ -271,9 +271,11 @@
+@@ -300,9 +300,11 @@
<tr>
<td>org.gradle.plugins.signing.Sign</td>
</tr>
@@ -41,8 +40,8 @@ Last-Update: 2012-08-18
<tr>
<td>org.gradle.api.tasks.Sync</td>
</tr>
-@@ -410,4 +412,4 @@
- </para>
+@@ -409,4 +411,4 @@
+ </table>
</section>
-</book>
@@ -64,7 +63,7 @@ Last-Update: 2012-08-18
+</chapter>
--- a/subprojects/docs/src/docs/userguide/userguide.xml
+++ b/subprojects/docs/src/docs/userguide/userguide.xml
-@@ -69,7 +69,7 @@
+@@ -60,7 +60,7 @@
<xi:include href='findBugsPlugin.xml'/>
<xi:include href='jdependPlugin.xml'/>
<xi:include href='pmdPlugin.xml'/>
diff --git a/debian/patches/11_fix_jni_path.diff b/debian/patches/11_fix_jni_path.diff
index a49ecc1..e053fbe 100644
--- a/debian/patches/11_fix_jni_path.diff
+++ b/debian/patches/11_fix_jni_path.diff
@@ -4,28 +4,25 @@ Author: Damien Raude-Morvan <drazzib at debian.org
Forwarded: not-needed
Last-Update: 2012-08-18
---- 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) {
- 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 = 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");
+@@ -40,7 +40,7 @@
+ public void configure(File storageDir) {
+ String nativePrefix = OperatingSystem.current().getNativePrefix();
+ File tmpDir = new File(storageDir, String.format("jna/%s", nativePrefix));
- tmpDir.mkdirs();
-+ //File tmpDir = new File(storageDir, "jna");
-+ File tmpDir = new File(storageDir, "jni");
+ //tmpDir.mkdirs();
String jnaLibName = OperatingSystem.current().isMacOsX() ? "libjnidispatch.jnilib" : System.mapLibraryName("jnidispatch");
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);
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
index a0ecb7d..fb22585 100644
--- a/debian/patches/13_fix_javadocs_links.diff
+++ b/debian/patches/13_fix_javadocs_links.diff
@@ -6,7 +6,7 @@ Last-Update: 2012-08-18
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -226,8 +226,10 @@
+@@ -265,8 +265,10 @@
classpath = configurations.userGuideTask
}
@@ -19,7 +19,7 @@ Last-Update: 2012-08-18
task javadoc(type: Javadoc) {
ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -249,8 +251,7 @@
+@@ -288,8 +290,7 @@
include 'org/gradle/testfixtures/**'
include 'org/gradle/tooling/**'
exclude '**/internal/**'
diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff
index 9577c03..df55625 100644
--- a/debian/patches/21_docs.diff
+++ b/debian/patches/21_docs.diff
@@ -20,38 +20,42 @@ Last-Update: 2012-08-18
}
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -27,18 +27,18 @@
- apply plugin: 'jsoup'
+@@ -40,7 +40,7 @@
+ }
configurations {
- userGuideStyleSheets
+ //userGuideStyleSheets
userGuideTask
- }
-
- 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'
+ jquery
+ fonts
+@@ -53,7 +53,7 @@
}
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'
+ jquery "jquery:jquery.min:1.8.0 at js"
+
+ fonts \
+@@ -91,7 +91,7 @@
}
- ext {
-@@ -116,10 +116,10 @@
- from(cssSrcDir) {
- include '*.css'
+ tasks.withType(Docbook2Xhtml) {
+- dependsOn userguideStyleSheets
++ //dependsOn userguideStyleSheets
+ classpath = configurations.userGuideTask
+ stylesheetsDir = userguideStyleSheets.destinationDir
+ }
+@@ -166,10 +166,10 @@
+ include '*.xsl'
}
-- from(zipTree(configurations.userGuideStyleSheets.singleFile)) {
+ from(cssFiles)
+- from({ zipTree(configurations.userGuideStyleSheets.singleFile) }) {
- // Remove the prefix
- eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') }
- }
-+ //from(zipTree(configurations.userGuideStyleSheets.singleFile)) {
++ //from({ zipTree(configurations.userGuideStyleSheets.singleFile) }) {
+ // // Remove the prefix
+ // eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') }
+ //}
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 0a056ad..b883128 100644
--- a/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
+++ b/debian/patches/23_replace_jna-posix_with_jnr-posix.diff
@@ -6,31 +6,20 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: no
Last-Update: 2012-08-18
---- 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
+@@ -9,10 +9,13 @@
compile libraries.slf4j_api
compile libraries.jna
+ compile libraries.nativePlatform
- 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 'org.jruby.extras:constantine:debian'
++ compile 'org.jruby.extras:jaffl:debian'
++ compile 'org.jruby.extras:jffi:debian'
+ compile module('org.fusesource.jansi:jansi:debian') {
dependency libraries.jna
}
@@ -47,7 +36,7 @@ Last-Update: 2012-08-18
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +59,7 @@
- if (operatingSystem.isLinux() || operatingSystem.isMacOsX()) {
+ if (libC != null && (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));
diff --git a/debian/patches/24_pegdown.diff b/debian/patches/24_pegdown.diff
index 1ae9ac0..130d261 100644
--- a/debian/patches/24_pegdown.diff
+++ b/debian/patches/24_pegdown.diff
@@ -15,8 +15,8 @@ Last-Update: 2012-08-18
- compile "org.pegdown:pegdown:1.1.0"
compile "org.jsoup:jsoup:1.6.3"
- compile "com.googlecode.jarjar:jarjar:1.3"
- }
+
+ //below dependency was deployed to the repo.gradle.org
--- 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 @@
@@ -62,15 +62,15 @@ Last-Update: 2012-08-18
void options(String... options) {
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -23,7 +23,6 @@
- import org.gradle.internal.os.OperatingSystem
+@@ -22,7 +22,6 @@
+ import org.gradle.build.docs.dsl.source.ExtractDslMetaDataTask
apply plugin: 'base'
-apply plugin: 'pegdown'
apply plugin: 'jsoup'
+ apply plugin: 'javascript-base'
- configurations {
-@@ -62,7 +61,7 @@
+@@ -87,7 +86,7 @@
builtBy 'distDocs'
}
outputs.docs = files(docsDir) {
@@ -79,24 +79,29 @@ Last-Update: 2012-08-18
}
tasks.withType(Docbook2Xhtml) {
-@@ -336,10 +335,9 @@
- from project.outputs.docs
+@@ -352,10 +351,10 @@
+ group = 'documentation'
}
-import org.gradle.plugins.pegdown.PegDown
++//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())
+-task editReleaseNotes() {
++/*task editReleaseNotes() {
+ group = "release notes"
+ doLast {
+ Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md"))
+@@ -394,10 +393,10 @@
+ doLast {
+ Class.forName("java.awt.Desktop").newInstance().browse(new File(releaseNotes.destinationDir, releaseNotes.fileName).toURI())
+ }
-}
+}*/
- class Xhtml2Pdf extends DefaultTask {
- @InputFile
+ task docs {
+- dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml, releaseNotes
++ dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml
+ description = 'Generates all documentation'
+ group = 'documentation'
+ }
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
index 4ac450a..7ec1dda 100644
--- a/debian/patches/26_disable_commitid.diff
+++ b/debian/patches/26_disable_commitid.diff
@@ -2,32 +2,35 @@ 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
+--- a/gradle/buildReceipt.gradle
++++ b/gradle/buildReceipt.gradle
+@@ -32,7 +32,7 @@
+ }
}
--
-+/*
- task determineCommitId {
+
+-task determineCommitId {
++/*task determineCommitId {
ext.commitId = null
-@@ -269,14 +269,15 @@
+ doLast {
+@@ -93,9 +93,9 @@
+ throw new InvalidUserDataException("Could not determine commit id")
}
}
- }
-+*/
+-}
++}*/
-task createBuildReceipt(dependsOn: determineCommitId) {
-+task createBuildReceipt {
- ext.receiptFile = file("$buildDir/build-receipt.properties")
++task createBuildReceipt() {
+ ext.receiptFile = file("$buildDir/$buildReceiptFileName")
outputs.file receiptFile
outputs.upToDateWhen { false }
- doLast {
+@@ -107,7 +107,7 @@
+ hostName = "unknown"
+ }
def data = [
-- commitId: determineCommitId.commitId,
-+ commitId: "UNKNOWN",
- versionNumber: version,
- buildTimestamp: buildTimestamp,
- username: System.properties["user.name"],
+- 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
index 9d699e9..6b7c098 100644
--- a/debian/patches/27_maven.diff
+++ b/debian/patches/27_maven.diff
@@ -4,52 +4,146 @@ 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
+@@ -22,14 +22,14 @@
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
+
+- compile fileTree("$buildDir/libs/jarjar") {
++ /*compile fileTree("$buildDir/libs/jarjar") {
+ builtBy 'jarJarMaven3'
+- }
++ }*/
+
+- mvn3Input libraries.maven3
++ compile libraries.maven3
}
--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')
- }
+
+-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. at 1')
+
+ avoidConflictingPlexusComponents(it)
-}
+}*/
--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.
+-classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521
++//classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521
--useTestFixtures()
-\ No newline at end of file
-+useTestFixtures()
+ //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 jarjar.org.apache.maven.settings.Settings;
--import jarjar.org.apache.maven.settings.building.*;
+-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;
diff --git a/debian/patches/28_findbugs.diff b/debian/patches/28_findbugs.diff
index dfb145d..ec69d56 100644
--- a/debian/patches/28_findbugs.diff
+++ b/debian/patches/28_findbugs.diff
@@ -7,14 +7,14 @@ Last-Update: 2012-08-18
--- a/subprojects/code-quality/code-quality.gradle
+++ b/subprojects/code-quality/code-quality.gradle
-@@ -25,8 +25,8 @@
+@@ -26,8 +26,8 @@
// minimal dependencies to make our code compile
// we don't ship these dependencies because findbugs plugin will download them (and more) at runtime
-- provided "com.google.code.findbugs:findbugs:2.0.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 "com.google.code.findbugs:findbugs:2.0.1 at jar"
+- provided "com.google.code.findbugs:bcel:2.0.1 at jar"
++ //provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
++ //provided "com.google.code.findbugs:bcel:2.0.1 at jar"
provided "dom4j:dom4j:1.6.1 at jar"
provided "jaxen:jaxen:1.1.1 at jar"
}
diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff
index d54a43c..877e58c 100644
--- a/debian/patches/30_envjs.diff
+++ b/debian/patches/30_envjs.diff
@@ -7,15 +7,16 @@ Last-Update: 2012-08-18
--- a/subprojects/javascript/javascript.gradle
+++ b/subprojects/javascript/javascript.gradle
-@@ -19,11 +19,13 @@
+@@ -19,7 +19,7 @@
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")
+ compile libraries.inject
- // Required by JavaScriptExtension#getGoogleApisRepository()
+@@ -27,4 +27,6 @@
compile project(':coreImpl')
}
diff --git a/debian/patches/31_hamcrest_12.diff b/debian/patches/31_hamcrest_12.diff
index 83c7802..bae7390 100644
--- a/debian/patches/31_hamcrest_12.diff
+++ b/debian/patches/31_hamcrest_12.diff
@@ -5,7 +5,7 @@ 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 @@
+@@ -271,7 +271,7 @@
}
@Factory
@@ -14,7 +14,7 @@ Last-Update: 2012-09-03
return new BaseMatcher<Task>() {
public boolean matches(Object o) {
Task task = (Task) o;
-@@ -288,7 +288,7 @@
+@@ -301,7 +301,7 @@
}
@Factory
diff --git a/debian/patches/32_disable_it.diff b/debian/patches/32_disable_it.diff
index 0bf4e4f..44d5790 100644
--- a/debian/patches/32_disable_it.diff
+++ b/debian/patches/32_disable_it.diff
@@ -7,18 +7,18 @@ Last-Update: 2012-09-03
--- a/gradle/integTest.gradle
+++ b/gradle/integTest.gradle
-@@ -19,7 +19,7 @@
+@@ -13,7 +13,7 @@
}
dependencies {
- integTestCompile project(":internalIntegTesting")
+ //integTestCompile project(":internalIntegTesting")
- }
- plugins.withType(org.gradle.plugins.ide.idea.IdeaPlugin) { // lazy as plugin not applied yet
+ //so that implicit help tasks are available:
+ integTestRuntime project(':diagnostics')
--- a/settings.gradle
+++ b/settings.gradle
-@@ -40,7 +40,7 @@
+@@ -42,7 +42,7 @@
include 'ear'
include 'native'
include 'internalTesting'
@@ -26,10 +26,10 @@ Last-Update: 2012-09-03
+//include 'internalIntegTesting'
include 'performance'
include 'javascript'
- include 'migration'
+ include 'buildComparison'
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
-@@ -52,7 +52,7 @@
+@@ -55,7 +55,7 @@
testFixturesCompile project(":internalTesting")
testFixturesRuntime project(':coreImpl')
@@ -38,10 +38,14 @@ Last-Update: 2012-09-03
//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
-+}
+--- a/subprojects/performance/performance.gradle
++++ b/subprojects/performance/performance.gradle
+@@ -7,7 +7,7 @@
+ dependencies {
+ junit 'junit:junit:4.10'
+ groovy libraries.groovy
+- testFixturesCompile project(':internalIntegTesting')
++ //testFixturesCompile project(':internalIntegTesting')
+ }
+
+ useTestFixtures()
diff --git a/debian/rules b/debian/rules
index 743940a..8566f7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ JARS := announce antlr code-quality cpp ear ide javascript jetty maven osgi plug
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
+DEB_GRADLE_OPTS := --project-prop notSnapshot=true --project-prop version=$(UPSTREAM_VERSION) --offline
%:
dh $@ --with javahelper
--
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