[gradle] 02/04: Refreshed the patches

Wed Jan 6 17:02:36 UTC 2016

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository gradle.

commit 66e8179dd6e63eca12eb32a1fc7c31576e35297c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jan 6 17:18:58 2016 +0100

    Refreshed the patches
---
 debian/changelog                          |  8 ++++++++
 debian/patches/disable_aws.diff           |  2 +-
 debian/patches/disable_distributions.diff |  9 ++++-----
 debian/patches/disable_java9.diff         |  2 +-
 debian/patches/disable_sonar.diff         |  2 +-
 debian/patches/disable_tests.diff         | 19 +++++++++++++------
 debian/patches/generate_classpath.diff    |  8 ++++----
 debian/patches/generate_pom.diff          |  8 ++++----
 debian/patches/ivy-2.4.0.patch            |  8 ++------
 debian/patches/use_local_artifacts.diff   |  2 +-
 10 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c6d2b3b..6adba21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gradle (2.9-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 06 Jan 2016 13:01:21 +0100
+
 gradle (2.8-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff
index 4dedf80..27a2564 100644
--- a/debian/patches/disable_aws.diff
+++ b/debian/patches/disable_aws.diff
@@ -3,7 +3,7 @@ Author: Kai-Chung Yan <seamlikok at gmial.com>
 Last-Update: 2015-07-07
 --- a/build.gradle
 +++ b/build.gradle
-@@ -143,7 +143,7 @@
+@@ -145,7 +145,7 @@
          'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase',
          'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala',
          'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingNative',
diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff
index 49f4653..9163608 100644
--- a/debian/patches/disable_distributions.diff
+++ b/debian/patches/disable_distributions.diff
@@ -15,7 +15,7 @@ Last-Update: 2015-07-08
  include 'core'
 --- a/build.gradle
 +++ b/build.gradle
-@@ -248,23 +248,6 @@
+@@ -250,22 +250,6 @@
      }
  }
  
@@ -35,7 +35,6 @@ Last-Update: 2015-07-08
 -    installDirPropertyName = 'gradle_installPath'
 -}
 -
--
- apply from: "gradle/intTestImage.gradle"
- apply from: 'gradle/pullRequestBuild.gradle'
- apply from: 'gradle/buildSplits.gradle'
+ clean {
+     dependsOn ':killExistingDaemons'
+ }
diff --git a/debian/patches/disable_java9.diff b/debian/patches/disable_java9.diff
index 47a9f9c..6cecc5b 100644
--- a/debian/patches/disable_java9.diff
+++ b/debian/patches/disable_java9.diff
@@ -3,7 +3,7 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-07-08
 --- a/build.gradle
 +++ b/build.gradle
-@@ -186,7 +186,6 @@
+@@ -188,7 +188,6 @@
      if (project in groovyProjects) {
          apply from: "$rootDir/gradle/groovyProject.gradle"
          apply from: "$rootDir/gradle/testWithUnknownOS.gradle"
diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff
index a9871fd..0a10c0e 100644
--- a/debian/patches/disable_sonar.diff
+++ b/debian/patches/disable_sonar.diff
@@ -6,7 +6,7 @@ Last-Update: 2015-07-02
 
 --- a/build.gradle
 +++ b/build.gradle
-@@ -139,7 +139,7 @@
+@@ -141,7 +141,7 @@
      publicGroovyProjects = groovyProjects - internalProjects
      pluginProjects = [
          'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven',
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 73d75a6..093045f 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -3,23 +3,30 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-09-30
 --- a/build.gradle
 +++ b/build.gradle
-@@ -169,8 +169,6 @@
+@@ -108,7 +108,6 @@
+     }
+ }
+ 
+-apply from: "gradle/testGroupings.gradle"
+ apply from: 'gradle/buildSplits.gradle'
+ 
+ ext {
+@@ -172,7 +171,6 @@
  apply from: "gradle/classycle.gradle"
  apply from: "gradle/strictCompile.gradle"
  apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle"
 -apply from: "gradle/testSetup.gradle"
--apply from: "gradle/testGroupings.gradle"
  apply from: "gradle/taskOrdering.gradle"
  apply from: "gradle/fix-GRADLE-2492.gradle"
  
-@@ -248,7 +246,6 @@
-     }
+@@ -254,7 +252,6 @@
+     dependsOn ':killExistingDaemons'
  }
  
 -apply from: "gradle/intTestImage.gradle"
  apply from: 'gradle/pullRequestBuild.gradle'
