diff -Nru gradle-1.3/build.gradle gradle-1.3-gil/build.gradle
--- gradle-1.3/build.gradle 2012-12-13 06:34:16.093305312 +0100
+++ gradle-1.3-gil/build.gradle 2012-12-13 06:36:32.123945486 +0100
@@ -102,7 +102,10 @@
group = 'org.gradle'
repositories {
- maven { url 'http://repo.gradle.org/gradle/libs' }
+ ivy {
+ artifactPattern "/usr/share/java/[module]-[revision].[ext]"
+ artifactPattern "/usr/share/java/[module].[ext]"
+ }
}
}
diff -Nru gradle-1.3/buildSrc/build.gradle gradle-1.3-gil/buildSrc/build.gradle
--- gradle-1.3/buildSrc/build.gradle 2012-11-20 12:38:16.000000000 +0100
+++ gradle-1.3-gil/buildSrc/build.gradle 2012-12-13 06:38:12.936753104 +0100
@@ -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 {
@@ -31,7 +33,7 @@
compile 'commons-lang:commons-lang:2.6@jar'
groovy localGroovy()
testCompile 'junit:junit:4.10@jar'
- testCompile 'org.spockframework:spock-core:0.6-groovy-1.8@jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
+ //testCompile 'org.spockframework:spock-core:0.6-groovy-1.8@jar', 'cglib:cglib:2.2', 'org.objenesis:objenesis:1.2'
compile "org.pegdown:pegdown:1.1.0"
compile "org.jsoup:jsoup:1.6.3"
@@ -44,3 +46,11 @@
apply from: '../gradle/compile.gradle'
apply from: '../gradle/codeQuality.gradle'
apply from: '../gradle/classycle.gradle'
+
+compileTestGroovy {
+ exclude '**'
+}
+
+test {
+ testReport = false
+}
\ Manca newline alla fine del file
diff -Nru gradle-1.3/gradle/dependencies.gradle gradle-1.3-gil/gradle/dependencies.gradle
--- gradle-1.3/gradle/dependencies.gradle 2012-12-13 06:34:16.069306771 +0100
+++ gradle-1.3-gil/gradle/dependencies.gradle 2012-12-13 07:08:51.899968531 +0100
@@ -25,7 +25,7 @@
dependency 'org.apache.ant:ant-launcher:1.8.4@jar'
}
-libraries.asm = 'org.ow2.asm:asm-all:4.0@jar'
+libraries.asm = 'org.ow2.asm:objectweb-asm4/asm-all:4.0@jar'
libraries.commons_cli = 'commons-cli:commons-cli:1.2@jar'
libraries.commons_io = dependencies.module(versions.commons_io)
libraries.commons_lang = 'commons-lang:commons-lang:2.6@jar'
@@ -34,28 +34,28 @@
dependency "com.jcraft:jsch:0.1.46"
}
libraries.jcip = "net.jcip:jcip-annotations:1.0@jar"
-libraries.inject = dependencies.module('javax.inject:javax.inject:1')
+libraries.inject = dependencies.module('javax.inject:atinject:1')
// Logging
-libraries.slf4j_api = 'org.slf4j:slf4j-api:1.6.6@jar'
-libraries.jcl_to_slf4j = dependencies.module('org.slf4j:jcl-over-slf4j:1.6.6') {
+libraries.slf4j_api = 'org.slf4j:slf4j/api:1.6.6@jar'
+libraries.jcl_to_slf4j = dependencies.module('org.slf4j:slf4j/jcl-over-slf4j:1.6.6') {
dependency libraries.slf4j_api
}
-libraries.jul_to_slf4j = dependencies.module('org.slf4j:jul-to-slf4j:1.6.6') {
+libraries.jul_to_slf4j = dependencies.module('org.slf4j:slf4j/jul-to-slf4j:1.6.6') {
dependency libraries.slf4j_api
}
-libraries.log4j_to_slf4j = dependencies.module('org.slf4j:log4j-over-slf4j:1.6.6') {
+libraries.log4j_to_slf4j = dependencies.module('org.slf4j:slf4j/log4j-over-slf4j:1.6.6') {
dependency libraries.slf4j_api
}
-libraries.logback_core = 'ch.qos.logback:logback-core:1.0.6@jar'
-libraries.logback_classic = dependencies.module('ch.qos.logback:logback-classic:1.0.6') {
+libraries.logback_core = 'ch.qos.logback:logback/logback-core:1.0.6@jar'
+libraries.logback_classic = dependencies.module('ch.qos.logback:logback/logback-classic:1.0.6') {
dependency libraries.logback_core
dependency libraries.slf4j_api
}
// Jetty
-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar"
-libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
+libraries.servlet_api = "org.mortbay.jetty:tomcat-servlet-3.0-api:2.5-20081211@jar"
+libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty/jetty-util:6.1.25") {
dependency libraries.slf4j_api
dependency libraries.servlet_api
}
@@ -64,8 +64,8 @@
dependency libraries.servlet_api
}
-libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpclient:4.2.1') {
- dependency "org.apache.httpcomponents:httpcore:4.2.1@jar"
+libraries.commons_httpclient = dependencies.module('org.apache.httpcomponents:httpcomponents/httpclient:4.2.1') {
+ dependency "org.apache.httpcomponents:httpcomponents/httpcore:4.2.1@jar"
dependency libraries.jcl_to_slf4j
dependency "commons-codec:commons-codec:1.6@jar"
dependency "org.samba.jcifs:jcifs:1.3.17"
@@ -73,18 +73,29 @@
libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:2.1.3") {
libraries.ant
+ dependency "org.apache.maven:maven/maven-artifact:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-compat:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-core:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-model:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-settings:3.0.4@jar"
+ dependency "org.apache.maven:maven-wagon/provider-api:1.0@jar"
+ dependency "org.apache.maven:maven/maven-error-diagnostics:2.2.1@jar"
+ dependency "org.codehaus.plexus:plexus/containers-container-default:1.5.5@jar"
+ dependency "org.codehaus.plexus:plexus/classworlds:2.4@jar"
+ dependency "org.codehaus.plexus:plexus/plexus-component-api:1.0@jar"
+ dependency "org.codehaus.plexus:plexus/interpolation:1.14@jar"
}
libraries += [
- ant_junit: 'org.apache.ant:ant-junit:1.8.4@jar',
- ant_antlr: 'org.apache.ant:ant-antlr:1.8.4@jar',
+ ant_junit: 'org.apache.ant:ant/ant-junit:1.8.4@jar',
+ ant_antlr: 'org.apache.ant:ant/ant-antlr:1.8.4@jar',
antlr: 'antlr:antlr:2.7.7@jar',
dom4j: 'dom4j:dom4j:1.6.1@jar',
guava: 'com.google.guava:guava:11.0.2@jar',
- jsr305: 'com.google.code.findbugs:jsr305:1.3.9',
+ jsr305: 'com.google.code.findbugs:jsr-305:1.3.9',
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'
],
@@ -94,57 +105,57 @@
junit: 'junit:junit:4.10',
xmlunit: 'xmlunit:xmlunit:1.3',
nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
- xbean: 'org.apache.xbean:xbean-reflect:3.4@jar', //required by maven3 classes
+ xbean: 'org.apache.xbean:xbean/xbean-reflect:3.4@jar', //required by maven3 classes
nativePlatform: 'net.rubygrapefruit:native-platform:0.2'
]
-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
- dependency "org.apache.maven:maven-settings:3.0.4@jar"
- dependency "org.apache.maven:maven-settings-builder:3.0.4@jar"
+libraries.maven3 = dependencies.module("org.apache.maven:maven/maven-core:3.0.4") {
+ dependency "org.apache.maven:maven/maven-settings:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-settings-builder:3.0.4@jar"
//plexus:
- dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar"
- dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar"
- dependency "org.codehaus.plexus:plexus-component-annotations:1.5.5@jar"
- dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar"
- dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar"
+ dependency "org.codehaus.plexus:plexus/utils:2.0.6@jar"
+ dependency "org.codehaus.plexus:plexus/interpolation:1.14@jar"
+ dependency "org.codehaus.plexus:plexus/containers-component-annotations:1.5.5@jar"
+ dependency "org.codehaus.plexus:plexus/containers-container-default:1.5.5@jar"
+ dependency "org.codehaus.plexus:plexus/classworlds:2.4@jar"
//sonatype plexus
- dependency "org.sonatype.plexus:plexus-cipher:1.7@jar"
- dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3@jar"
+ dependency "org.sonatype.plexus:plexus/plexus-cipher:1.7@jar"
+ dependency "org.sonatype.plexus:plexus/plexus-sec-dispatcher:1.3@jar"
//core:
- dependency "org.apache.maven:maven-core:3.0.4@jar"
- dependency "org.apache.maven:maven-model-builder:3.0.4@jar"
- dependency "org.apache.maven:maven-model:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-core:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-model-builder:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-model:3.0.4@jar"
//somewhat core:
- dependency "org.apache.maven:maven-artifact:3.0.4@jar"
- dependency "org.apache.maven:maven-compat:3.0.4@jar"
- dependency "org.apache.maven:maven-repository-metadata:3.0.4@jar"
- dependency "org.apache.maven:maven-plugin-api:3.0.4@jar"
- dependency "org.apache.maven:maven-aether-provider:3.0.4@jar"
- dependency "org.apache.maven.wagon:wagon-provider-api:2.2@jar"
+ dependency "org.apache.maven:maven/maven-artifact:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-compat:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-repository-metadata:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-plugin-api:3.0.4@jar"
+ dependency "org.apache.maven:maven/maven-aether-provider:3.0.4@jar"
+ dependency "org.apache.maven.wagon:maven-wagon/provider-api:2.2@jar"
//eather:
- dependency "org.sonatype.aether:aether-api:1.13.1@jar"
- dependency "org.sonatype.aether:aether-impl:1.13.1@jar"
- dependency "org.sonatype.aether:aether-spi:1.13.1@jar"
- dependency "org.sonatype.aether:aether-util:1.13.1@jar"
+ dependency "org.sonatype.aether:aether/api:1.13.1@jar"
+ dependency "org.sonatype.aether:aether/impl:1.13.1@jar"
+ dependency "org.sonatype.aether:aether/spi:1.13.1@jar"
+ dependency "org.sonatype.aether:aether/util:1.13.1@jar"
}
libraries.spock = [
'org.spockframework:spock-core:0.7-groovy-1.8@jar',
libraries.groovy,
'org.objenesis:objenesis:1.2',
- 'cglib:cglib-nodep:2.2.2'
+ 'cglib:cglib:2.2.2'
]
libraries.jmock = [
- 'org.jmock:jmock:2.5.1',
- 'org.hamcrest:hamcrest-core:1.1',
- 'org.hamcrest:hamcrest-library:1.1',
- dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
- 'org.jmock:jmock-legacy:2.5.1',
+ 'org.jmock:jmock/jmock:2.5.1',
+ 'org.hamcrest:hamcrest/core:1.1',
+ 'org.hamcrest:hamcrest/library:1.1',
+ dependencies.create('org.jmock:jmock/jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
+ 'org.jmock:jmock/jmock-legacy:2.5.1',
'org.objenesis:objenesis:1.2',
- 'cglib:cglib-nodep:2.2'
+ 'cglib:cglib:2.2'
]
diff -Nru gradle-1.3/gradle/groovyProject.gradle gradle-1.3-gil/gradle/groovyProject.gradle
--- gradle-1.3/gradle/groovyProject.gradle 2012-11-20 12:38:16.000000000 +0100
+++ gradle-1.3-gil/gradle/groovyProject.gradle 2012-12-13 06:59:00.370267540 +0100
@@ -88,7 +88,7 @@
def properties = new Properties()
properties.runtime = input.fileCollection {
(it instanceof ExternalDependency) || (it instanceof FileCollectionDependency)
- }.collect {it.name}.join(',')
+ }.collect {it.absolutePath.replaceFirst('/usr/share/java/', '')}.join(',')
properties.projects = input.allDependencies.withType(ProjectDependency).collect {it.dependencyProject.archivesBaseName}.join(',')
return properties
}
diff -Nru gradle-1.3/subprojects/code-quality/code-quality.gradle gradle-1.3-gil/subprojects/code-quality/code-quality.gradle
--- gradle-1.3/subprojects/code-quality/code-quality.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/code-quality/code-quality.gradle 2012-12-13 06:59:53.134032365 +0100
@@ -27,7 +27,7 @@
// minimal dependencies to make our code compile
// we don't ship these dependencies because findbugs plugin will download them (and more) at runtime
provided "com.google.code.findbugs:findbugs:2.0.1@jar"
- provided "com.google.code.findbugs:bcel:2.0.1@jar"
+ provided "com.google.code.findbugs:findbugs-bcel:2.0.1@jar"
provided "dom4j:dom4j:1.6.1@jar"
provided "jaxen:jaxen:1.1.1@jar"
}
diff -Nru gradle-1.3/subprojects/core/core.gradle gradle-1.3-gil/subprojects/core/core.gradle
--- gradle-1.3/subprojects/core/core.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/core/core.gradle 2012-12-13 07:00:55.643195930 +0100
@@ -49,15 +49,15 @@
testCompile libraries.log4j_to_slf4j
testCompile libraries.jcl_to_slf4j
- testRuntime "xerces:xercesImpl:2.9.1"
+ testRuntime "xerces:xerces-j2:2.9.1"
testRuntime project(":diagnostics")
testFixturesCompile project(":internalTesting")
testFixturesRuntime project(':coreImpl')
integTestCompile project(":internalIntegTesting")
-
- reports 'css3-pie:css3-pie:1.0beta3'
+// Not available in Fedora
+// reports 'css3-pie:css3-pie:1.0beta3'
}
useTestFixtures()
diff -Nru gradle-1.3/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java gradle-1.3-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java
--- gradle-1.3/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-12-13 06:34:16.104304645 +0100
+++ gradle-1.3-gil/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java 2012-12-13 07:05:13.635360922 +0100
@@ -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.3/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css gradle-1.3-gil/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css
--- gradle-1.3/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/core/src/main/resources/org/gradle/reporting/base-style.css 2012-12-13 07:06:27.090855218 +0100
@@ -68,7 +68,7 @@
margin-right: 25px;
border: solid 1px #d4d4d4;
background-color: #f0f0f0;
- behavior: url(css3-pie-1.0beta3.htc);
+ /*behavior: url(css3-pie-1.0beta3.htc);*/
}
ul.tabLinks li:hover {
diff -Nru gradle-1.3/subprojects/core-impl/core-impl.gradle gradle-1.3-gil/subprojects/core-impl/core-impl.gradle
--- gradle-1.3/subprojects/core-impl/core-impl.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/core-impl/core-impl.gradle 2012-12-13 07:16:58.904142919 +0100
@@ -18,32 +18,34 @@
compile libraries.slf4j_api
compile libraries.maven_ant_tasks
compile libraries.nekohtml
+ // This is unbundled from maven-ant-tasks
+ compile "org.codehaus.plexus:plexus/containers-container-default:1.5.5"
runtime libraries.xbean //maven3 classes dependency
testCompile libraries.junit
- compile fileTree("$buildDir/libs/jarjar") {
- builtBy 'jarJarMaven3'
- }
-
- mvn3Input libraries.maven3
+// compile fileTree("$buildDir/libs/jarjar") {
+// builtBy 'jarJarMaven3'
+// }
+//
+// mvn3Input libraries.maven3
}
-task jarJarMaven3(type: JarJar) {
- inputJars = configurations.mvn3Input
- outputDir = file("$buildDir/libs/jarjar")
-
+//task jarJarMaven3(type: JarJar) {
+// inputJars = configurations.mvn3Input
+// outputDir = file("$buildDir/libs/jarjar")
+//
//unfortunately, all those need to be jarjarred.
// Even if some library (like aether) is not included in maven-ant-tasks it has
// META-INF/plexus/components.xml that to jarjarred components.
- rule('org.apache.maven.**', 'org.gradle.mvn3.org.apache.maven.@1')
- rule('org.codehaus.**', 'org.gradle.mvn3.org.codehaus.@1')
- rule('org.sonatype.**', 'org.gradle.mvn3.org.sonatype.@1')
-
- avoidConflictingPlexusComponents(it)
-}
+// rule('org.apache.maven.**', 'org.gradle.mvn3.org.apache.maven.@1')
+// rule('org.codehaus.**', 'org.gradle.mvn3.org.codehaus.@1')
+// rule('org.sonatype.**', 'org.gradle.mvn3.org.sonatype.@1')
+//
+// avoidConflictingPlexusComponents(it)
+//}
-classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521
+//classpathManifest.dependsOn jarJarMaven3 //see GRADLE-2521
//adding explicit task dependencies due to http://issues.gradle.org/browse/GRADLE-2481
def allJarJars = tasks.withType(JarJar)
@@ -51,21 +53,21 @@
eclipseClasspath.dependsOn allJarJars
useTestFixtures()
-def avoidConflictingPlexusComponents(JarJar task) {
+//def avoidConflictingPlexusComponents(JarJar task) {
//DefaultSecDispatcher component is configured in 2 different jars (META-INF/plexus/components.xml).
//The implementation is the same but the 'hint' is different and this makes plexus fail to start.
//I'm removing the components.xml file from the sec-dispatcher jar.
//This file contains only single component so I think we can remove it.
- task.doLast {
- def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar"
- def plexusSecNoComps = "$plexusSec-noComps"
- ant {
- zip(destfile: plexusSecNoComps, update: true) {
- zipfileset(src: plexusSec) {
- exclude(name: 'META-INF/plexus/components.xml')
- }
- }
- move(file: plexusSecNoComps, tofile: plexusSec)
- }
- }
-}
\ Manca newline alla fine del file
+// task.doLast {
+// def plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher-1.3.jar"
+// def plexusSecNoComps = "$plexusSec-noComps"
+// ant {
+// zip(destfile: plexusSecNoComps, update: true) {
+// zipfileset(src: plexusSec) {
+// exclude(name: 'META-INF/plexus/components.xml')
+// }
+// }
+// move(file: plexusSecNoComps, tofile: plexusSec)
+// }
+// }
+//}
\ Manca newline alla fine del file
I file binari gradle-1.3/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/.DefaultLocalMavenRepositoryLocator.java.kate-swp e gradle-1.3-gil/subprojects/core-impl/src/main/groovy/org/gradle/api/internal/artifacts/mvnsettings/.DefaultLocalMavenRepositoryLocator.java.kate-swp sono diversi
diff -Nru gradle-1.3/subprojects/docs/docs.gradle gradle-1.3-gil/subprojects/docs/docs.gradle
--- gradle-1.3/subprojects/docs/docs.gradle 2012-12-13 06:34:16.114304037 +0100
+++ gradle-1.3-gil/subprojects/docs/docs.gradle 2012-12-13 07:22:53.614462922 +0100
@@ -47,8 +47,8 @@
}
dependencies {
- userGuideTask 'xalan:xalan:2.7.1', 'xerces:xercesImpl:2.9.1'
- userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
+ userGuideTask 'xalan:xalan-j2:2.7.1', 'xerces:xerces-j2:2.9.1'
+ userGuideTask module('xhtmlrenderer:flyingsaucer/core-renderer:R8rc1') {
dependency 'itext:itext:2.0.8@jar'
}
userGuideTask 'xslthl:xslthl:2.0.1@jar'
diff -Nru gradle-1.3/subprojects/internal-integ-testing/internal-integ-testing.gradle gradle-1.3-gil/subprojects/internal-integ-testing/internal-integ-testing.gradle
--- gradle-1.3/subprojects/internal-integ-testing/internal-integ-testing.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/internal-integ-testing/internal-integ-testing.gradle 2012-12-13 07:24:54.036100688 +0100
@@ -24,7 +24,7 @@
dependency libraries.slf4j_api
dependency "org.jboss.netty:netty:3.2.4.Final"
}
- compile "org.apache.sshd:sshd-core:0.6.0"
+ compile "org.apache.sshd:apache-sshd/sshd-core:0.6.0"
}
useTestFixtures(sourceSet: 'main')
diff -Nru gradle-1.3/subprojects/javascript/javascript.gradle gradle-1.3-gil/subprojects/javascript/javascript.gradle
--- gradle-1.3/subprojects/javascript/javascript.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/javascript/javascript.gradle 2012-12-13 07:25:38.968350025 +0100
@@ -18,7 +18,7 @@
groovy libraries.groovy
compile "org.mozilla:rhino:1.7R3"
- compile "com.google.code.gson:gson:2.2.1" // used by JsHint
+ compile "com.google.code.gson:google-gson:2.2.1" // used by JsHint
compile "org.simpleframework:simple:4.1.21" // used by http package in envjs
compile project(':core'), project(":plugins")
compile libraries.inject
diff -Nru gradle-1.3/subprojects/jetty/jetty.gradle gradle-1.3-gil/subprojects/jetty/jetty.gradle
--- gradle-1.3/subprojects/jetty/jetty.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/jetty/jetty.gradle 2012-12-13 07:58:47.898231710 +0100
@@ -23,22 +23,22 @@
compile libraries.jetty
compile libraries.jetty_util
compile libraries.servlet_api
- compile module("org.mortbay.jetty:jetty-plus:6.1.25") {
+ compile module("org.mortbay.jetty:jetty/jetty-plus:6.1.25") {
dependency libraries.jetty
- module("org.mortbay.jetty:jetty-naming:6.1.25") {
+ module("org.mortbay.jetty:jetty/jetty-jndi:6.1.25") {
dependency libraries.jetty
}
}
- runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") {
- dependency "org.eclipse.jdt:core:3.1.1@jar"
- dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14@jar"
+ runtime module("org.mortbay.jetty:glassfish-jsp:6.1.14") {
+ dependency "org.eclipse.jdt:ecj:3.1.1@jar"
+ dependency "org.mortbay.jetty:glassfish-jsp-api:6.1.14@jar"
dependency libraries.jetty_util
dependency libraries.servlet_api
}
- runtime "org.mortbay.jetty:jetty-annotations:6.1.25@jar"
- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar"
+ runtime "org.mortbay.jetty:jetty/jetty-annotations:6.1.25@jar"
+ runtime "org.apache.geronimo.specs:geronimo-annotation:1.0@jar"
}
useTestFixtures()
\ Manca newline alla fine del file
diff -Nru gradle-1.3/subprojects/maven/maven.gradle gradle-1.3-gil/subprojects/maven/maven.gradle
--- gradle-1.3/subprojects/maven/maven.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/maven/maven.gradle 2012-12-13 07:34:16.458638642 +0100
@@ -23,9 +23,9 @@
compile libraries.slf4j_api
compile libraries.maven_ant_tasks
- compile "org.sonatype.pmaven:pmaven-common:0.8-20100325@jar"
- compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325@jar"
- compile "org.codehaus.plexus:plexus-component-annotations:1.5.2@jar"
+ compile "org.sonatype.pmaven:polyglot-maven/pmaven-common:0.8-20100325@jar"
+ compile "org.sonatype.pmaven:polyglot-maven/pmaven-groovy:0.8-20100325@jar"
+ compile "org.codehaus.plexus:plexus/containers-component-annotations:1.5.2@jar"
}
useTestFixtures()
diff -Nru gradle-1.3/subprojects/osgi/osgi.gradle gradle-1.3-gil/subprojects/osgi/osgi.gradle
--- gradle-1.3/subprojects/osgi/osgi.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/osgi/osgi.gradle 2012-12-13 07:34:58.934035353 +0100
@@ -21,7 +21,7 @@
compile project(':plugins')
compile libraries.slf4j_api
- compile module('biz.aQute:bndlib:1.50.0')
+ compile module('biz.aQute:aqute-bnd:1.50.0')
}
useTestFixtures()
diff -Nru gradle-1.3/subprojects/signing/signing.gradle gradle-1.3-gil/subprojects/signing/signing.gradle
--- gradle-1.3/subprojects/signing/signing.gradle 2012-11-20 12:38:10.000000000 +0100
+++ gradle-1.3-gil/subprojects/signing/signing.gradle 2012-12-13 07:38:52.503702101 +0100
@@ -21,8 +21,8 @@
compile project(":plugins")
compile project(":maven")
- compile module("org.bouncycastle:bcpg-jdk15:1.46") {
- dependency "org.bouncycastle:bcprov-jdk15:1.46@jar"
+ compile module("org.bouncycastle:bcpg:1.46") {
+ dependency "org.bouncycastle:bcprov:1.46@jar"
}
}