[gradle] 02/03: Refreshed the patches
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed May 18 21:04:54 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 1f1787bddf8987197672b01d17c465eb8587d410
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed May 18 00:51:44 2016 +0200
Refreshed the patches
---
debian/changelog | 4 +++-
debian/patches/33_scala_zinc.diff | 4 ++--
debian/patches/disable_sonar.diff | 2 +-
debian/patches/disable_tests.diff | 5 +++--
debian/patches/docs.diff | 2 +-
debian/patches/search_system_jar.diff | 28 +++++++++++++++-------------
debian/patches/use_local_artifacts.diff | 24 ++++++++++++------------
7 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f8dfdcc..951a0c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
-gradle (2.12-2) UNRELEASED; urgency=medium
+gradle (2.13-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release
+ - Refreshed the patches
* Transition to Jetty 9 (patch imported from Fedora, thanks to Michal Srb)
* Modified the Groovy jar detection logic to recognize the jar
in the system Maven repository
diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index f0719ee..e74b381 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -30,7 +30,7 @@ Forwarded: not-needed
compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) }
- compile.conventionMapping.zincClasspath = {
- def config = project.configurations[ZINC_CONFIGURATION_NAME]
-- if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) {
+- if (!compile.scalaCompileOptions.internalIsUseAnt() && config.dependencies.empty) {
- project.dependencies {
- zinc("com.typesafe.zinc:zinc:$DefaultScalaToolProvider.DEFAULT_ZINC_VERSION")
- }
@@ -66,7 +66,7 @@ Forwarded: not-needed
@Override
--- a/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
+++ b/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java
-@@ -66,7 +66,7 @@
+@@ -65,7 +65,7 @@
Set<File> zincClasspathFiles = zincClasspath.getFiles();
// currently, we leave it to ZincScalaCompiler to also compile the Java code
diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff
index dafc24a..9ebcb47 100644
--- a/debian/patches/disable_sonar.diff
+++ b/debian/patches/disable_sonar.diff
@@ -37,7 +37,7 @@ Last-Update: 2015-07-02
</table>
--- a/subprojects/docs/src/docs/dsl/dsl.xml
+++ b/subprojects/docs/src/docs/dsl/dsl.xml
-@@ -428,12 +428,6 @@
+@@ -416,12 +416,6 @@
<td>org.gradle.plugins.signing.Sign</td>
</tr>
<tr>
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 60288ac..e765594 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -19,7 +19,7 @@ Last-Update: 2015-09-30
apply from: "gradle/taskOrdering.gradle"
apply from: "gradle/fix-GRADLE-2492.gradle"
apply from: 'gradle/customM2Check.gradle'
-@@ -270,7 +268,6 @@
+@@ -271,7 +269,6 @@
dependsOn ':killExistingDaemons'
}
@@ -82,12 +82,13 @@ Last-Update: 2015-09-30
\ No newline at end of file
--- a/subprojects/tooling-api/tooling-api.gradle
+++ b/subprojects/tooling-api/tooling-api.gradle
-@@ -7,35 +7,6 @@
+@@ -7,36 +7,6 @@
compile project(':wrapper')
compile project(':baseServices')
publishCompile libraries.slf4j_api
-
- testFixturesCompile project(':baseServicesGroovy')
+- testFixturesCompile project(':internalIntegTesting')
- testCompile libraries.groovy
-
- // lots of integTest errors otherwise
diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff
index 33a7f41..06e74f9 100644
--- a/debian/patches/docs.diff
+++ b/debian/patches/docs.diff
@@ -44,7 +44,7 @@ Last-Update: 2015-09-30
task javadocAll(type: Javadoc) {
ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -342,8 +333,7 @@
+@@ -343,8 +334,7 @@
include 'org/gradle/testkit/**'
include 'org/gradle/testing/**'
exclude '**/internal/**'
diff --git a/debian/patches/search_system_jar.diff b/debian/patches/search_system_jar.diff
index 0c92289..d4744cf 100644
--- a/debian/patches/search_system_jar.diff
+++ b/debian/patches/search_system_jar.diff
@@ -6,19 +6,11 @@ Description: Gradle searches its own directory for Java libraries ignoring
error prone.
Author: Kai-Chung Yan <seamlikok at gmail.com>
Last-Update: 2015-09-30
---- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultGradleDistributionLocator.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultGradleDistributionLocator.java
-@@ -42,6 +42,7 @@
-
- if (distDir != null) {
- libDirs.addAll(findLibDirs(distDir));
-+ libDirs.add(new File("/usr/share/java"));
- }
+--- a/subprojects/core/src/main/groovy/org/gradle/internal/installation/CurrentGradleInstallationLocator.java
++++ b/subprojects/core/src/main/groovy/org/gradle/internal/installation/CurrentGradleInstallationLocator.java
+@@ -51,13 +51,7 @@
}
-
-@@ -69,13 +70,7 @@
- };
-
+
private static File findDistDir(Class<?> clazz) {
- File codeSource = ClasspathUtil.getClasspathForClass(clazz);
- if (codeSource.isFile()) {
@@ -29,5 +21,15 @@ Last-Update: 2015-09-30
- }
+ return new File("/usr/share/gradle");
}
-
+
/**
+--- a/subprojects/core/src/main/groovy/org/gradle/internal/installation/GradleInstallation.java
++++ b/subprojects/core/src/main/groovy/org/gradle/internal/installation/GradleInstallation.java
+@@ -49,6 +49,7 @@
+ private static List<File> findLibDirs(File dir) {
+ List<File> libDirAndSubdirs = new ArrayList<File>();
+ collectWithSubdirectories(new File(dir, "lib"), libDirAndSubdirs);
++ libDirAndSubdirs.add(new File("/usr/share/java"));
+ return libDirAndSubdirs;
+ }
+
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index b630c3e..961e602 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -54,7 +54,7 @@ Last-Update: 2015-07-08
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'
--libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
+-libraries.commons_collections = 'commons-collections:commons-collections:3.2.2 at jar'
+libraries.commons_collections = 'commons-collections:commons-collections3'
libraries.jsch = "com.jcraft:jsch:0.1.53"
libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
@@ -164,17 +164,6 @@ Last-Update: 2015-07-08
- }
- }
-}
---- a/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
-+++ b/subprojects/core/src/main/groovy/org/gradle/process/internal/child/WorkerProcessClassPathProvider.java
-@@ -64,7 +64,7 @@
- classpath = classpath.plus(moduleRegistry.getModule("gradle-messaging").getImplementationClasspath());
- classpath = classpath.plus(moduleRegistry.getExternalModule("slf4j-api").getClasspath());
- classpath = classpath.plus(moduleRegistry.getExternalModule("jul-to-slf4j").getClasspath());
-- classpath = classpath.plus(moduleRegistry.getExternalModule("guava-jdk5").getClasspath());
-+ classpath = classpath.plus(moduleRegistry.getExternalModule("guava").getClasspath());
- return classpath;
- }
- if (name.equals("WORKER_MAIN")) {
--- a/subprojects/javascript/javascript.gradle
+++ b/subprojects/javascript/javascript.gradle
@@ -17,7 +17,7 @@
@@ -274,3 +263,14 @@ Last-Update: 2015-07-08
testCompile libraries.xmlunit
+--- a/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
++++ b/subprojects/testing-base/src/main/java/org/gradle/api/internal/tasks/testing/worker/ForkingTestClassProcessor.java
+@@ -96,7 +96,7 @@
+ moduleRegistry.getModule("gradle-native").getImplementationClasspath().getAsURLs(),
+ moduleRegistry.getModule("gradle-testing-base").getImplementationClasspath().getAsURLs(),
+ moduleRegistry.getModule("gradle-testing-jvm").getImplementationClasspath().getAsURLs(),
+- moduleRegistry.getExternalModule("guava-jdk5").getImplementationClasspath().getAsURLs(),
++ moduleRegistry.getExternalModule("guava").getImplementationClasspath().getAsURLs(),
+ moduleRegistry.getExternalModule("slf4j-api").getImplementationClasspath().getAsURLs(),
+ moduleRegistry.getExternalModule("jul-to-slf4j").getImplementationClasspath().getAsURLs(),
+ moduleRegistry.getExternalModule("native-platform").getImplementationClasspath().getAsURLs(),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list