- apply from: 'gradle/buildSplits.gradle'
  
+ def reportsFolder = new File(buildDir, "reports")
 --- a/gradle/groovyProject.gradle
 +++ b/gradle/groovyProject.gradle
 @@ -71,19 +71,24 @@
@@ -458,7 +465,7 @@ Last-Update: 2015-09-30
 -    testFixturesCompile project(path: ":modelCore", configuration: "testFixturesUsageRuntime")
  }
  
- useClassycle()
+ //useClassycle(exclude: ["org.gradle.language.base.internal/**"])
 --- a/subprojects/platform-play/platform-play.gradle
 +++ b/subprojects/platform-play/platform-play.gradle
 @@ -7,16 +7,7 @@
diff --git a/debian/patches/generate_classpath.diff b/debian/patches/generate_classpath.diff
index 8c931b9..42d1c88 100644
--- a/debian/patches/generate_classpath.diff
+++ b/debian/patches/generate_classpath.diff
@@ -8,11 +8,11 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
 Lasy-Update: 2015-10-03
 --- a/build.gradle
 +++ b/build.gradle
-@@ -247,6 +247,7 @@
+@@ -109,6 +109,7 @@
+ }
  
- apply from: 'gradle/pullRequestBuild.gradle'
  apply from: 'gradle/buildSplits.gradle'
 +apply from: 'debian/generate-classpath.gradle'
  
- def reportsFolder = new File(buildDir, "reports")
- ext.preferencesTraceFile = new File(reportsFolder, "preferences.trace.log")
+ ext {
+     jvm = org.gradle.internal.jvm.Jvm.current()
diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff
index a0205bb..dff5807 100644
--- a/debian/patches/generate_pom.diff
+++ b/debian/patches/generate_pom.diff
@@ -6,11 +6,11 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Updtae: 2015-10-08
 --- a/build.gradle
 +++ b/build.gradle
-@@ -248,6 +248,7 @@
- apply from: 'gradle/pullRequestBuild.gradle'
+@@ -110,6 +110,7 @@
+ 
  apply from: 'gradle/buildSplits.gradle'
  apply from: 'debian/generate-classpath.gradle'
 +apply from: 'debian/generate-pom.gradle'
  
- def reportsFolder = new File(buildDir, "reports")
- ext.preferencesTraceFile = new File(reportsFolder, "preferences.trace.log")
+ ext {
+     jvm = org.gradle.internal.jvm.Jvm.current()
diff --git a/debian/patches/ivy-2.4.0.patch b/debian/patches/ivy-2.4.0.patch
index f7bdd88..acf3345 100644
--- a/debian/patches/ivy-2.4.0.patch
+++ b/debian/patches/ivy-2.4.0.patch
@@ -12,11 +12,9 @@ Forwarded: no
  .../component/external/model/DefaultIvyModuleResolveMetaData.java   | 6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
-index 824ddd4..b0462a1 100644
 --- a/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
 +++ b/subprojects/dependency-management/src/main/java/org/gradle/api/internal/artifacts/ivyservice/ivyresolve/parser/IvyXmlModuleDescriptorParser.java
-@@ -1139,7 +1139,7 @@ public class IvyXmlModuleDescriptorParser extends AbstractModuleDescriptorParser
+@@ -1135,7 +1135,7 @@
                  buffer = null;
                  state = State.INFO;
              } else if (state == State.EXTRA_INFO) {
@@ -25,11 +23,9 @@ index 824ddd4..b0462a1 100644
                  buffer = null;
                  state = State.INFO;
              } else if (state == State.DESCRIPTION) {
-diff --git a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
-index 803a5b3..5f394b9 100644
 --- a/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
 +++ b/subprojects/dependency-management/src/main/java/org/gradle/internal/component/external/model/DefaultIvyModuleResolveMetaData.java
-@@ -31,17 +31,17 @@ public class DefaultIvyModuleResolveMetaData extends AbstractModuleComponentReso
+@@ -31,17 +31,17 @@
  
      public DefaultIvyModuleResolveMetaData(ModuleDescriptor moduleDescriptor) {
          super(moduleDescriptor);
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index df6a8ca..1bf4eae 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -9,7 +9,7 @@ Author: Kai-Chung Yan <seamlikok at gmail.com>
 Last-Update: 2015-07-08
 --- a/build.gradle
 +++ b/build.gradle
-@@ -178,7 +178,7 @@
+@@ -180,7 +180,7 @@
      group = 'org.gradle'
  
      repositories {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git

