[gradle-1.12] 108/211: Refresh patches

Kai-Chung Yan seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:30 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 7b11d34a86b11f761bb002f18d6752f1a1986109
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date:   Sun May 24 07:21:35 2015 +0800

    Refresh patches
---
 debian/patches/03_plexus.diff              |  4 ++-
 debian/patches/13_fix_javadocs_links.diff  | 10 +++---
 debian/patches/26_disable_commitid.diff    |  2 ++
 debian/patches/36_java8_compatibility.diff |  6 +++-
 debian/patches/series                      | 15 +--------
 debian/patches/use_local_jars.diff         | 50 ++++++++++++++++++++++++++++++
 debian/rules                               |  5 +--
 7 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/debian/patches/03_plexus.diff b/debian/patches/03_plexus.diff
index 7a98a38..1fecefe 100644
--- a/debian/patches/03_plexus.diff
+++ b/debian/patches/03_plexus.diff
@@ -4,9 +4,11 @@ Author: Damien Raude-Morvan <drazzib at debian.org
 Forwarded: no
 Last-Update: 2012-08-18
 
+Index: b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
+===================================================================
 --- a/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
 +++ b/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/PlexusLoggerAdapter.java
-@@ -98,4 +98,8 @@
+@@ -95,4 +95,8 @@
      public String getName() {
          return logger.getName();
      }
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
index 0311aee..4bb85e2 100644
--- a/debian/patches/13_fix_javadocs_links.diff
+++ b/debian/patches/13_fix_javadocs_links.diff
@@ -4,9 +4,11 @@ Author: Damien Raude-Morvan <drazzib at debian.org
 Forwarded: not-needed
 Last-Update: 2012-08-18
 
+Index: b/subprojects/docs/docs.gradle
+===================================================================
 --- a/subprojects/docs/docs.gradle
 +++ b/subprojects/docs/docs.gradle
-@@ -275,8 +275,10 @@
+@@ -291,8 +291,10 @@
      classpath = configurations.userGuideTask
  }
  
@@ -19,9 +21,9 @@ Last-Update: 2012-08-18
  
  task javadocAll(type: Javadoc) {
      ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -298,8 +300,7 @@
-     include 'org/gradle/testfixtures/**'
-     include 'org/gradle/tooling/**'
+@@ -319,8 +321,7 @@
+     include 'org/gradle/testing/jacoco/**'
+     include 'org/gradle/buildinit/**'
      exclude '**/internal/**'
 -    options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs",
 -        "http://maven.apache.org/ref/2.2.1/maven-model/apidocs")
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
index dfe376e..5bf543a 100644
--- a/debian/patches/26_disable_commitid.diff
+++ b/debian/patches/26_disable_commitid.diff
@@ -2,6 +2,8 @@ Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
 Last-Update: 2012-08-18
 
+Index: b/gradle/buildReceipt.gradle
+===================================================================
 --- a/gradle/buildReceipt.gradle
 +++ b/gradle/buildReceipt.gradle
 @@ -32,7 +32,7 @@
diff --git a/debian/patches/36_java8_compatibility.diff b/debian/patches/36_java8_compatibility.diff
index 06e0da7..9991ed0 100644
--- a/debian/patches/36_java8_compatibility.diff
+++ b/debian/patches/36_java8_compatibility.diff
@@ -1,9 +1,11 @@
 Description: Fixes the compilation errors with Java 8
 Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: no
+Index: b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
+===================================================================
 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
 +++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/project/taskfactory/AnnotationProcessingTaskFactory.java
-@@ -254,7 +254,7 @@
+@@ -335,7 +335,7 @@
                  return;
              }
  
@@ -12,6 +14,8 @@ Forwarded: no
              if (optional == null) {
                  propertyInfo.setNotNullValidator(notNullValidator);
              }
+Index: b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
+===================================================================
 --- a/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
 +++ b/subprojects/plugins/src/main/groovy/org/gradle/api/tasks/javadoc/Groovydoc.java
 @@ -22,6 +22,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index b73c6de..a4aa42e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,18 +1,5 @@
