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 2d4aa354acf1b054e60401185a5d5ae8e537df6a Author: Kai-Chung Yan <[email protected]> Date: Thu May 28 23:30:54 2015 +0800 The whole project build scripts can now be loaded and built --- debian/patches/clean_announce.diff | 12 ++ debian/patches/disable_distributions.diff | 33 +++++ debian/patches/disable_docs.diff | 26 ++++ debian/patches/disable_tests.diff | 148 +++++++++++++++++++ debian/patches/fix_DocGenerationException.diff | 25 +++- debian/patches/fix_buildInit.diff | 22 +++ debian/patches/fix_launcher.diff | 15 ++ debian/patches/remove_test_dependencies.diff | 192 +++++++++++++++++++++++++ debian/patches/series | 7 +- debian/rules | 6 +- 10 files changed, 476 insertions(+), 10 deletions(-) diff --git a/debian/patches/clean_announce.diff b/debian/patches/clean_announce.diff new file mode 100644 index 0000000..6c36358 --- /dev/null +++ b/debian/patches/clean_announce.diff @@ -0,0 +1,12 @@ +--- 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() ++//useTestFixtures() diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff new file mode 100644 index 0000000..9369c62 --- /dev/null +++ b/debian/patches/disable_distributions.diff @@ -0,0 +1,33 @@ +--- a/settings.gradle ++++ b/settings.gradle +@@ -13,7 +13,7 @@ + * See the License for the specific language governing permissions and + * limitations under the License. + */ +-include 'distributions' ++//include 'distributions' + include 'baseServices' + include 'baseServicesGroovy' + include 'core' +--- a/build.gradle ++++ b/build.gradle +@@ -186,8 +186,9 @@ + projects = subprojects + } + +-evaluationDependsOn ":distributions" ++//evaluationDependsOn ":distributions" + ++/* + task install(type: Install) { + description = 'Installs the minimal distribution into directory $gradle_installPath' + group = 'build' +@@ -201,6 +202,6 @@ + with project(":distributions").allDistImage + installDirPropertyName = 'gradle_installPath' + } +- ++*/ + + apply from: "gradle/intTestImage.gradle" +\ No newline at end of file diff --git a/debian/patches/disable_docs.diff b/debian/patches/disable_docs.diff new file mode 100644 index 0000000..f3ef90d --- /dev/null +++ b/debian/patches/disable_docs.diff @@ -0,0 +1,26 @@ +Description: Temporarily disable docs because jhighlight are not in Debian + yet +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-05-28 +--- a/subprojects/core/core.gradle ++++ b/subprojects/core/core.gradle +@@ -46,7 +46,7 @@ + compile project(":cli") + compile project(":native") + +- runtime project(":docs") ++ //runtime project(":docs") + + compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') { + exclude module:'groovy-all' +--- a/settings.gradle ++++ b/settings.gradle +@@ -35,7 +35,7 @@ + include 'ui' + include 'openApi' + include 'toolingApi' +-include 'docs' ++//include 'docs' + include 'integTest' + include 'sonar' + include 'signing' diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff new file mode 100644 index 0000000..f0c42f8 --- /dev/null +++ b/debian/patches/disable_tests.diff @@ -0,0 +1,148 @@ +Description: Disable tests +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-05-28 +--- a/build.gradle ++++ b/build.gradle +@@ -108,8 +108,8 @@ + apply from: "gradle/eclipse.gradle" + apply from: "gradle/classycle.gradle" + apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle" +-apply from: "gradle/testSetup.gradle" +-apply from: "gradle/testGroupings.gradle" ++//apply from: "gradle/testSetup.gradle" ++//apply from: "gradle/testGroupings.gradle" + + allprojects { + group = 'org.gradle' +@@ -204,4 +204,4 @@ + } + */ + +-apply from: "gradle/intTestImage.gradle" +\ No newline at end of file ++//apply from: "gradle/intTestImage.gradle" +\ No newline at end of file +--- a/gradle/groovyProject.gradle ++++ b/gradle/groovyProject.gradle +@@ -65,13 +65,16 @@ + def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile" + def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime" + ++ /* + dependencies { + add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile")) + add(compileConfiguration, project(':internalTesting')) + add(runtimeConfiguration, project(path: projectPath, configuration: "testFixturesUsageRuntime")) + } ++ */ + } + ++/* + if (file("src/testFixtures").exists()) { + apply from: "$rootDir/gradle/testFixtures.gradle" + } +@@ -80,6 +83,8 @@ + apply from: "$rootDir/gradle/integTest.gradle" + } + ++*/ ++ + class ClasspathManifest extends DefaultTask { + + FileCollection input = project.configurations.runtime +--- a/subprojects/distributions/distributions.gradle ++++ b/subprojects/distributions/distributions.gradle +@@ -37,7 +37,7 @@ + dists + } + +-daemonIntegTest.enabled = false ++//daemonIntegTest.enabled = false + + evaluationDependsOn ":docs" + +--- a/subprojects/launcher/launcher.gradle ++++ b/subprojects/launcher/launcher.gradle +@@ -67,11 +67,13 @@ + } + } + ++/* + daemonIntegTest { + //those tests are always using the daemon, they use exclusive daemons and they are a part of a regular check-in build anyway. + //since they are using exclusive daemons they don't contribute to the daemonIntegTest stress/load test. + //excluding to avoid unnecessary re-running and stealing resources. + exclude "org/gradle/launcher/daemon/*" + } ++*/ + + useClassycle() +\ No newline at end of file +--- a/subprojects/tooling-api/tooling-api.gradle ++++ b/subprojects/tooling-api/tooling-api.gradle +@@ -21,13 +21,17 @@ + + useTestFixtures() + ++/* + integTestTasks.all { + dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip') + } ++*/ + ++/* + daemonIntegTest { + enabled = false //tooling integ tests use daemon anyway, don't rerun + } ++*/ + + task jarjarJar(type: JarJarJar) { + appendix = "fat" +--- 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 } + } + ++/* + integTestTasks.all { + inputs.files { project(":distributions").binZip } + } ++*/ + + useTestFixtures() + useClassycle() +--- a/subprojects/scala/scala.gradle ++++ b/subprojects/scala/scala.gradle +@@ -33,6 +33,8 @@ + + useTestFixtures(project: ":plugins") // includes core test fixtures + ++/* + configure([integTest, daemonIntegTest]) { + jvmArgs "-XX:MaxPermSize=1g" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen + } ++*/ +\ No newline at end of file +--- a/settings.gradle ++++ b/settings.gradle +@@ -36,15 +36,15 @@ + include 'openApi' + include 'toolingApi' + //include 'docs' +-include 'integTest' ++//include 'integTest' + include 'sonar' + include 'signing' + include 'cpp' + include 'ear' + include 'native' +-include 'internalTesting' +-include 'internalIntegTesting' +-include 'performance' ++//include 'internalTesting' ++//include 'internalIntegTesting' ++//include 'performance' + include 'javascript' + include 'buildComparison' + include 'reporting' diff --git a/debian/patches/fix_DocGenerationException.diff b/debian/patches/fix_DocGenerationException.diff index 05804c7..04e8b5c 100644 --- a/debian/patches/fix_DocGenerationException.diff +++ b/debian/patches/fix_DocGenerationException.diff @@ -4,13 +4,26 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-05-27 --- a/buildSrc/src/main/groovy/org/gradle/build/docs/DocGenerationException.java +++ b/buildSrc/src/main/groovy/org/gradle/build/docs/DocGenerationException.java -@@ -15,9 +15,6 @@ +@@ -13,13 +13,13 @@ + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.gradle.build.docs; +-package org.gradle.build.docs; ++ package org.gradle.build.docs; -import org.gradle.internal.exceptions.Contextual; -- ++ //import org.gradle.internal.exceptions.Contextual; + -@Contextual - public class DocGenerationException extends RuntimeException { - public DocGenerationException(String message, Throwable throwable) { - super(message, throwable); +-public class DocGenerationException extends RuntimeException { +- public DocGenerationException(String message, Throwable throwable) { +- super(message, throwable); +- } +-} ++ //@Contextual ++ public class DocGenerationException extends RuntimeException { ++ public DocGenerationException(String message, Throwable throwable) { ++ super(message, throwable); ++ } ++ } +\ No newline at end of file diff --git a/debian/patches/fix_buildInit.diff b/debian/patches/fix_buildInit.diff new file mode 100644 index 0000000..55b6368 --- /dev/null +++ b/debian/patches/fix_buildInit.diff @@ -0,0 +1,22 @@ +Description: build-init.gradle uses APIs that does not exist in Gradle 1.5, + this patch removes the API usage. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-05-28 +--- a/subprojects/build-init/build-init.gradle ++++ b/subprojects/build-init/build-init.gradle +@@ -22,6 +22,7 @@ + integTestRuntime project(':scala') + } + ++/* + dependencies { + components { + eachComponent { ComponentMetadataDetails details -> +@@ -35,6 +36,7 @@ + } + } + } ++*/ + + task generateTemplateVersionFile(type: GenerateVersionProperties) { + outputFile = new File(generatedResourcesDir, "org/gradle/buildinit/tasks/templates/library-versions.properties") diff --git a/debian/patches/fix_launcher.diff b/debian/patches/fix_launcher.diff new file mode 100644 index 0000000..0ffd100 --- /dev/null +++ b/debian/patches/fix_launcher.diff @@ -0,0 +1,15 @@ +Description: The "exclude" clause causes compilation error. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-05-28 +--- a/subprojects/launcher/launcher.gradle ++++ b/subprojects/launcher/launcher.gradle +@@ -71,7 +71,7 @@ + //those tests are always using the daemon, they use exclusive daemons and they are a part of a regular check-in build anyway. + //since they are using exclusive daemons they don't contribute to the daemonIntegTest stress/load test. + //excluding to avoid unnecessary re-running and stealing resources. +- exclude "org/gradle/launcher/daemon/**/*" ++ exclude "org/gradle/launcher/daemon/*" + } + + useClassycle() +\ No newline at end of file diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff new file mode 100644 index 0000000..71f175b --- /dev/null +++ b/debian/patches/remove_test_dependencies.diff @@ -0,0 +1,192 @@ +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 <[email protected]> +Last-Update: 2015-05-28 +--- 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') + } + + /* +--- a/subprojects/core/core.gradle ++++ b/subprojects/core/core.gradle +@@ -69,10 +69,10 @@ + testRuntime libraries.xerces + testRuntime project(":diagnostics") + +- testFixturesCompile project(":internalTesting") +- testFixturesRuntime project(':coreImpl') ++ //testFixturesCompile project(":internalTesting") ++ //testFixturesRuntime project(':coreImpl') + +- integTestCompile project(":internalIntegTesting") ++ //integTestCompile project(":internalIntegTesting") + + reports 'css3-pie:css3-pie:1.0beta3' + } +--- a/subprojects/core-impl/core-impl.gradle ++++ b/subprojects/core-impl/core-impl.gradle +@@ -27,7 +27,7 @@ + testCompile libraries.groovy + + //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk +- integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar" ++ //integTestRuntime "org.bouncycastle:bcprov-jdk15:1.46@jar" + } + + task jarJarMaven3(type: JarJar) { +--- a/subprojects/cpp/cpp.gradle ++++ b/subprojects/cpp/cpp.gradle +@@ -20,7 +20,7 @@ + compile project(":plugins") + compile project(":ide") + compile libraries.commons_io +- integTestRuntime project(":maven") ++ //integTestRuntime project(":maven") + } + + useTestFixtures() +--- a/subprojects/ivy/ivy.gradle ++++ b/subprojects/ivy/ivy.gradle +@@ -23,7 +23,7 @@ + compile project(':coreImpl') + + testCompile libraries.groovy +- integTestCompile project(":ear") ++ //integTestCompile project(":ear") + } + + useTestFixtures() +--- a/subprojects/maven/maven.gradle ++++ b/subprojects/maven/maven.gradle +@@ -30,7 +30,7 @@ + + testCompile libraries.xmlunit + +- integTestCompile project(":ear") ++ //integTestCompile project(":ear") + } + + useTestFixtures() +--- a/subprojects/open-api/open-api.gradle ++++ b/subprojects/open-api/open-api.gradle +@@ -1,8 +1,8 @@ + dependencies { + testCompile libraries.groovy + +- integTestCompile libraries.slf4j_api +- integTestCompile libraries.commons_lang ++ //integTestCompile libraries.slf4j_api ++ //integTestCompile libraries.commons_lang + } + + useTestFixtures() +--- a/subprojects/publish/publish.gradle ++++ b/subprojects/publish/publish.gradle +@@ -20,8 +20,8 @@ + + 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 +@@ -4,8 +4,8 @@ + compile 'com.googlecode.jatl:jatl:0.2.2' + + testCompile libraries.jsoup +- integTestRuntime project(':codeQuality') +- integTestRuntime project(':jacoco') ++ //integTestRuntime project(':codeQuality') ++ //integTestRuntime project(':jacoco') + } + + useTestFixtures() +\ No newline at end of file +--- a/subprojects/scala/scala.gradle ++++ b/subprojects/scala/scala.gradle +@@ -28,7 +28,7 @@ + + testCompile libraries.slf4j_api + +- integTestRuntime project(":ide") ++ //integTestRuntime project(":ide") + } + + useTestFixtures(project: ":plugins") // includes core test fixtures +--- a/subprojects/sonar/sonar.gradle ++++ b/subprojects/sonar/sonar.gradle +@@ -25,10 +25,10 @@ + // Sonar Runner plugin + compile "org.codehaus.sonar-plugins:sonar-runner:2.0" + // 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" +- integTestRuntime "org.gradle.sonar:sonar-test-server:3.4@war" +- integTestRuntime "org.gradle.sonar:sonar-test-server-home-dir:3.4.0.1@zip" ++ //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" ++ //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 ++++ b/subprojects/tooling-api/tooling-api.gradle +@@ -8,15 +8,15 @@ + compile project(':baseServices') + publishCompile libraries.slf4j_api + +- testFixturesCompile project(':baseServicesGroovy') ++ //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(':ide') ++ //integTestRuntime project(':buildInit') ++ //integTestRuntime project(':buildComparison') ++ //integTestRuntime project(":ivy") ++ //integTestRuntime project(":maven") + } + + 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) { diff --git a/debian/patches/series b/debian/patches/series index 3c3c1f3..89ebb0f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,6 +3,11 @@ do_not_use_jdk5_guava.diff fix_DocGenerationException.diff 03_plexus.diff 13_fix_javadocs_links.diff -26_disable_commitid.diff 34_disable_code_quality.diff 36_java8_compatibility.diff +fix_buildInit.diff +fix_launcher.diff +disable_docs.diff +disable_distributions.diff +disable_tests.diff +remove_test_dependencies.diff diff --git a/debian/rules b/debian/rules index d4765de..ac4ae1e 100755 --- a/debian/rules +++ b/debian/rules @@ -24,8 +24,8 @@ endif override_dh_auto_build: find /usr/share/gradle -type l ! -exec test -r {} \; -print - # Gradle 1.12 buildSrc uses APIs from base-services that does not exist in - # Gradle 1.5, hence make the codes available inside buildSrc. + # Gradle 1.12 buildSrc uses APIs that does not exist in Gradle 1.5, hence + # make the codes available inside buildSrc. cp -r subprojects/base-services/src/main/java/ buildSrc/src/main/ # Rename the test source sets to disable the compiling of tests @@ -39,7 +39,7 @@ override_dh_auto_clean: dh_auto_clean gradle clean $(GRADLE_FLAGS) rm -rf .gradle/ .gradlehome/ debian/gradle.1 buildSrc/.gradle/ - rm -rf buildSrc/src/main/java/ + rm -rf buildSrc/src/main/java mv buildSrc/src/no-test/ buildSrc/src/test/ get-orig-source: -- 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
