This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle-1.12.
commit c50acb21049ee03c7f591cfaaa08382e39badb1d Author: Kai-Chung Yan <[email protected]> Date: Sun Jun 14 16:23:22 2015 +0800 Make all dependencies versionless in build scripts --- debian/changelog | 6 - debian/gradle.links | 3 +- debian/patches/30_envjs.diff | 2 +- debian/patches/34_disable_code_quality.diff | 2 +- debian/patches/bintray_dependencies.diff | 10 +- debian/patches/disable_buildSrc_tests.diff | 2 +- debian/patches/disable_distributions.diff | 4 +- debian/patches/disable_tests.diff | 2 +- debian/patches/do_not_use_bcpg_jdk5.diff | 13 -- debian/patches/do_not_use_jdk5_guava.diff | 40 ----- debian/patches/docs.diff | 3 +- debian/patches/jetty.diff | 19 +-- debian/patches/remove_test_dependencies.diff | 2 +- debian/patches/rhino_rename.diff | 15 -- debian/patches/series | 4 - debian/patches/use_local_artifacts.diff | 233 +++++++++++++++++++++------ 16 files changed, 200 insertions(+), 160 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1bcacc7..9f8fde2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,23 +19,17 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low - 31_hamcrest_12.diff: This patch is for tests codes, hence not needed - 90_respect_user_java_home.diff: No longer needed in Gradle 1.12 * Multiple new patches under debian/patches/ - - asm5_version.diff: Fix ASM version mismatch - bintray-api.diff: Update the usage of bintray APIs 0.8.1 - bintray-dependencies.diff: bintray libraries are renamed in 0.8.1 - - build_comparison.diff: - build_init.diff: build-init.gradle uses APIs higher than Gradle 1.5 - disable_buildSrc_tests.diff: Disable buildSrc tests - disable_distributions.diff: Disable the tasks to generate a Zip file - disable_docs.diff: Temporarily disable Gradle documentations - disable_sonar.diff: Updated version of 02_sonar.diff - disable_tests.diff: Extended version of 32_disable_it.diff - - do_not_use_bcpg_jdk5.diff: BouncyCastle libraries do not ship jdk5 variety - - do_not_use_jdk5_guava.diff: Guava does not ship jdk5 variety - fix_DocGenerationException.diff: - jetty.diff: Replace some Jetty libraries with existing ones - - rhino_rename.diff: Correct the name of rhino library - remove_test_depedencies.diff: Remove dependencies for building tests - - servlet_api.diff: Use libservlet2.5-java - use_local_artifacts.diff: Updated version of 01_use_debian_jars.diff -- Kai-Chung Yan <[email protected]> Thu, 21 May 2015 16:02:50 +0800 diff --git a/debian/gradle.links b/debian/gradle.links index 0fe5af7..e3a9ac3 100644 --- a/debian/gradle.links +++ b/debian/gradle.links @@ -1 +1,2 @@ -/usr/share/gradle/bin/gradle /usr/bin/gradle \ No newline at end of file +/usr/share/gradle/bin/gradle /usr/bin/gradle +/usr/share/java/gradle-launcher.jar /usr/share/gradle/lib/gradle-launcher-1.12.jar \ No newline at end of file diff --git a/debian/patches/30_envjs.diff b/debian/patches/30_envjs.diff index b7e2bd4..0968f7a 100644 --- a/debian/patches/30_envjs.diff +++ b/debian/patches/30_envjs.diff @@ -9,7 +9,7 @@ Last-Update: 2012-08-18 +++ b/subprojects/javascript/javascript.gradle @@ -19,7 +19,6 @@ - compile "org.mozilla:rhino:1.7R3" + compile "rhino:js" compile libraries.gson // used by JsHint - compile "org.simpleframework:simple:4.1.21" // used by http package in envjs compile project(':core'), project(":plugins") diff --git a/debian/patches/34_disable_code_quality.diff b/debian/patches/34_disable_code_quality.diff index ed1c88f..285673b 100644 --- a/debian/patches/34_disable_code_quality.diff +++ b/debian/patches/34_disable_code_quality.diff @@ -19,7 +19,7 @@ Forwarded: not-needed apply plugin: 'idea' apply plugin: 'eclipse' -@@ -42,5 +42,5 @@ +@@ -41,5 +41,5 @@ compile "org.gradle.jarjar:jarjar:1.2.1" } apply from: '../gradle/compile.gradle' diff --git a/debian/patches/bintray_dependencies.diff b/debian/patches/bintray_dependencies.diff index 300aed4..014e314 100644 --- a/debian/patches/bintray_dependencies.diff +++ b/debian/patches/bintray_dependencies.diff @@ -6,11 +6,11 @@ Last-Update: 2015-06-08 --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -48,7 +48,7 @@ - + runtime project(":docs") - + - compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') { -+ compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-service', version: '[0.8.1, )') { ++ compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-service') { exclude module:'groovy-all' exclude module:'groovy' exclude group: 'org.slf4j' @@ -18,7 +18,7 @@ Last-Update: 2015-06-08 exclude module: 'httpclient' exclude module: 'nekohtml' } -+ compile "com.jfrog.bintray.client:bintray-client-java-api:[0.8.1, )" ++ compile "com.jfrog.bintray.client:bintray-client-java-api" compile libraries.commons_httpclient // Needed by bintray client - + runtime libraries.log4j_to_slf4j diff --git a/debian/patches/disable_buildSrc_tests.diff b/debian/patches/disable_buildSrc_tests.diff index 5cfc2c6..c2bdabc 100644 --- a/debian/patches/disable_buildSrc_tests.diff +++ b/debian/patches/disable_buildSrc_tests.diff @@ -4,7 +4,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-06-03 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -44,3 +44,15 @@ +@@ -43,3 +43,15 @@ apply from: '../gradle/compile.gradle' //apply from: '../gradle/codeQuality.gradle' apply from: '../gradle/classycle.gradle' diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff index 9369c62..a136e4a 100644 --- a/debian/patches/disable_distributions.diff +++ b/debian/patches/disable_distributions.diff @@ -11,7 +11,7 @@ include 'core' --- a/build.gradle +++ b/build.gradle -@@ -186,8 +186,9 @@ +@@ -185,8 +185,9 @@ projects = subprojects } @@ -22,7 +22,7 @@ task install(type: Install) { description = 'Installs the minimal distribution into directory $gradle_installPath' group = 'build' -@@ -201,6 +202,6 @@ +@@ -200,6 +201,6 @@ with project(":distributions").allDistImage installDirPropertyName = 'gradle_installPath' } diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index 7152090..9abb26a 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -12,7 +12,7 @@ Last-Update: 2015-05-28 allprojects { group = 'org.gradle' -@@ -202,6 +200,4 @@ +@@ -201,6 +199,4 @@ with project(":distributions").allDistImage installDirPropertyName = 'gradle_installPath' } diff --git a/debian/patches/do_not_use_bcpg_jdk5.diff b/debian/patches/do_not_use_bcpg_jdk5.diff deleted file mode 100644 index 5c792ef..0000000 --- a/debian/patches/do_not_use_bcpg_jdk5.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- a/subprojects/signing/signing.gradle -+++ b/subprojects/signing/signing.gradle -@@ -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" - } - } - diff --git a/debian/patches/do_not_use_jdk5_guava.diff b/debian/patches/do_not_use_jdk5_guava.diff deleted file mode 100644 index f9339a7..0000000 --- a/debian/patches/do_not_use_jdk5_guava.diff +++ /dev/null @@ -1,40 +0,0 @@ ---- a/buildSrc/build.gradle -+++ b/buildSrc/build.gradle -@@ -27,7 +27,7 @@ - - dependencies { - compile gradleApi() -- compile 'com.google.guava:guava-jdk5:14.0.1@jar' -+ compile 'com.google.guava:guava:14.0.1@jar' - compile 'commons-lang:commons-lang:2.6@jar' - compile localGroovy() - testCompile 'junit:junit:4.11@jar' ---- a/gradle/dependencies.gradle -+++ b/gradle/dependencies.gradle -@@ -79,7 +79,7 @@ - ant_antlr: 'org.apache.ant:ant-antlr:1.9.3@jar', - antlr: 'antlr:antlr:2.7.7@jar', - dom4j: 'dom4j:dom4j:1.6.1@jar', -- guava: 'com.google.guava:guava-jdk5:14.0.1@jar', -+ guava: 'com.google.guava:guava:14.0.1@jar', - jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar', - groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar', - jaxen: 'jaxen:jaxen:1.1@jar', -@@ -149,4 +149,4 @@ - libraries.objenesis, - 'cglib:cglib-nodep:2.2' - ] --libraries.gson = "com.google.code.gson:gson:2.2.4" -\ No newline at end of file -+libraries.gson = "com.google.code.gson:gson:2.2.4" ---- 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 -@@ -66,7 +66,7 @@ - classpath = classpath.plus(moduleRegistry.getExternalModule("logback-classic").getClasspath()); - classpath = classpath.plus(moduleRegistry.getExternalModule("logback-core").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")) { diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff index 00f5253..2fe8e12 100644 --- a/debian/patches/docs.diff +++ b/debian/patches/docs.diff @@ -31,8 +31,9 @@ Last-Update: 2015-06-11 +} + dependencies { - userGuideTask 'xalan:xalan:2.7.1', libraries.xerces +- userGuideTask 'xalan:xalan:2.7.1', libraries.xerces - userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') { ++ userGuideTask 'xalan:xalan2', libraries.xerces + userGuideTask module('xhtmlrenderer:core-renderer:R8rc1') { dependency 'itext:itext:2.0.8@jar' } diff --git a/debian/patches/jetty.diff b/debian/patches/jetty.diff index 2e760de..01a377e 100644 --- a/debian/patches/jetty.diff +++ b/debian/patches/jetty.diff @@ -1,28 +1,17 @@ Description: Some Jetty jars referred by Gradle actually belong to other packages like libservlet2.5-java and libtomcat7-java Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-06-09 ---- a/gradle/dependencies.gradle -+++ b/gradle/dependencies.gradle -@@ -55,7 +55,7 @@ - } - - // Jetty --libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar" -+libraries.servlet_api = "javax.servlet:servlet-api:[2.5, 3.0)" - libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { - dependency libraries.slf4j_api - dependency libraries.servlet_api +Last-Update: 2015-06-14 --- a/subprojects/jetty/jetty.gradle +++ b/subprojects/jetty/jetty.gradle @@ -30,8 +30,8 @@ } } - + - runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") { - dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14@jar" -+ runtime module("org.apache.tomcat:tomcat-jasper:[7.0.56, )") { -+ dependency "javax.servlet.jsp:jsp-api:[2.1, )" ++ runtime module("org.apache.tomcat:tomcat-jasper") { ++ dependency "javax.servlet.jsp:jsp-api-2.1" dependency libraries.jetty_util dependency libraries.servlet_api } diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff index ce0a8db..0bc34b2 100644 --- a/debian/patches/remove_test_dependencies.diff +++ b/debian/patches/remove_test_dependencies.diff @@ -116,7 +116,7 @@ Last-Update: 2015-05-28 --- a/subprojects/reporting/reporting.gradle +++ b/subprojects/reporting/reporting.gradle @@ -4,8 +4,8 @@ - compile 'com.googlecode.jatl:jatl:0.2.2' + compile 'com.googlecode.jatl:jatl' testCompile libraries.jsoup - integTestRuntime project(':codeQuality') diff --git a/debian/patches/rhino_rename.diff b/debian/patches/rhino_rename.diff deleted file mode 100644 index 3c86c38..0000000 --- a/debian/patches/rhino_rename.diff +++ /dev/null @@ -1,15 +0,0 @@ -Description: Rename rhino.jar to js.jar because in Debian the Group ID and - Artifact ID are different to the upstream, which is strange. -Author: Kai-Chung <[email protected]> -Last-Update: 2015-06-03 ---- a/subprojects/javascript/javascript.gradle -+++ b/subprojects/javascript/javascript.gradle -@@ -17,7 +17,7 @@ - dependencies { - compile libraries.groovy - -- compile "org.mozilla:rhino:1.7R3" -+ compile "rhino:js:[1.7R3, )" - compile libraries.gson // used by JsHint - compile project(':core'), project(":plugins") - compile libraries.inject diff --git a/debian/patches/series b/debian/patches/series index 60f212a..74f7861 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1,6 @@ use_local_artifacts.diff 34_disable_code_quality.diff disable_buildSrc_tests.diff -do_not_use_jdk5_guava.diff -asm5_version.diff fix_DocGenerationException.diff 03_plexus.diff 11_fix_jni_path.diff @@ -18,9 +16,7 @@ disable_distributions.diff disable_tests.diff remove_test_dependencies.diff bintray_dependencies.diff -rhino_rename.diff jetty.diff -do_not_use_bcpg_jdk5.diff bintray_api.diff docs.diff disable_sonar.diff diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index fcc1e26..8ee41f5 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -1,15 +1,21 @@ -Description: Use Local Jars +Description: Use local jar files to build Gradle. The core point is using + "flatDir" as the only artifacts repository and make all + dependencies versionless by removing the version number of some + of the dependency declarations. Typically packaging Java + projects built with Gradle does not need to remove the version + of dependencies, but Gradle itself is a special case because + it dynamically loads Java libraries using the jar filename, + ignoring /usr/share/java/. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-05-24 +Last-Update: 2015-06-14 --- a/build.gradle +++ b/build.gradle -@@ -115,7 +115,8 @@ +@@ -115,7 +115,7 @@ group = 'org.gradle' repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } + flatDir { dirs "/usr/share/java/" } -+ maven { url "file:///usr/share/maven-repo" } } } @@ -39,43 +45,93 @@ Last-Update: 2015-05-24 userGuideStyleSheets --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -21,8 +21,8 @@ +@@ -21,13 +21,12 @@ apply plugin: 'eclipse' repositories { - maven { url 'http://repo.gradle.org/gradle/libs' } - mavenCentral() + flatDir { dirs "/usr/share/java" } -+ maven { url "file:///usr/share/maven-repo" } } dependencies { -@@ -36,6 +36,11 @@ - compile "org.pegdown:pegdown:1.1.0" - compile "org.jsoup:jsoup:1.6.3" - -+ // Needed by pegdown -+ compile "org.parboiled:parboiled-core:[1, )" -+ compile "org.parboiled:parboiled-java:[1, )" -+ compile "org.ow2.asm:asm-all:[5, )" -+ - //below dependency was deployed to the repo.gradle.org - //it's built from sources at: https://github.com/szczepiq/jarjar - //if code changes are needed in this library we need to figure out a better way of distributing them. + compile gradleApi() +- compile 'com.google.guava:guava-jdk5:14.0.1@jar' ++ compile 'com.google.guava:guava@jar' + compile 'commons-lang:commons-lang:2.6@jar' + compile localGroovy() + testCompile 'junit:junit:4.11@jar' --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -85,19 +85,19 @@ +@@ -25,16 +25,16 @@ + dependency 'org.apache.ant:ant-launcher:1.9.3@jar' + } + +-libraries.asm = 'org.ow2.asm:asm-all:5.0_BETA@jar' +-libraries.commons_cli = 'commons-cli:commons-cli:1.2@jar' ++libraries.asm = 'org.ow2.asm:asm4-all@jar' ++libraries.commons_cli = 'commons-cli:commons-cli@jar' + libraries.commons_io = dependencies.module(versions.commons_io) +-libraries.commons_lang = 'commons-lang:commons-lang:2.6@jar' +-libraries.commons_collections = 'commons-collections:commons-collections:3.2.1@jar' ++libraries.commons_lang = 'commons-lang:commons-lang@jar' ++libraries.commons_collections = 'commons-collections:commons-collections3@jar' + libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){ +- dependency "com.jcraft:jsch:0.1.51" ++ dependency "com.jcraft:jsch" + } + 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-jsr330-api') + + // Logging + libraries.slf4j_api = dependencies.module('org.slf4j:slf4j-api:1.7.5') +@@ -54,7 +54,7 @@ + } + + // Jetty +-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar" ++libraries.servlet_api = "org.mortbay.jetty:servlet-api-2.5@jar" + libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { + dependency libraries.slf4j_api + dependency libraries.servlet_api +@@ -68,36 +68,36 @@ + dependency "org.apache.httpcomponents:httpcore:4.2.2@jar" + dependency libraries.jcl_to_slf4j + dependency "commons-codec:commons-codec:1.6@jar" +- dependency "org.samba.jcifs:jcifs:1.3.17@jar" ++ dependency "org.samba.jcifs:jcifs@jar" + } + +-libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks:2.1.3") { ++libraries.maven_ant_tasks = dependencies.module("org.apache.maven:maven-ant-tasks") { + libraries.ant + } + + libraries += [ + ant_antlr: 'org.apache.ant:ant-antlr:1.9.3@jar', +- antlr: 'antlr:antlr:2.7.7@jar', +- dom4j: 'dom4j:dom4j:1.6.1@jar', +- guava: 'com.google.guava:guava-jdk5:14.0.1@jar', ++ antlr: 'antlr:antlr@jar', ++ dom4j: 'dom4j:dom4j@jar', ++ guava: 'com.google.guava:guava@jar', + jsr305: 'com.google.code.findbugs:jsr305:1.3.9@jar', +- groovy: 'org.codehaus.groovy:groovy-all:1.8.6@jar', ++ groovy: 'org.codehaus.groovy:groovy-all@jar', jaxen: 'jaxen:jaxen:1.1@jar', - jcip: "net.jcip:jcip-annotations:1.0@jar", +- jcip: "net.jcip:jcip-annotations:1.0@jar", ++ jcip: "net.jcip:jcip-annotations@jar", jna: 'net.java.dev.jna:jna:3.2.7@jar', - junit: 'junit:junit:4.11@jar', -+ junit: 'junit:junit:[4.11, )@jar', ++ junit: 'junit:junit4', 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 - nativePlatform: 'net.rubygrapefruit:native-platform:0.10', +- nativePlatform: 'net.rubygrapefruit:native-platform:0.10', - xerces: "xerces:xercesImpl:2.9.1", -+ xerces: ["xerces:xercesImpl:[2.9.1, )", "xerces:xmlParserAPIs:[2.6.2, )"], ++ nativePlatform: 'net.rubygrapefruit:native-platform', ++ xerces: ["xerces:xercesImpl", "xerces:xmlParserAPIs"], objenesis: 'org.objenesis:objenesis:1.2@jar', jsoup:'org.jsoup:jsoup:1.6.3' ] @@ -83,22 +139,22 @@ Last-Update: 2015-05-24 -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-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:maven3-core") { ++ dependency "org.apache.maven:maven3-settings@jar" ++ dependency "org.apache.maven:maven3-settings-builder@jar" //plexus: dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" -@@ -111,20 +111,20 @@ +@@ -111,27 +111,27 @@ dependency "org.sonatype.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-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:maven3-core@jar" ++ dependency "org.apache.maven:maven3-model-builder@jar" ++ dependency "org.apache.maven:maven3-model@jar" //somewhat core: - dependency "org.apache.maven:maven-artifact:3.0.4@jar" @@ -106,11 +162,11 @@ Last-Update: 2015-05-24 - 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: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:maven3-artifact@jar" ++ dependency "org.apache.maven:maven3-compat@jar" ++ dependency "org.apache.maven:maven3-repository-metadata@jar" ++ dependency "org.apache.maven:maven3-plugin-api@jar" ++ dependency "org.apache.maven:maven3-aether-provider@jar" dependency 'org.apache.maven.wagon:wagon-http:2.4@jar' dependency 'org.apache.maven.wagon:wagon-provider-api:2.4@jar' @@ -118,22 +174,27 @@ Last-Update: 2015-05-24 + dependency 'org.apache.maven.wagon:wagon-http-shared:2.4@jar' //eather: - dependency "org.sonatype.aether:aether-api:1.13.1@jar" -@@ -141,11 +141,11 @@ - 'cglib:cglib-nodep:2.2.2' - ] - libraries.jmock = [ -- 'org.jmock:jmock:2.5.1', -+ 'jmock:jmock:[2.5.1, )', - 'org.hamcrest:hamcrest-core:1.3', - 'org.hamcrest:hamcrest-library:1.3', -- 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', -+ dependencies.create('jmock:jmock-junit4:[2.5.1, )') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types. -+ 'jmock:jmock-legacy:[2.5.1, )', +- 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-connector-wagon:1.13.1@jar' ++ dependency "org.sonatype.aether:aether-api@jar" ++ dependency "org.sonatype.aether:aether-impl@jar" ++ dependency "org.sonatype.aether:aether-spi@jar" ++ dependency "org.sonatype.aether:aether-util@jar" ++ dependency 'org.sonatype.aether:aether-connector-wagon@jar' + } + + libraries.spock = [ +@@ -149,4 +149,4 @@ libraries.objenesis, 'cglib:cglib-nodep:2.2' ] +-libraries.gson = "com.google.code.gson:gson:2.2.4" +\ No newline at end of file ++libraries.gson = "com.google.code.gson:gson" +\ No newline at end of file --- a/subprojects/core-impl/core-impl.gradle +++ b/subprojects/core-impl/core-impl.gradle @@ -16,6 +16,7 @@ @@ -173,14 +234,80 @@ Last-Update: 2015-05-24 \ No newline at end of file --- a/subprojects/code-quality/code-quality.gradle +++ b/subprojects/code-quality/code-quality.gradle -@@ -26,8 +26,8 @@ - +@@ -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:findbugs:2.0.1@jar" - provided "com.google.code.findbugs:bcel:2.0.1@jar" -+ provided "com.google.code.findbugs:findbugs" -+ provided "org.apache.bcel:findbugs-bcel:[2.0.1, )@jar" ++ provided "org.apache.bcel:findbugs-bcel@jar" provided "dom4j:dom4j:1.6.1@jar" provided "jaxen:jaxen:1.1.1@jar" } +--- 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 +@@ -66,7 +66,7 @@ + classpath = classpath.plus(moduleRegistry.getExternalModule("logback-classic").getClasspath()); + classpath = classpath.plus(moduleRegistry.getExternalModule("logback-core").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/signing/signing.gradle ++++ b/subprojects/signing/signing.gradle +@@ -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") { ++ dependency "org.bouncycastle:bcprov@jar" + } + } + +--- a/subprojects/javascript/javascript.gradle ++++ b/subprojects/javascript/javascript.gradle +@@ -17,7 +17,7 @@ + dependencies { + compile libraries.groovy + +- compile "org.mozilla:rhino:1.7R3" ++ compile "rhino:js" + compile libraries.gson // used by JsHint + compile "org.simpleframework:simple:4.1.21" // used by http package in envjs + compile project(':core'), project(":plugins") +--- a/subprojects/messaging/messaging.gradle ++++ b/subprojects/messaging/messaging.gradle +@@ -2,7 +2,7 @@ + publishCompile project(':baseServices') + publishCompile libraries.slf4j_api + publishCompile libraries.guava +- publishCompile 'com.esotericsoftware.kryo:kryo:2.20' ++ publishCompile 'com.esotericsoftware.kryo:kryo' + testCompile libraries.groovy + } + +--- a/subprojects/osgi/osgi.gradle ++++ b/subprojects/osgi/osgi.gradle +@@ -21,7 +21,7 @@ + compile project(':plugins') + compile libraries.slf4j_api + +- compile module('biz.aQute.bnd:bndlib:2.1.0') ++ compile module('biz.aQute.bnd:bndlib') + } + + useTestFixtures() +--- a/subprojects/reporting/reporting.gradle ++++ b/subprojects/reporting/reporting.gradle +@@ -1,7 +1,7 @@ + dependencies { + compile libraries.groovy + compile project(':core') +- compile 'com.googlecode.jatl:jatl:0.2.2' ++ compile 'com.googlecode.jatl:jatl' + + testCompile libraries.jsoup + integTestRuntime project(':codeQuality') -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle-1.12.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
