From f85b7f24cc092515b668995991188397e7c87fb4 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Sat, 7 Feb 2015 15:28:03 +0100
Subject: [PATCH 07/15] Use unversioned dependency JAR names

---
 gradle/groovyProject.gradle                                         | 6 ++++--
 .../org/gradle/api/internal/classpath/DefaultModuleRegistry.java    | 2 +-
 .../main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gradle/groovyProject.gradle b/gradle/groovyProject.gradle
index 174548f..15d00a35 100644
--- a/gradle/groovyProject.gradle
+++ b/gradle/groovyProject.gradle
@@ -97,9 +97,11 @@ class ClasspathManifest extends DefaultTask {
     @Input
     Properties getProperties() {
         def properties = new Properties()
-        properties.runtime = input.fileCollection {
+        def spec = org.gradle.api.specs.Specs.convertClosureToSpec {
             (it instanceof ExternalDependency) || (it instanceof FileCollectionDependency)
-        }.collect { it.name }.join(',')
+        }
+        def artifacts = input.resolvedConfiguration.lenientConfiguration.getArtifacts(spec)
+        properties.runtime = artifacts.collect { it.file.canonicalFile.name }.join(',')
         properties.projects = input.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.archivesBaseName }.join(',')
         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 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
@@ -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");
         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
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/plugins/GroovyJarFile.java
@@ -23,7 +23,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 public class GroovyJarFile {
-    private static final Pattern FILE_NAME_PATTERN = Pattern.compile("(groovy(?:-all)?)-(\\d.*?)(-indy)?.jar");
+    private static final Pattern FILE_NAME_PATTERN = Pattern.compile("(groovy(?:-all)?)(?:-(\\d.*?))?(-indy)?.jar");
 
     private final File file;
     private final Matcher matcher;
-- 
2.5.5