This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit 4ddd51c77f0657827d73476ae4b5c7a5d5f29c9e Author: Kai-Chung Yan <[email protected]> Date: Wed Jul 8 18:27:58 2015 +0800 Refresh patches for Gradle 2.5 --- debian/changelog | 23 ++- debian/patches/disable_aws.diff | 2 +- debian/patches/disable_distributions.diff | 7 +- debian/patches/disable_release_notes.diff | 4 +- debian/patches/disable_sonar.diff | 4 +- debian/patches/disable_tests.diff | 331 ++++++++++++++++++++++++++++-- debian/patches/nekohtml.diff | 2 +- debian/patches/relax_warnings.diff | 3 +- debian/patches/series | 1 - debian/patches/use_local_artifacts.diff | 45 ++-- 10 files changed, 352 insertions(+), 70 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4226cee..98deb1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,17 +10,18 @@ gradle (2.5-1) UNRELEASED; urgency=low * d/rules: Simplify get-orig-source target * Refresh all existing patches * Drop multiple patches under d/patches/: - - 03_plexus.diff - - 11_fix_jni_path.diff - - 35_ivy_23.diff - - 36_java8_compatibility.diff - - 37_replace_internal_testng_api.diff - - 38_use_jdk7_nio_file_api.diff - - 39_ignore_test_processor_assertion.diff - - bintray_api.diff - - bintray_dependencies.diff - - diagnostics_jquery.diff - - disable_css3pie.diff + - 03_plexus.diff: Files not exist + - 11_fix_jni_path.diff: Files not exist + - 35_ivy_23.diff: Files not exist + - 36_java8_compatibility.diff: Files not exist + - 37_replace_internal_testng_api.diff: Files not exist + - 38_use_jdk7_nio_file_api.diff: Files not exist + - 39_ignore_test_processor_assertion.diff: Files not exist + - bintray_api.diff: No longer use bintray + - bintray_dependencies.diff: No longer use bintray + - diagnostics_jquery.diff: Minified .js not exist + - disable_css3pie.diff: No longer use css3pie + - remove_test_dependencies.diff: Integrated into disable_tests.diff * Multiple new patches under debian/patches/: - disable_aws.diff: AWS SDK for Java is not in Debian - taskOrdering.diff: shouldRunAfter() is not in Gradle 1.5 diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff index e186ca8..72a4fe4 100644 --- a/debian/patches/disable_aws.diff +++ b/debian/patches/disable_aws.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-07 --- a/build.gradle +++ b/build.gradle -@@ -94,7 +94,7 @@ +@@ -98,7 +98,7 @@ 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase', 'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala', 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingNative', diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff index 8a129a2..d7d34a1 100644 --- a/debian/patches/disable_distributions.diff +++ b/debian/patches/disable_distributions.diff @@ -1,7 +1,7 @@ Description: Subproject :distribution is for generating tarballs for distributing Gradle hence not needed. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-03 +Last-Update: 2015-07-08 --- a/settings.gradle +++ b/settings.gradle @@ -13,7 +13,7 @@ @@ -15,10 +15,10 @@ Last-Update: 2015-07-03 include 'core' --- a/build.gradle +++ b/build.gradle -@@ -197,21 +197,4 @@ +@@ -202,21 +202,4 @@ } } - + -evaluationDependsOn ":distributions" - -task install(type: Install) { @@ -37,4 +37,3 @@ Last-Update: 2015-07-03 - - apply from: "gradle/intTestImage.gradle" -\ No newline at end of file diff --git a/debian/patches/disable_release_notes.diff b/debian/patches/disable_release_notes.diff index f61980e..01711fe 100644 --- a/debian/patches/disable_release_notes.diff +++ b/debian/patches/disable_release_notes.diff @@ -13,7 +13,7 @@ Last-Update: 2015-07-02 } tasks.withType(Docbook2Xhtml) { -@@ -390,31 +390,6 @@ +@@ -391,31 +391,6 @@ group = 'documentation' } @@ -45,7 +45,7 @@ Last-Update: 2015-07-02 tasks.addRule("view«Doc Task Name» - Opens entry point") { String taskName -> if (taskName.startsWith("view")) { def realTaskName = (taskName - "view") -@@ -433,15 +408,8 @@ +@@ -434,15 +409,8 @@ sourceSets.main.output.dir generatedResourcesDir, builtBy: defaultImports diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff index 01a95c0..ad51e58 100644 --- a/debian/patches/disable_sonar.diff +++ b/debian/patches/disable_sonar.diff @@ -6,7 +6,7 @@ Last-Update: 2015-07-02 --- a/build.gradle +++ b/build.gradle -@@ -90,7 +90,7 @@ +@@ -94,7 +94,7 @@ publicGroovyProjects = groovyProjects - internalProjects pluginProjects = [ 'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', @@ -41,7 +41,7 @@ Last-Update: 2015-07-02 +</chapter> --- a/subprojects/docs/src/docs/userguide/userguide.xml +++ b/subprojects/docs/src/docs/userguide/userguide.xml -@@ -60,8 +60,6 @@ +@@ -61,8 +61,6 @@ <xi:include href='jdependPlugin.xml'/> <xi:include href='pmdPlugin.xml'/> <xi:include href='jacocoPlugin.xml'/> diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index e8a84ca..b2fc49a 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-02 --- a/build.gradle +++ b/build.gradle -@@ -120,8 +120,6 @@ +@@ -124,8 +124,6 @@ apply from: "gradle/classycle.gradle" apply from: "gradle/strictCompile.gradle" apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle" @@ -12,14 +12,13 @@ Last-Update: 2015-07-02 apply from: "gradle/taskOrdering.gradle" apply from: "gradle/fix-GRADLE-2492.gradle" -@@ -195,6 +193,4 @@ +@@ -200,6 +198,4 @@ sleep mins * 60 * 1000 } } -} - -apply from: "gradle/intTestImage.gradle" -\ No newline at end of file +} \ No newline at end of file --- a/gradle/groovyProject.gradle @@ -63,7 +62,29 @@ Last-Update: 2015-07-02 ext { --- a/subprojects/launcher/launcher.gradle +++ b/subprojects/launcher/launcher.gradle -@@ -77,11 +77,4 @@ +@@ -14,21 +14,12 @@ + + testCompile libraries.groovy + +- integTestCompile project(':internalIntegTesting') +- integTestRuntime project(':plugins') +- + startScriptGenerator project(':plugins') + } + + useTestFixtures() + useTestFixtures(project: ':languageJava') + +-integTestTasks.all { +- if (isCiServer) { +- maxParallelForks = Math.min(3, rootProject.maxParallelForks) +- } +-} +- + jar { + manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain") + doFirst { +@@ -77,11 +68,4 @@ } } @@ -75,12 +96,24 @@ Last-Update: 2015-07-02 -} - useClassycle() -\ No newline at end of file --- a/subprojects/tooling-api/tooling-api.gradle +++ b/subprojects/tooling-api/tooling-api.gradle -@@ -23,18 +23,6 @@ +@@ -10,31 +10,10 @@ + + testFixturesCompile project(':baseServicesGroovy') + testCompile libraries.groovy +- +- // lots of integTest errors otherwise +- integTestCompile project(':internalIntegTesting') +- integTestRuntime project(':ide') +- integTestRuntime project(':buildInit') +- integTestRuntime project(':buildComparison') +- integTestRuntime project(":ivy") +- integTestRuntime project(":maven") +- integTestRuntime project(":toolingApiBuilders") + } + useTestFixtures() - useTestFixtures(project: ':launcher', sourceSet: "integTest") -integTestTasks.all { - dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip') @@ -99,22 +132,33 @@ Last-Update: 2015-07-02 dependsOn jar --- a/subprojects/wrapper/wrapper.gradle +++ b/subprojects/wrapper/wrapper.gradle -@@ -35,9 +35,11 @@ - from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output } +@@ -18,8 +18,6 @@ + + testCompile libraries.groovy + testCompile libraries.ant +- +- integTestRuntime rootProject.configurations.testRuntime.allDependencies } -+/* - integTestTasks.all { - inputs.files { project(":distributions").binZip } + task buildReceiptResource(type: Copy, dependsOn: rootProject.createBuildReceipt) { +@@ -35,9 +33,5 @@ + from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output } } -+*/ +-integTestTasks.all { +- inputs.files { project(":distributions").binZip } +-} +- useTestFixtures() useClassycle() --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle -@@ -28,8 +28,4 @@ - integTestRuntime project(":ide") +@@ -24,12 +24,6 @@ + + + testCompile libraries.slf4j_api +- +- integTestRuntime project(":ide") } -useTestFixtures(project: ":plugins") // includes core test fixtures @@ -141,3 +185,260 @@ Last-Update: 2015-07-02 include 'javascript' include 'buildComparison' include 'reporting' +--- a/subprojects/announce/announce.gradle ++++ b/subprojects/announce/announce.gradle +@@ -17,7 +17,6 @@ + compile libraries.groovy + compile libraries.slf4j_api + compile project(':core') +- integTestRuntime project(':plugins') + } + + useTestFixtures() +--- a/subprojects/build-init/build-init.gradle ++++ b/subprojects/build-init/build-init.gradle +@@ -18,8 +18,6 @@ + compile project(':core') + compile project(':plugins') + compile project(':wrapper') +- integTestRuntime project(':maven') +- integTestRuntime project(':scala') + } + + task generateTemplateVersionFile(type: GenerateVersionProperties) { +--- a/subprojects/core/core.gradle ++++ b/subprojects/core/core.gradle +@@ -56,16 +56,6 @@ + + testRuntime libraries.xerces + testRuntime project(":diagnostics") +- +- testFixturesCompile project(":internalTesting") +- testFixturesCompile libraries.ivy +- +- testFixturesRuntime project(':dependencyManagement') +- testFixturesRuntime project(':pluginUse') +- +- integTestCompile project(":internalIntegTesting") +- +- integTestRuntime project(":plugins") + } + + useTestFixtures() +--- a/subprojects/ivy/ivy.gradle ++++ b/subprojects/ivy/ivy.gradle +@@ -23,10 +23,6 @@ + compile project(':dependencyManagement') + + testCompile libraries.groovy +- integTestCompile project(":ear") +- integTestRuntime project(":resourcesS3") +- integTestRuntime project(":resourcesSftp") +- testFixturesCompile project(":internalIntegTesting") + } + + useTestFixtures() +--- a/subprojects/maven/maven.gradle ++++ b/subprojects/maven/maven.gradle +@@ -29,12 +29,6 @@ + compile "org.codehaus.plexus:plexus-component-annotations:1.5.2@jar" + + testCompile libraries.xmlunit +- +- integTestCompile project(":ear") +- integTestRuntime project(":resourcesS3") +- integTestRuntime project(":resourcesSftp") +- +- testFixturesCompile project(":internalIntegTesting") + } + + useTestFixtures() +--- a/subprojects/open-api/open-api.gradle ++++ b/subprojects/open-api/open-api.gradle +@@ -1,7 +1 @@ +-dependencies { +- integTestCompile libraries.groovy +- integTestCompile libraries.slf4j_api +- integTestCompile libraries.commons_lang +-} +- + useTestFixtures() +--- a/subprojects/publish/publish.gradle ++++ b/subprojects/publish/publish.gradle +@@ -19,9 +19,6 @@ + compile project(':dependencyManagement') + + testCompile libraries.groovy +- +- integTestRuntime project(":ivy") +- integTestRuntime project(":maven") + } + + useTestFixtures() +--- a/subprojects/reporting/reporting.gradle ++++ b/subprojects/reporting/reporting.gradle +@@ -14,8 +14,6 @@ + compile 'com.googlecode.jatl:jatl' + + testCompile libraries.jsoup +- integTestRuntime project(':codeQuality') +- integTestRuntime project(':jacoco') + + reports "jquery:jquery.min:1.11.0@js" + } +--- a/subprojects/dependency-management/dependency-management.gradle ++++ b/subprojects/dependency-management/dependency-management.gradle +@@ -18,16 +18,6 @@ + compile libraries.maven3 + + testCompile libraries.groovy +- +- integTestRuntime project(":ivy") +- integTestRuntime project(":maven") +- integTestRuntime project(":resourcesHttp") +- integTestRuntime project(":resourcesS3") +- integTestRuntime project(":resourcesSftp") +- //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk +- //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar" +- +- testFixturesCompile project(":internalIntegTesting") + } + + if (isWindows && javaVersion.java5) { +--- a/subprojects/diagnostics/diagnostics.gradle ++++ b/subprojects/diagnostics/diagnostics.gradle +@@ -20,10 +20,6 @@ + compile project(':reporting') + compile project(':platformBase') + compile project(':dependencyManagement') +- +- integTestRuntime project(':plugins') +- integTestRuntime project(':platformNative') +- integTestRuntime project(':languageNative') + } + + useTestFixtures() +--- a/subprojects/model-core/model-core.gradle ++++ b/subprojects/model-core/model-core.gradle +@@ -30,12 +30,6 @@ + compile libraries.asm + + testCompile libraries.groovy +- +- integTestCompile project(":core") +- integTestRuntime project(':plugins') +- +- testFixturesCompile project(":internalTesting") +- testFixturesCompile project(":core") + } + + useTestFixtures() +--- a/subprojects/platform-native/platform-native.gradle ++++ b/subprojects/platform-native/platform-native.gradle +@@ -20,12 +20,6 @@ + compile project(':core') + compile project(":platformBase") + compile project(":diagnostics") +- +- integTestRuntime project(":maven") +- // Required to test visual studio project file generation for generated sources +- integTestRuntime project(":ideNative") +- +- testFixturesCompile project(":internalIntegTesting") + } + + useTestFixtures() +--- a/subprojects/platform-jvm/platform-jvm.gradle ++++ b/subprojects/platform-jvm/platform-jvm.gradle +@@ -4,10 +4,6 @@ + compile project(":diagnostics") + + testCompile libraries.groovy +- +- // To pick up JavaToolChainInternal implementation +- // TODO - get rid of cycle +- integTestRuntime project(':languageJava') + } + + useTestFixtures() +--- a/subprojects/plugin-use/plugin-use.gradle ++++ b/subprojects/plugin-use/plugin-use.gradle +@@ -19,10 +19,6 @@ + compile project(":dependencyManagement") + compile project(":resourcesHttp") + compile libraries.gson +- +- integTestRuntime project(':plugins') +- +- testFixturesCompile project(":internalIntegTesting") + } + + useTestFixtures() +--- a/subprojects/plugins/plugins.gradle ++++ b/subprojects/plugins/plugins.gradle +@@ -44,8 +44,6 @@ + + testCompile "com.google.inject:guice:2.0@jar" + testCompile libraries.jsoup +- +- integTestRuntime project(":maven") + } + + evaluationDependsOn(":wrapper") +--- a/subprojects/testing-native/testing-native.gradle ++++ b/subprojects/testing-native/testing-native.gradle +@@ -20,8 +20,6 @@ + compile project(':languageNative') + + testCompile libraries.groovy +- +- integTestRuntime project(":ideNative") + } + + useTestFixtures() +--- a/subprojects/language-groovy/language-groovy.gradle ++++ b/subprojects/language-groovy/language-groovy.gradle +@@ -3,9 +3,6 @@ + compile project(":languageJava") + + testCompile libraries.groovy +- +- // TODO - get rid of this cycle +- integTestRuntime project(':plugins') + } + + strictCompile() +--- a/subprojects/language-java/language-java.gradle ++++ b/subprojects/language-java/language-java.gradle +@@ -3,9 +3,6 @@ + compile project(":core") + compile project(":platformJvm") + compile project(":languageJvm") +- +- // TODO - get rid of this cycle +- integTestRuntime project(':plugins') + } + + // These public packages have classes that are tangled with the corresponding internal package. +--- a/subprojects/language-jvm/language-jvm.gradle ++++ b/subprojects/language-jvm/language-jvm.gradle +@@ -5,8 +5,6 @@ + testCompile libraries.groovy + + testRuntime project(":languageJava") +- +- testFixturesCompile project(":internalIntegTesting") + } + + useClassycle() +--- a/subprojects/language-native/language-native.gradle ++++ b/subprojects/language-native/language-native.gradle +@@ -19,8 +19,6 @@ + compile project(':platformNative') + + testCompile libraries.groovy +- +- integTestRuntime project(":ideNative") + } + + useTestFixtures() diff --git a/debian/patches/nekohtml.diff b/debian/patches/nekohtml.diff index 2783365..75c1d5f 100644 --- a/debian/patches/nekohtml.diff +++ b/debian/patches/nekohtml.diff @@ -3,7 +3,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-03 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -110,6 +110,8 @@ +@@ -94,6 +94,8 @@ jsoup:'org.jsoup:jsoup:1.6.3' ] diff --git a/debian/patches/relax_warnings.diff b/debian/patches/relax_warnings.diff index 62a8ced..59306e1 100644 --- a/debian/patches/relax_warnings.diff +++ b/debian/patches/relax_warnings.diff @@ -12,5 +12,4 @@ Last-Update: 2015-07-03 + options.compilerArgs << "-Xlint:all" << "-Xlint:-options" << "-Xlint:-serial" } } - } -\ No newline at end of file + ext.strictCompileIgnoreDeprecations = { diff --git a/debian/patches/series b/debian/patches/series index e3e144c..862d527 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,7 +7,6 @@ build_init.diff 33_scala_zinc.diff disable_distributions.diff disable_tests.diff -remove_test_dependencies.diff jetty.diff docs.diff disable_sonar.diff diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 610f707..2639d9b 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -9,7 +9,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-07-08 --- a/build.gradle +++ b/build.gradle -@@ -129,7 +129,7 @@ +@@ -133,7 +133,7 @@ group = 'org.gradle' repositories { @@ -52,8 +52,8 @@ Last-Update: 2015-07-08 versions.bouncycastle = "1.51" --libraries.ant = dependencies.module('org.apache.ant:ant:1.9.4') { -- dependency 'org.apache.ant:ant-launcher:1.9.4@jar' +-libraries.ant = dependencies.module('org.apache.ant:ant:1.9.3') { +- dependency 'org.apache.ant:ant-launcher:1.9.3@jar' +libraries.ant = dependencies.module('org.apache.ant:ant') { + dependency 'org.apache.ant:ant-launcher' } @@ -67,13 +67,14 @@ Last-Update: 2015-07-08 -libraries.commons_collections = 'commons-collections:commons-collections:3.2.1@jar' -libraries.jsch = "com.jcraft:jsch:0.1.51" +libraries.commons_lang = 'commons-lang:commons-lang' -+libraries.commons_collections = 'commons-collections:commons-collections3' ++libraries.commons_collections = 'commons-collections:commons-collections' +libraries.jsch = "com.jcraft:jsch" libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){ dependency libraries.jsch } - libraries.jcip = "net.jcip:jcip-annotations:1.0@jar" +-libraries.jcip = "net.jcip:jcip-annotations:1.0@jar" -libraries.inject = dependencies.module('javax.inject:javax.inject:1') ++libraries.jcip = "net.jcip:jcip-annotations" +libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api') // Logging @@ -87,7 +88,7 @@ Last-Update: 2015-07-08 libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") { dependency libraries.slf4j_api dependency libraries.servlet_api -@@ -73,12 +73,12 @@ +@@ -73,30 +73,30 @@ dependency "org.apache.httpcomponents:httpcore:4.2.2@jar" dependency libraries.jcl_to_slf4j dependency "commons-codec:commons-codec:1.6@jar" @@ -95,16 +96,6 @@ Last-Update: 2015-07-08 + dependency "org.samba.jcifs:jcifs" } - libraries.maven_publish = [ - 'classworlds:classworlds:1.1-alpha-2@jar', -- 'org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1@jar', -+ 'org.codehaus.plexus:plexus-container-default-alpha:1.0-alpha-9-stable-1@jar', - 'org.codehaus.plexus:plexus-utils:1.5.15@jar', - 'org.codehaus.plexus:plexus-interpolation:1.11@jar', - 'org.apache.maven:maven-artifact:2.2.1@jar', -@@ -93,26 +93,26 @@ - 'org.apache.maven.wagon:wagon-provider-api:1.0-beta-6@jar', - ] libraries += [ - dom4j: 'dom4j:dom4j:1.6.1@jar', - guava: 'com.google.guava:guava-jdk5:17.0@jar', @@ -139,29 +130,30 @@ Last-Update: 2015-07-08 //plexus: dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" -@@ -126,27 +126,27 @@ +@@ -110,28 +110,28 @@ 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-compat: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" ++ dependency "org.apache.maven:maven3-compat" + dependency "org.apache.maven:maven3-model-builder" + dependency "org.apache.maven:maven3-model" //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:maven3-artifact" -+ dependency "org.apache.maven:maven3-compat" + dependency "org.apache.maven:maven3-repository-metadata" + dependency "org.apache.maven:maven3-plugin-api" + dependency "org.apache.maven:maven3-aether-provider" + dependency 'org.apache.maven.wagon:wagon-file:2.4@jar' dependency 'org.apache.maven.wagon:wagon-http:2.4@jar' dependency 'org.apache.maven.wagon:wagon-provider-api:2.4@jar' - dependency 'org.apache.maven.wagon:wagon-http-shared4:2.4@jar' @@ -181,7 +173,7 @@ Last-Update: 2015-07-08 } libraries.spock = [ -@@ -164,14 +164,14 @@ +@@ -149,14 +149,14 @@ libraries.objenesis, 'cglib:cglib-nodep:2.2' ] @@ -199,7 +191,7 @@ Last-Update: 2015-07-08 dependency libraries.bouncycastle_provider } -@@ -184,16 +184,4 @@ +@@ -169,16 +169,4 @@ 'com.fasterxml.jackson.core:jackson-core:2.3.2@jar', 'com.fasterxml.jackson.core:jackson-annotations:2.3.2@jar', 'com.fasterxml.jackson.core:jackson-databind:2.3.2@jar' @@ -363,7 +355,7 @@ Last-Update: 2015-07-08 testCompile libraries.groovy --- a/subprojects/dependency-management/dependency-management.gradle +++ b/subprojects/dependency-management/dependency-management.gradle -@@ -6,11 +6,6 @@ +@@ -4,11 +4,6 @@ mvn3Input } @@ -375,12 +367,3 @@ Last-Update: 2015-07-08 dependencies { compile project(":core") compile project(":resources") -@@ -74,7 +69,7 @@ - //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 plexusSec = "$outputDir/jarjar-plexus-sec-dispatcher.jar" - def plexusSecNoComps = "$plexusSec-noComps" - ant { - zip(destfile: plexusSecNoComps, update: true) { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
