[gradle] 02/02: Remove unused patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 8 10:29:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit 1338f67396f645fac817cdd3aadf4f143b835d98
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Wed Jul 8 18:28:51 2015 +0800
Remove unused patches
---
debian/patches/remove_test_dependencies.diff | 349 ---------------------------
1 file changed, 349 deletions(-)
diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff
deleted file mode 100644
index ab3572d..0000000
--- a/debian/patches/remove_test_dependencies.diff
+++ /dev/null
@@ -1,349 +0,0 @@
-Description: Lots of subproject build scripts has test dependencies and they
- are of no use, hence remove them. This patch only modifies build
- scripts of subprojects.
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-07-02
---- a/subprojects/announce/announce.gradle
-+++ b/subprojects/announce/announce.gradle
-@@ -17,7 +17,7 @@
- compile libraries.groovy
- compile libraries.slf4j_api
- compile project(':core')
-- integTestRuntime project(':plugins')
-+ //integTestRuntime project(':plugins')
- }
-
- useTestFixtures()
---- a/subprojects/build-init/build-init.gradle
-+++ b/subprojects/build-init/build-init.gradle
-@@ -18,8 +18,8 @@
- compile project(':core')
- compile project(':plugins')
- compile project(':wrapper')
-- integTestRuntime project(':maven')
-- integTestRuntime project(':scala')
-+ //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 at 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 at 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 at war"
-- integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir-3.2:3.2 at zip"
-- integTestRuntime "org.gradle.sonar:sonar-test-server:3.4 at war"
-- integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir:3.4.0.1 at zip"
-+ //integTestRuntime "org.gradle.sonar:sonar-server-3.2:3.2 at war"
-+ //integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir-3.2:3.2 at zip"
-+ //integTestRuntime "org.gradle.sonar:sonar-test-server:3.4 at war"
-+ //integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir:3.4.0.1 at zip"
-
- // Sonar plugin
- compile libraries.guava
---- a/subprojects/tooling-api/tooling-api.gradle
-+++ b/subprojects/tooling-api/tooling-api.gradle
-@@ -8,16 +8,7 @@
- compile project(':baseServices')
- publishCompile libraries.slf4j_api
-
-- testFixturesCompile project(':baseServicesGroovy')
- testCompile libraries.groovy
--
-- // lots of integTest errors otherwise
-- integTestRuntime project(':ide')
-- integTestRuntime project(':buildInit')
-- integTestRuntime project(':buildComparison')
-- integTestRuntime project(":ivy")
-- 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 at 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 at 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
-@@ -3,10 +3,6 @@
- compile project(":platformBase")
-
- 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()
---- a/subprojects/launcher/launcher.gradle
-+++ b/subprojects/launcher/launcher.gradle
-@@ -14,21 +14,11 @@
-
- testCompile libraries.groovy
-
-- integTestRuntime project(':plugins')
--
- startScriptGenerator project(':plugins')
--
-- testFixturesCompile project(':internalTesting')
- }
-
- useTestFixtures()
-
--integTestTasks.all {
-- if (isCiServer) {
-- maxParallelForks = Math.min(3, rootProject.maxParallelForks)
-- }
--}
--
- jar {
- manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain")
- doFirst {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/gradle.git
More information about the pkg-java-commits
mailing list