-01_use_debian_jars.diff
-02_sonar.diff
+use_local_jars.diff
 03_plexus.diff
-11_fix_jni_path.diff
 13_fix_javadocs_links.diff
-21_docs.diff
-23_replace_jna-posix_with_jnr-posix.diff
-24_pegdown.diff
 26_disable_commitid.diff
-27_maven.diff
-28_findbugs.diff
-30_envjs.diff
-31_hamcrest_12.diff
-32_disable_it.diff
-33_scala_zinc.diff
-34_disable_code_quality.diff
-35_ivy_23.diff
 36_java8_compatibility.diff
diff --git a/debian/patches/use_local_jars.diff b/debian/patches/use_local_jars.diff
new file mode 100644
index 0000000..119ee62
--- /dev/null
+++ b/debian/patches/use_local_jars.diff
@@ -0,0 +1,50 @@
+Description: Use Local Jars
+Author: Kai-Chung Yan <seamlikok at gmail.com>
+Last-Update: 2015-05-24
+Index: b/build.gradle
+===================================================================
+--- a/build.gradle
++++ b/build.gradle
+@@ -115,7 +115,8 @@
+     group = 'org.gradle'
+ 
+     repositories {
+-        maven { url 'http://repo.gradle.org/gradle/libs' }
++        maven { url "file:///usr/share/maven-repo" }
++        flatDir { dirs "/usr/share/java" }
+     }
+ }
+ 
+@@ -202,4 +203,4 @@
+ }
+ 
+ 
+-apply from: "gradle/intTestImage.gradle"
+\ No newline at end of file
++apply from: "gradle/intTestImage.gradle"
+Index: b/subprojects/docs/docs.gradle
+===================================================================
+--- a/subprojects/docs/docs.gradle
++++ b/subprojects/docs/docs.gradle
+@@ -30,21 +30,6 @@
+ apply plugin: 'jsoup'
+ apply plugin: 'javascript-base'
+ 
+-repositories {
+-    javaScript.googleApis()
+-
+-    ivy {
+-        name "Google Fonts"
+-        url "http://themes.googleusercontent.com/static/fonts/"
+-        layout 'pattern', {
+-            artifact '[organisation]/v[revision](/[classifier])(.[ext])'
+-            ivy '[organisation]/v[revision]/ivy(.[ext])'
+-        }
+-    }
+-
+-    maven { url 'http://repo.gradle.org/gradle/gradle-build-internal' }
+-}
+-
+ configurations {
+     groovydocGroovy {}
+     userGuideStyleSheets
diff --git a/debian/rules b/debian/rules
index 2319ea5..7b4fa58 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,8 @@
 
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | sed 's/^Version: \(.\+\)-.\+$$/\1/')
 UPSTREAM_VERSION := $(shell cat version.txt)
-PLUGINS_LIST := announce antlr build-comparison code-quality cpp diagnostics ear ide ivy javascript jetty language-base language-jvm maven native osgi plugins publish reporting signing
+GRADLE_TASKS := announce antlr build-comparison code-quality cpp diagnostics ear ide ivy javascript jetty language-base language-jvm maven native osgi plugins publish reporting signing
+SUBPROJECTS_LIST := announce antlr baseServices baseServicesGroovy buildComparison buildInit cli codeQuality core coreImpl cpp diagnostics ear ide ivy jacoco javascript jetty languageBase languageJvm launcher native openApi osgi performance plugins publish maven messaging reporting resources signing toolingApi ui wrapper
 export JAVA_HOME=/usr/lib/jvm/default-java
 export GRADLE_OPTS=-Dfile.encoding=UTF-8 -Xmx512m
 # Only for debug purpose
@@ -20,7 +21,7 @@ endif
 
 override_dh_auto_build:
 	find /usr/share/gradle -type l ! -exec test -r {} \; -print
-	gradle $(DEB_GRADLE_OPTS) assemble --gradle-user-home ./.gradlehome
+	gradle $(DEB_GRADLE_OPTS) $(GRADLE_TASKS) --gradle-user-home ./.gradlehome
 	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

-- 
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