From 73b31f0309f16298a7305e35ad72c61b6c5645cd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Apr 11 2016 08:31:31 +0000 Subject: Rebase patches --- diff --git a/0001-Gradle-local-mode.patch b/0001-Gradle-local-mode.patch index b70db4f..725b9f2 100644 --- a/0001-Gradle-local-mode.patch +++ b/0001-Gradle-local-mode.patch @@ -1,4 +1,4 @@ -From 771bf73fdbbff172f3e42d5c096444d09fa9f120 Mon Sep 17 00:00:00 2001 +From e3039f156b540fe94448bf304518247fc09d359f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 15 Oct 2014 14:23:30 +0200 Subject: [PATCH 01/13] Gradle local mode @@ -13,7 +13,7 @@ Subject: [PATCH 01/13] Gradle local mode 6 files changed, 6 insertions(+) diff --git a/build.gradle b/build.gradle -index aaf497a..4e26005 100644 +index 9779949..0939d93 100644 --- a/build.gradle +++ b/build.gradle @@ -180,6 +180,7 @@ allprojects { @@ -37,7 +37,7 @@ index 0c8ff68..4c0c185 100644 mavenCentral() } diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle -index e6c7da9..737c0d1 100755 +index 847e373..7ea2ae4 100755 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle @@ -31,6 +31,7 @@ apply plugin: 'jsoup' @@ -60,10 +60,10 @@ index 627cd58..f1751c1 100644 } dependencies { diff --git a/subprojects/performance/performance.gradle b/subprojects/performance/performance.gradle -index e386974..2ddaf94 100644 +index 90585e3..082ca90 100644 --- a/subprojects/performance/performance.gradle +++ b/subprojects/performance/performance.gradle -@@ -15,6 +15,7 @@ configurations { +@@ -14,6 +14,7 @@ configurations { } repositories { diff --git a/0002-Port-to-Jetty-9.patch b/0002-Port-to-Jetty-9.patch index 91920f8..27b7103 100644 --- a/0002-Port-to-Jetty-9.patch +++ b/0002-Port-to-Jetty-9.patch @@ -1,4 +1,4 @@ -From 9bd99f17682d7bd9537a3db89a98676274861bf2 Mon Sep 17 00:00:00 2001 +From df3224d51c40dacde620523629e191391e92762b Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 31 Oct 2014 09:01:47 +0100 Subject: [PATCH 02/13] Port to Jetty 9 @@ -17,7 +17,7 @@ Subject: [PATCH 02/13] Port to Jetty 9 10 files changed, 88 insertions(+), 144 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle -index 0ba536b..e7189bd 100755 +index 1b60f30..431f30d 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -60,12 +60,12 @@ libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic: diff --git a/0003-Remove-Class-Path-from-manifest.patch b/0003-Remove-Class-Path-from-manifest.patch index fde9b2c..3514126 100644 --- a/0003-Remove-Class-Path-from-manifest.patch +++ b/0003-Remove-Class-Path-from-manifest.patch @@ -1,34 +1,15 @@ -From 77a663f5b79aa60a74a90f9a5c37c41a138c1f07 Mon Sep 17 00:00:00 2001 +From ba5c1d64b20dcf2e0bf6663594cad5acb8d51ab4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 9 Nov 2014 17:52:30 +0100 Subject: [PATCH 03/13] Remove Class-Path from manifest --- - .../api/internal/classpath/DefaultGradleDistributionLocator.java | 8 +------- .../groovy/org/gradle/api/internal/classpath/ManifestUtil.java | 3 +++ + .../internal/installation/CurrentGradleInstallationLocator.java | 8 +------- subprojects/launcher/launcher.gradle | 2 +- .../org/gradle/launcher/daemon/client/DefaultDaemonStarter.java | 6 +----- 4 files changed, 6 insertions(+), 13 deletions(-) -diff --git 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 -index 0f4c3bc..8b9fad9 100644 ---- 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 -@@ -69,13 +69,7 @@ public class DefaultGradleDistributionLocator implements GradleDistributionLocat - }; - - private static File findDistDir(Class clazz) { -- File codeSource = ClasspathUtil.getClasspathForClass(clazz); -- if (codeSource.isFile()) { -- return determineDistRootDir(codeSource); -- } else { -- // Loaded from a classes dir - assume we're running from the ide or tests -- return null; -- } -+ return new File("/usr/share/gradle"); - } - - /** diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/ManifestUtil.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/ManifestUtil.java index 193f910..2f8bc36 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/ManifestUtil.java @@ -43,6 +24,25 @@ index 193f910..2f8bc36 100644 if (classpathEntry == null || classpathEntry.trim().length() == 0) { return EMPTY; } +diff --git a/subprojects/core/src/main/groovy/org/gradle/internal/installation/CurrentGradleInstallationLocator.java b/subprojects/core/src/main/groovy/org/gradle/internal/installation/CurrentGradleInstallationLocator.java +index 88d6b0b..fe9086c 100644 +--- 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 @@ abstract class CurrentGradleInstallationLocator { + } + + private static File findDistDir(Class clazz) { +- File codeSource = ClasspathUtil.getClasspathForClass(clazz); +- if (codeSource.isFile()) { +- return determineDistRootDir(codeSource); +- } else { +- // Loaded from a classes dir - assume we're running from the ide or tests +- return null; +- } ++ return new File("/usr/share/gradle"); + } + + /** diff --git a/subprojects/launcher/launcher.gradle b/subprojects/launcher/launcher.gradle index 7fd9207..754f96f 100644 --- a/subprojects/launcher/launcher.gradle @@ -57,22 +57,28 @@ index 7fd9207..754f96f 100644 } diff --git a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonStarter.java b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonStarter.java -index 9d4702e..45ca226 100755 +index 1616285..39362c2 100755 --- a/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonStarter.java +++ b/subprojects/launcher/src/main/java/org/gradle/launcher/daemon/client/DefaultDaemonStarter.java -@@ -72,11 +72,7 @@ public class DefaultDaemonStarter implements DaemonStarter { - ModuleRegistry registry = new DefaultModuleRegistry(); +@@ -73,17 +73,13 @@ public class DefaultDaemonStarter implements DaemonStarter { + ModuleRegistry registry = new DefaultModuleRegistry(gradleInstallation); ClassPath classpath; List searchClassPath; -- if (new DefaultGradleDistributionLocator().getGradleHome() != null) { -- // When running from a Gradle distro, only need launcher jar. The daemon can find everything from there. -- classpath = registry.getModule("gradle-launcher").getImplementationClasspath(); -- searchClassPath = Collections.emptyList(); -- } else { +- if (gradleInstallation == null) { + { // When not running from a Gradle distro, need runtime impl for launcher plus the search path to look for other modules classpath = new DefaultClassPath(); for (Module module : registry.getModule("gradle-launcher").getAllRequiredModules()) { + classpath = classpath.plus(module.getClasspath()); + } + searchClassPath = registry.getAdditionalClassPath().getAsFiles(); +- } else { +- // When running from a Gradle distro, only need launcher jar. The daemon can find everything from there. +- classpath = registry.getModule("gradle-launcher").getImplementationClasspath(); +- searchClassPath = Collections.emptyList(); + } + if (classpath.isEmpty()) { + throw new IllegalStateException("Unable to construct a bootstrap classpath when starting the daemon"); -- 2.5.0 diff --git a/0004-Implement-XMvn-repository-factory-method.patch b/0004-Implement-XMvn-repository-factory-method.patch index 1fe2ebb..416bfe5 100644 --- a/0004-Implement-XMvn-repository-factory-method.patch +++ b/0004-Implement-XMvn-repository-factory-method.patch @@ -1,4 +1,4 @@ -From 9a63fa09e4b00c4523d0f5dc6f9ffc3012841d3d Mon Sep 17 00:00:00 2001 +From 456861412bcd632a2e69a7c37b3df4fd2508d943 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 9 Nov 2014 21:37:37 +0100 Subject: [PATCH 04/13] Implement XMvn repository factory method diff --git a/0005-Add-build-dependency-on-ASM-5.0.3.patch b/0005-Add-build-dependency-on-ASM-5.0.3.patch index c5928d9..fe5bc4f 100644 --- a/0005-Add-build-dependency-on-ASM-5.0.3.patch +++ b/0005-Add-build-dependency-on-ASM-5.0.3.patch @@ -1,4 +1,4 @@ -From 354a403fd2e36042080b1bea529c551f85487ed5 Mon Sep 17 00:00:00 2001 +From e24f6fc86e00bc6a83b4ac9507134c55885fca31 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Jan 2015 12:30:09 +0100 Subject: [PATCH 05/13] Add build dependency on ASM 5.0.3 diff --git a/0006-Port-from-Simple-4-to-Jetty-9.patch b/0006-Port-from-Simple-4-to-Jetty-9.patch index 64255eb..3c4be4a 100644 --- a/0006-Port-from-Simple-4-to-Jetty-9.patch +++ b/0006-Port-from-Simple-4-to-Jetty-9.patch @@ -1,4 +1,4 @@ -From 1338ab5673d27b70538035761ff29c96215d2611 Mon Sep 17 00:00:00 2001 +From 4407282c46d3f3b25fe2c13eb67d30f3a5b9dfd0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 30 Jan 2015 13:16:40 +0100 Subject: [PATCH 06/13] Port from Simple 4 to Jetty 9 diff --git a/0007-Use-unversioned-dependency-JAR-names.patch b/0007-Use-unversioned-dependency-JAR-names.patch index bd466ac..b3c9bce 100644 --- a/0007-Use-unversioned-dependency-JAR-names.patch +++ b/0007-Use-unversioned-dependency-JAR-names.patch @@ -1,4 +1,4 @@ -From a4075528a56a0f663841641a1da10d8f51790563 Mon Sep 17 00:00:00 2001 +From f85b7f24cc092515b668995991188397e7c87fb4 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Sat, 7 Feb 2015 15:28:03 +0100 Subject: [PATCH 07/13] Use unversioned dependency JAR names @@ -6,9 +6,8 @@ Subject: [PATCH 07/13] Use unversioned dependency JAR names --- gradle/groovyProject.gradle | 6 ++++-- .../org/gradle/api/internal/classpath/DefaultModuleRegistry.java | 2 +- - .../process/internal/child/WorkerProcessClassPathProvider.java | 2 +- .../main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java | 2 +- - 4 files changed, 7 insertions(+), 5 deletions(-) + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gradle/groovyProject.gradle b/gradle/groovyProject.gradle index 174548f..15d00a35 100644 @@ -29,31 +28,18 @@ index 174548f..15d00a35 100644 return properties } diff --git a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java -index 14e1d90..30daca8 100644 +index 62de97e..82b99a0 100644 --- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java +++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java -@@ -191,7 +191,7 @@ public class DefaultModuleRegistry implements ModuleRegistry { +@@ -188,7 +188,7 @@ public class DefaultModuleRegistry implements ModuleRegistry { } private File findJar(String name) { - Pattern pattern = Pattern.compile(Pattern.quote(name) + "-\\d.+\\.jar"); + Pattern pattern = Pattern.compile(Pattern.quote(name) + "(?:-\\d.+)?\\.jar"); - for (File libDir : gradleDistributionLocator.getLibDirs()) { - for (File file : libDir.listFiles()) { - if (pattern.matcher(file.getName()).matches()) { -diff --git 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 -index 1181556..5510a8b 100644 ---- 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 @@ public class WorkerProcessClassPathProvider implements ClassPathProvider, Closea - 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")) { + if (gradleInstallation != null) { + for (File libDir : gradleInstallation.getLibDirs()) { + for (File file : libDir.listFiles()) { diff --git a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java index 735fb76..29c50b6 100644 --- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java diff --git a/0008-Port-to-Ivy-2.4.0.patch b/0008-Port-to-Ivy-2.4.0.patch index 389d57b..9ab26c3 100644 --- a/0008-Port-to-Ivy-2.4.0.patch +++ b/0008-Port-to-Ivy-2.4.0.patch @@ -1,4 +1,4 @@ -From 3cbd1b5193b88c3bfdba8902aec001c96b1d3004 Mon Sep 17 00:00:00 2001 +From 54580f54c2c29cce254d9d3dcbcfaa85893965b9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 Apr 2015 12:27:00 +0200 Subject: [PATCH 08/13] Port to Ivy 2.4.0 @@ -9,7 +9,7 @@ Subject: [PATCH 08/13] Port to Ivy 2.4.0 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 2b5e69c..d1af0ec 100644 +index c3ea04a..17e9baf 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 @@ -1135,7 +1135,7 @@ public class IvyXmlModuleDescriptorParser extends AbstractModuleDescriptorParser diff --git a/0009-Port-to-Polyglot-0.1.8.patch b/0009-Port-to-Polyglot-0.1.8.patch index c538e37..b0546b9 100644 --- a/0009-Port-to-Polyglot-0.1.8.patch +++ b/0009-Port-to-Polyglot-0.1.8.patch @@ -1,4 +1,4 @@ -From 08fa56464cf392d12dfadd652a8e1de2b4aa985e Mon Sep 17 00:00:00 2001 +From ed5e1b79063bd70377cdfae2fcb71912a50d1c16 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2015 15:12:44 +0200 Subject: [PATCH 09/13] Port to Polyglot 0.1.8 diff --git a/0010-Remove-S3-plugin.patch b/0010-Remove-S3-plugin.patch index 9addff3..aaa2cdb 100644 --- a/0010-Remove-S3-plugin.patch +++ b/0010-Remove-S3-plugin.patch @@ -1,4 +1,4 @@ -From bfbe87541982e7e0a8d22f7c890be419010a5626 Mon Sep 17 00:00:00 2001 +From d339abef77db24504ff4add85074146d01205609 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 28 Apr 2015 11:35:17 +0200 Subject: [PATCH 10/13] Remove S3 plugin @@ -15,7 +15,7 @@ https://discuss.gradle.org/t/gradle-2-4-rc1-introduces-a-non-free-dependency/935 6 files changed, 2 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle -index 4e26005..128fb0a 100644 +index 0939d93..7acabdf 100644 --- a/build.gradle +++ b/build.gradle @@ -146,7 +146,7 @@ ext { @@ -28,20 +28,20 @@ index 4e26005..128fb0a 100644 project(it) } diff --git a/gradle/buildSplits.gradle b/gradle/buildSplits.gradle -index b631926..4436746 100644 +index 9809bc9..a53a167 100644 --- a/gradle/buildSplits.gradle +++ b/gradle/buildSplits.gradle @@ -26,7 +26,7 @@ def buckets = [ - "3": [":launcher", ":plugins", ":codeQuality", ":languageJava", ":testingBase", ":testingJvm", + "3": [":launcher", ":plugins", ":testKit", ":languageJava", ":testingBase", ":testingJvm", ":ui", ":javascript", ":antlr", ":messaging", ":ear", - ":resourcesS3", ":wrapper", ":resourcesSftp", ":signing", ":modelGroovy", ":baseServices"], + ":wrapper", ":resourcesSftp", ":signing", ":modelGroovy", ":baseServices"], - "4": [":docs", ":integTest", ":core", ":languageNative", ":ide", ":platformJvm", ":platformNative", - ":modelCore", ":sonar", ":maven", ":testingNative", ":ideNative", ":native"] + "4": [":docs", ":integTest", ":dependencyManagement", ":languageNative", ":ide", ":platformJvm", ":platformNative", + ":modelCore", ":sonar", ":maven", ":testingNative", ":ideNative", ":native", ":installationBeacon"] diff --git a/settings.gradle b/settings.gradle -index fad45e6..099a56b 100644 +index e40d799..94895a5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,6 @@ include 'launcher' diff --git a/0011-Port-to-Kryo-3.0.patch b/0011-Port-to-Kryo-3.0.patch index e03026d..e64a075 100644 --- a/0011-Port-to-Kryo-3.0.patch +++ b/0011-Port-to-Kryo-3.0.patch @@ -1,4 +1,4 @@ -From e584c31050b3e01cee2b5b37eb3f3f66de6b7ecb Mon Sep 17 00:00:00 2001 +From 7405aaed8fc40754f5519fe1d420fff2be54e9ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 12 Jun 2015 12:04:53 +0200 Subject: [PATCH 11/13] Port to Kryo 3.0 diff --git a/0012-Port-to-Maven-3.3.9-and-Eclipse-Aether.patch b/0012-Port-to-Maven-3.3.9-and-Eclipse-Aether.patch index 0565762..0e3ce6f 100644 --- a/0012-Port-to-Maven-3.3.9-and-Eclipse-Aether.patch +++ b/0012-Port-to-Maven-3.3.9-and-Eclipse-Aether.patch @@ -1,4 +1,4 @@ -From 1a58400a891d227ca272252abef0756372eb8e6c Mon Sep 17 00:00:00 2001 +From eeaf0014e0d783dbf4f1c4d0a964e6916145a244 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 6 Jul 2015 09:57:22 +0200 Subject: [PATCH 12/13] Port to Maven 3.3.9 and Eclipse Aether @@ -14,7 +14,7 @@ Subject: [PATCH 12/13] Port to Maven 3.3.9 and Eclipse Aether 7 files changed, 76 insertions(+), 66 deletions(-) diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle -index e7189bd..0fd67bc 100755 +index 431f30d..96dc655 100755 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle @@ -99,12 +99,18 @@ libraries += [ diff --git a/0013-Publish-all-artifacts.patch b/0013-Publish-all-artifacts.patch index 9630a2a..7cfca0c 100644 --- a/0013-Publish-all-artifacts.patch +++ b/0013-Publish-all-artifacts.patch @@ -1,4 +1,4 @@ -From 2937e8c444e39bcdcae43101d3e57627a53fc53b Mon Sep 17 00:00:00 2001 +From aad21852f6243d229e35518b712a6cb3bde202be Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Mon, 23 Nov 2015 15:43:15 +0100 Subject: [PATCH 13/13] Publish all artifacts @@ -8,7 +8,7 @@ Subject: [PATCH 13/13] Publish all artifacts 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle -index 128fb0a..a7b2148 100644 +index 7acabdf..35d6039 100644 --- a/build.gradle +++ b/build.gradle @@ -151,14 +151,12 @@ ext {