diff -Nru gradle-1.0/build.gradle gradle-1.0-gil/build.gradle
--- gradle-1.0/build.gradle 2012-09-21 21:32:41.668531310 +0200
+++ gradle-1.0-gil/build.gradle 2012-09-21 21:31:18.958114750 +0200
@@ -46,7 +46,7 @@
ant: dependencies.module('org.apache.ant:ant:1.8.2') {
dependency 'org.apache.ant:ant-launcher:1.8.2@jar'
},
- asm: 'asm:asm-all:3.3.1@jar',
+ asm: 'asm:objectweb-asm/asm-all:3.3.1@jar',
commons_cli: 'commons-cli:commons-cli:1.2@jar',
commons_io: dependencies.module(versions.commons_io),
commons_lang: 'commons-lang:commons-lang:2.6@jar',
@@ -60,18 +60,18 @@
}
// Logging
-libraries.slf4j_api = 'org.slf4j:slf4j-api:1.6.4@jar'
-libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j:1.6.4') {
+libraries.slf4j_api = 'org.slf4j:slf4j/api:1.6.4@jar'
+libraries.jcl_to_slf4j = dependencies.module('org.slf4j:slf4j/jcl-over-slf4j:1.6.4') {
dependency libraries.slf4j_api
}
-libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j:1.6.4') {
+libraries.jul_to_slf4j = dependencies.module('org.slf4j:slf4j/jul-to-slf4j:1.6.4') {
dependency libraries.slf4j_api
}
-libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j:1.6.4') {
+libraries.log4j_to_slf4j = dependencies.module('org.slf4j:slf4j/log4j-over-slf4j:1.6.4') {
dependency libraries.slf4j_api
}
-libraries.logback_core = 'ch.qos.logback:logback-core:1.0.0@jar'
-libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:1.0.0') {
+libraries.logback_core = 'ch.qos.logback:logback/logback-core:1.0.0@jar'
+libraries.logback_classic = dependencies.module('ch.qos.logback:logback/logback-classic:1.0.0') {
dependency libraries.logback_core
dependency libraries.slf4j_api
}
@@ -87,8 +87,8 @@
dependency libraries.servlet_api
}
-libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpclient:4.1.2') {
- dependency "org.apache.httpcomponents:httpcore:4.1.2@jar"
+libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpcomponents/httpclient:4.1.2') {
+ dependency "org.apache.httpcomponents:httpcomponents/httpcore:4.1.2@jar"
dependency libraries.jcl_to_slf4j
dependency "commons-codec:commons-codec:1.4@jar"
dependency "org.samba.jcifs:jcifs:1.3.17"
@@ -99,14 +99,14 @@
}
libraries += [
- ant_junit: 'org.apache.ant:ant-junit:1.8.2@jar',
- ant_antlr: 'org.apache.ant:ant-antlr:1.8.2@jar',
+ ant_junit: 'org.apache.ant:ant/ant-junit:1.8.2@jar',
+ ant_antlr: 'org.apache.ant:ant/ant-antlr:1.8.2@jar',
antlr: 'antlr:antlr:2.7.7@jar',
dom4j: 'dom4j:dom4j:1.6.1@jar',
guava: 'com.google.guava:guava:11.0.1@jar',
groovy: [
'org.codehaus.groovy:groovy:1.8.6@jar',
- 'asm:asm-all:3.3.1@jar',
+ 'asm:objectweb-asm/asm-all:3.3.1@jar',
'antlr:antlr:2.7.7@jar',
'commons-cli:commons-cli:1.2@jar'
],
@@ -121,14 +121,14 @@
libraries.spock = ['org.spockframework:spock-core:0.6-groovy-1.8@jar',
libraries.groovy,
'org.objenesis:objenesis:1.2',
- 'cglib:cglib-nodep:2.2']
+ 'cglib:cglib:2.2']
libraries.jmock = ['org.jmock:jmock:2.5.1',
'org.hamcrest:hamcrest-core:1.1',
'org.hamcrest:hamcrest-library:1.1',
'org.jmock:jmock-junit4:2.5.1',
'org.jmock:jmock-legacy:2.5.1',
'org.objenesis:objenesis:1.2',
- 'cglib:cglib-nodep:2.2']
+ 'cglib:cglib:2.2']
allprojects {
group = 'org.gradle'
@@ -139,8 +139,10 @@
}
repositories {
- maven { url 'http://repo.gradle.org/gradle/libs' }
- maven { url 'http://repository.codehaus.org/' }
+ ivy {
+ artifactPattern "/usr/share/java/[module]-[revision].[ext]"
+ artifactPattern "/usr/share/java/[module].[ext]"
+ }
}
configurations {
diff -Nru gradle-1.0/buildSrc/build.gradle gradle-1.0-gil/buildSrc/build.gradle
--- gradle-1.0/buildSrc/build.gradle 2012-09-21 21:32:41.682530533 +0200
+++ gradle-1.0-gil/buildSrc/build.gradle 2012-09-21 21:31:18.959114695 +0200
@@ -21,8 +21,10 @@
apply plugin: 'eclipse'
repositories {
- maven { url 'http://repo.gradle.org/gradle/libs' }
- mavenCentral()
+ ivy {
+ artifactPattern "/usr/share/java/[module]-[revision].[ext]"
+ artifactPattern "/usr/share/java/[module].[ext]"
+ }
}
dependencies {
diff -Nru gradle-1.0/gradle/groovyProject.gradle gradle-1.0-gil/gradle/groovyProject.gradle
--- gradle-1.0/gradle/groovyProject.gradle 2012-04-25 01:27:12.000000000 +0200
+++ gradle-1.0-gil/gradle/groovyProject.gradle 2012-09-21 21:31:18.960114640 +0200
@@ -59,7 +59,7 @@
@Input
Properties getProperties() {
def properties = new Properties()
- properties.runtime = project.configurations.runtime.fileCollection { it instanceof ExternalDependency }.collect {it.name}.join(',')
+ properties.runtime = project.configurations.runtime.fileCollection { it instanceof ExternalDependency }.collect {it.absolutePath.replaceFirst('/usr/share/java/', '')}.join(',')
properties.projects = project.configurations.runtime.allDependencies.withType(ProjectDependency).collect {it.dependencyProject.archivesBaseName}.join(',')
return properties
}
@@ -68,4 +68,4 @@
def generate() {
manifestFile.withOutputStream { properties.save(it, 'module definition') }
}
-}
\ Manca newline alla fine del file
+}
diff -Nru gradle-1.0/subprojects/core/core.gradle gradle-1.0-gil/subprojects/core/core.gradle
--- gradle-1.0/subprojects/core/core.gradle 2012-04-25 01:27:12.000000000 +0200
+++ gradle-1.0-gil/subprojects/core/core.gradle 2012-09-21 21:31:18.962114528 +0200
@@ -54,7 +54,8 @@
integTestCompile project(":internalIntegTesting")
- reports 'css3-pie:css3-pie:1.0beta3'
+// Not available in Fedora
+// reports 'css3-pie:css3-pie:1.0beta3'
}
test {
@@ -94,4 +95,4 @@
def generate() {
propertiesFile.withOutputStream { pluginProperties.save(it, 'plugin definitions') }
}
-}
\ Manca newline alla fine del file
+}
diff -Nru gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
--- gradle-1.0/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-09-21 21:32:41.674530978 +0200
+++ gradle-1.0-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-09-21 21:31:18.963114473 +0200
@@ -257,6 +257,12 @@
return jarFile;
}
}
+ // Last chance, look for libary in system-wide java directory
+ jarFile = new File("/usr/share/java/", name);
+
+ if (jarFile.isFile()) {
+ return jarFile;
+ }
throw new IllegalArgumentException(String.format("Cannot find JAR '%s' required by module '%s' using classpath or distribution directory '%s'", name, module, distDir));
}
diff -Nru gradle-1.0/subprojects/core-impl/core-impl.gradle gradle-1.0-gil/subprojects/core-impl/core-impl.gradle
--- gradle-1.0/subprojects/core-impl/core-impl.gradle 2012-04-25 01:27:12.000000000 +0200
+++ gradle-1.0-gil/subprojects/core-impl/core-impl.gradle 2012-09-21 21:31:18.961114584 +0200
@@ -11,6 +11,8 @@
compile libraries.ivy
compile libraries.slf4j_api
compile libraries.maven_ant_tasks
+ // This is unbundled from maven-ant-tasks
+ compile "org.codehaus.plexus:plexus/container-default:1.0"
testCompile libraries.junit
}