This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit ac4cfad45b351e91441538f92665738ff8d536bb Author: Kai-Chung Yan <[email protected]> Date: Fri Jul 3 00:04:37 2015 +0800 New patch: disable_aws.diff --- debian/changelog | 1 + debian/libgradle-plugins-java.install | 2 +- debian/patches/disable_aws.diff | 21 ++++ debian/patches/disable_tests.diff | 5 +- debian/patches/remove_test_dependencies.diff | 158 ++++++++++++++++++++++----- debian/patches/series | 1 + debian/patches/use_local_artifacts.diff | 14 +++ 7 files changed, 174 insertions(+), 28 deletions(-) diff --git a/debian/changelog b/debian/changelog index 802244e..20bd1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ gradle (2.4-1) UNRELEASED; urgency=low - bintray_dependencies.diff - diagnostics_jquery.diff - disable_css3pie.diff + * New d/patches/disable_aws.diff: AWS SDK for Java is not in Debian -- Kai-Chung Yan <[email protected]> Sun, 28 Jun 2015 19:28:30 +0800 diff --git a/debian/libgradle-plugins-java.install b/debian/libgradle-plugins-java.install index 5a3a4e8..8d17c93 100644 --- a/debian/libgradle-plugins-java.install +++ b/debian/libgradle-plugins-java.install @@ -1,2 +1,2 @@ -subprojects/core-impl/build/libs/jarjar/*.jar /usr/share/gradle/lib/plugins/ +subprojects/dependency-management/build/libs/jarjar/*.jar /usr/share/gradle/lib/plugins/ subprojects/distributions/src/toplevel/media/ /usr/share/gradle/ \ No newline at end of file diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff new file mode 100644 index 0000000..57eb0d4 --- /dev/null +++ b/debian/patches/disable_aws.diff @@ -0,0 +1,21 @@ +--- a/build.gradle ++++ b/build.gradle +@@ -94,7 +94,7 @@ + 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase', + 'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala', + 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingNative', +- 'pluginDevelopment', 'pluginUse', 'resourcesHttp', 'resourcesSftp', 'resourcesS3', ++ 'pluginDevelopment', 'pluginUse', 'resourcesHttp', 'resourcesSftp', + 'toolingApiBuilders' + ].collect { + project(it) +--- a/settings.gradle ++++ b/settings.gradle +@@ -24,7 +24,6 @@ + include 'messaging' + include 'resources' + include 'resourcesHttp' +-include 'resourcesS3' + include 'resourcesSftp' + include 'plugins' + include 'scala' diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index 7d231ae..70af3ae 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -126,7 +126,7 @@ Last-Update: 2015-07-02 \ No newline at end of file --- a/settings.gradle +++ b/settings.gradle -@@ -41,13 +41,10 @@ +@@ -41,14 +41,10 @@ include 'toolingApi' include 'toolingApiBuilders' include 'docs' @@ -137,6 +137,7 @@ Last-Update: 2015-07-02 include 'native' -include 'internalTesting' -include 'internalIntegTesting' - include 'performance' +-include 'performance' include 'javascript' include 'buildComparison' + include 'reporting' diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff index c0a3805..b836065 100644 --- a/debian/patches/remove_test_dependencies.diff +++ b/debian/patches/remove_test_dependencies.diff @@ -12,7 +12,7 @@ Last-Update: 2015-07-02 - integTestRuntime project(':plugins') + //integTestRuntime project(':plugins') } - + useTestFixtures() --- a/subprojects/build-init/build-init.gradle +++ b/subprojects/build-init/build-init.gradle @@ -25,12 +25,12 @@ Last-Update: 2015-07-02 + //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") - @@ -44,26 +44,26 @@ Last-Update: 2015-07-02 - - 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") @@ -72,7 +72,7 @@ Last-Update: 2015-07-02 - - testFixturesCompile project(":internalIntegTesting") } - + useTestFixtures() --- a/subprojects/open-api/open-api.gradle +++ b/subprojects/open-api/open-api.gradle @@ -86,45 +86,44 @@ Last-Update: 2015-07-02 useTestFixtures() --- a/subprojects/publish/publish.gradle +++ b/subprojects/publish/publish.gradle -@@ -20,8 +20,8 @@ - +@@ -19,9 +19,6 @@ + compile project(':dependencyManagement') + testCompile libraries.groovy - +- - integTestRuntime project(":ivy") - integTestRuntime project(":maven") -+ //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/scala/scala.gradle +++ b/subprojects/scala/scala.gradle @@ -25,7 +25,7 @@ - + testCompile libraries.slf4j_api - + - integTestRuntime project(":ide") + //integTestRuntime project(":ide") } - + useTestFixtures(project: ":plugins") // includes core test fixtures \ No newline at end of file --- a/subprojects/sonar/sonar.gradle +++ b/subprojects/sonar/sonar.gradle @@ -29,10 +29,10 @@ compile libraries.groovy - + // version number is part of module name, to allow for multiple versions on same class path - integTestRuntime "org.gradle.sonar:sonar-server-3.2:3.2@war" - integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir-3.2:3.2@zip" @@ -134,7 +133,7 @@ Last-Update: 2015-07-02 + //integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir-3.2:3.2@zip" + //integTestRuntime "org.gradle.sonar:sonar-test-server:3.4@war" + //integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir:3.4.0.1@zip" - + // Sonar plugin compile libraries.guava --- a/subprojects/tooling-api/tooling-api.gradle @@ -142,7 +141,7 @@ Last-Update: 2015-07-02 @@ -8,16 +8,7 @@ compile project(':baseServices') publishCompile libraries.slf4j_api - + - testFixturesCompile project(':baseServicesGroovy') testCompile libraries.groovy - @@ -154,16 +153,125 @@ Last-Update: 2015-07-02 - integTestRuntime project(":maven") - integTestRuntime project(":toolingApiBuilders") } - + useTestFixtures() --- a/subprojects/wrapper/wrapper.gradle +++ b/subprojects/wrapper/wrapper.gradle @@ -19,7 +19,7 @@ testCompile libraries.groovy testCompile libraries.ant - + - integTestRuntime rootProject.configurations.testRuntime.allDependencies + //integTestRuntime rootProject.configurations.testRuntime.allDependencies } - + task buildReceiptResource(type: Copy, dependsOn: rootProject.createBuildReceipt) { +--- a/subprojects/dependency-management/dependency-management.gradle ++++ b/subprojects/dependency-management/dependency-management.gradle +@@ -25,15 +25,8 @@ + + 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") + } + + task jarJarMaven3(type: JarJar) { +--- 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() diff --git a/debian/patches/series b/debian/patches/series index ee3ecaa..c429639 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,3 +14,4 @@ disable_sonar.diff disable_release_notes.diff search_system_jar.diff 26_disable_commitid.diff +disable_aws.diff diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index d606d93..531c5ad 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -340,3 +340,17 @@ Last-Update: 2015-07-02 groovydocGroovy libraries.groovy testCompile libraries.groovy +--- a/subprojects/dependency-management/dependency-management.gradle ++++ b/subprojects/dependency-management/dependency-management.gradle +@@ -6,11 +6,6 @@ + mvn3Input + } + +-repositories { +- jcenter() +- mavenCentral() +-} +- + dependencies { + compile project(":core") + compile project(":resources") -- 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
