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 439a3583cf41a848db53964308f956a446c3c6f1 Author: Kai-Chung Yan <[email protected]> Date: Tue Jun 9 22:03:24 2015 +0800 Resolve more dependencies, now buildable --- debian/changelog | 10 +++++ debian/control | 7 ++-- debian/patches/33_scala_zinc.diff | 43 +++++++++----------- debian/patches/buildInit.diff | 36 +++++++++++++++++ debian/patches/clean_announce.diff | 12 ------ debian/patches/disable_tests.diff | 46 ++++++++++------------ debian/patches/do_not_use_jdk5_guava.diff | 2 +- debian/patches/fix_buildInit.diff | 22 ----------- debian/patches/jetty.diff | 28 +++++++++++++ .../patches/{fix_launcher.diff => launcher.diff} | 0 debian/patches/remove_test_dependencies.diff | 6 +-- debian/patches/series | 6 +-- debian/patches/servlet_api.diff | 12 ------ debian/patches/use_local_artifacts.diff | 26 +++++++++++- 14 files changed, 148 insertions(+), 108 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0711bfe..18f55da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,14 +12,24 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low jnr any more * Abandon 90_respect_user_java_home.diff * Multiple new patches under debian/patches/ + - build_comparison.diff: + - buildInit.diff: build-init.gradle uses APIs higher than Gradle 1.5 - disable_buildSrc_tests.diff: Disable buildSrc tests + - disable_distributions.diff: + - disable_docs.diff: + - disable_tests.diff: - do_not_use_bcpg_jdk5.diff: bouncycastle libraries in Debian do not ship with jdk5 versions + - do_not_use_jdk5_guava.diff - fix_asm5_version.diff: Fix ASM version mismatch - fix_bintray_api.diff: Update the usage of bintray APIs 0.8.1 - fix_bintray_dependencies.diff: Correct the name of bintray library + - fix_DocGenerationException.diff: + - jetty.diff: Replace some Jetty libraries with existing ones + - launcher.diff: - rhino_rename.diff: Correct the name of rhino library - 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/control b/debian/control index 97cc3f8..c3cd5bb 100644 --- a/debian/control +++ b/debian/control @@ -6,13 +6,13 @@ Section: java Priority: optional Build-Depends: ant (>= 1.8), ant-optional (>= 1.8), - bnd, + bnd (>= 2.1.0), checkstyle (>= 5.1), debhelper (>= 9), default-jdk (>= 1:1.6), default-jdk-doc, docbook-xsl, - gradle, + gradle (>= 1.5), groovy (>= 1.8), groovy-doc, ivy (>= 2.3), @@ -71,6 +71,7 @@ Build-Depends: ant (>= 1.8), libservlet2.5-java, libslf4j-java (>= 1.7.2), libspock-java (>= 0.6-groovy-1.8-3~), + libtomcat7-java, libwagon2-java, libxalan2-java, libxerces2-java, @@ -157,7 +158,7 @@ Description: Groovy based build system - Core library Package: libgradle-plugins-java Architecture: all Depends: ant-optional (>= 1.8), - bnd, + bnd (>= 2.1.0), checkstyle (>= 5.1), junit4, libantlr-java, diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff index 81f9b21..b5df0fd 100644 --- a/debian/patches/33_scala_zinc.diff +++ b/debian/patches/33_scala_zinc.diff @@ -6,53 +6,46 @@ Last-Update: 2015-06-03 Forwarded: not-needed --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle -@@ -24,13 +24,22 @@ +@@ -23,14 +23,20 @@ + compile project(":languageJvm") compile project(":plugins") - - // keep in sync with ScalaBasePlugin code + +- // keep in sync with ScalaBasePlugin code - provided("com.typesafe.zinc:zinc:0.3.0") -+ //provided("com.typesafe.zinc:zinc:0.3.0") - +- testCompile libraries.slf4j_api - + integTestRuntime project(":ide") } - + +// Disable Zinc compiler +sourceSets { + main { + groovy { -+ exclude "/org/gradle/api/internal/tasks/scala/jdk6/ZincScalaCompiler.java" ++ exclude "org/gradle/api/internal/tasks/scala/jdk6/ZincScalaCompiler.java" + } + } +} + useTestFixtures(project: ":plugins") // includes core test fixtures - + configure([integTest, daemonIntegTest]) { --- a/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy +++ b/subprojects/scala/src/main/groovy/org/gradle/api/plugins/scala/ScalaBasePlugin.groovy -@@ -151,11 +151,11 @@ +@@ -149,15 +149,7 @@ + private void configureCompileDefaults() { + project.tasks.withType(ScalaCompile.class) { ScalaCompile compile -> compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) } - compile.conventionMapping.zincClasspath = { - def config = project.configurations[ZINC_CONFIGURATION_NAME] +- compile.conventionMapping.zincClasspath = { +- def config = project.configurations[ZINC_CONFIGURATION_NAME] - if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { - project.dependencies { - zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION") - } - } -+ //if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) { -+ // project.dependencies { -+ // zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION") -+ // } -+ //} - config - } - } -@@ -168,4 +168,4 @@ - scalaDoc.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(scalaDoc.classpath) } +- config +- } ++ compile.conventionMapping.zincClasspath = {} } } --} -\ No newline at end of file -+} + diff --git a/debian/patches/buildInit.diff b/debian/patches/buildInit.diff new file mode 100644 index 0000000..042d92e --- /dev/null +++ b/debian/patches/buildInit.diff @@ -0,0 +1,36 @@ +Description: build-init.gradle uses APIs that does not exist in Gradle 1.5, + this patch corrects the API usage. +Author: Kai-Chung Yan <[email protected]> +Last-Update: 2015-06-09 +--- a/subprojects/build-init/build-init.gradle ++++ b/subprojects/build-init/build-init.gradle +@@ -22,20 +22,6 @@ + integTestRuntime project(':scala') + } + +-dependencies { +- components { +- eachComponent { ComponentMetadataDetails details -> +- def version = details.id.version +- if(version.matches("(\\d\\.?)+")){ +- details.status = "release" +- }else{ +- details.status = "integration" +- } +- details.statusScheme = ["integration", "release"] +- } +- } +-} +- + task generateTemplateVersionFile(type: GenerateVersionProperties) { + outputFile = new File(generatedResourcesDir, "org/gradle/buildinit/tasks/templates/library-versions.properties") + } +@@ -77,7 +63,7 @@ + def templateVersionConfiguration = project.configurations.detachedConfiguration(libDependencies as Dependency[]) + templateVersionConfiguration.transitive = false + ResolutionResult resolutionResult = templateVersionConfiguration.incoming.resolutionResult +- resolutionResult.allComponents.findAll { it != resolutionResult.root }. each { dep -> dest.put(name, dep.id.version) } ++ resolutionResult.allDependencies.findAll { it != resolutionResult.root }. each { dep -> dest.put(name, dep.getRequested().getVersion()) } + } + } + diff --git a/debian/patches/clean_announce.diff b/debian/patches/clean_announce.diff deleted file mode 100644 index 6c36358..0000000 --- a/debian/patches/clean_announce.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- 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_tests.diff b/debian/patches/disable_tests.diff index da17601..f9061af 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -3,24 +3,24 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-05-28 --- a/build.gradle +++ b/build.gradle -@@ -108,8 +108,8 @@ +@@ -108,8 +108,6 @@ 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 @@ +@@ -202,6 +200,4 @@ + with project(":distributions").allDistImage + installDirPropertyName = 'gradle_installPath' } - */ - +-*/ +- -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 @@ -52,30 +52,28 @@ Last-Update: 2015-05-28 FileCollection input = project.configurations.runtime --- a/subprojects/distributions/distributions.gradle +++ b/subprojects/distributions/distributions.gradle -@@ -37,7 +37,7 @@ +@@ -37,8 +37,6 @@ dists } -daemonIntegTest.enabled = false -+//daemonIntegTest.enabled = false - +- evaluationDependsOn ":docs" + ext { --- a/subprojects/launcher/launcher.gradle +++ b/subprojects/launcher/launcher.gradle -@@ -67,11 +67,13 @@ +@@ -67,11 +67,4 @@ } } -+/* - 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/*" - } -+*/ - +-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 @@ -114,7 +112,7 @@ Last-Update: 2015-05-28 useClassycle() --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle -@@ -42,6 +42,8 @@ +@@ -39,6 +39,8 @@ useTestFixtures(project: ":plugins") // includes core test fixtures @@ -126,12 +124,11 @@ Last-Update: 2015-05-28 \ No newline at end of file --- a/settings.gradle +++ b/settings.gradle -@@ -36,15 +36,15 @@ +@@ -36,15 +36,11 @@ include 'openApi' include 'toolingApi' //include 'docs' -include 'integTest' -+//include 'integTest' include 'sonar' include 'signing' include 'cpp' @@ -140,9 +137,6 @@ Last-Update: 2015-05-28 -include 'internalTesting' -include 'internalIntegTesting' -include 'performance' -+//include 'internalTesting' -+//include 'internalIntegTesting' -+//include 'performance' include 'javascript' include 'buildComparison' include 'reporting' diff --git a/debian/patches/do_not_use_jdk5_guava.diff b/debian/patches/do_not_use_jdk5_guava.diff index 9d23dbc..f9339a7 100644 --- a/debian/patches/do_not_use_jdk5_guava.diff +++ b/debian/patches/do_not_use_jdk5_guava.diff @@ -1,6 +1,6 @@ --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle -@@ -28,7 +28,7 @@ +@@ -27,7 +27,7 @@ dependencies { compile gradleApi() diff --git a/debian/patches/fix_buildInit.diff b/debian/patches/fix_buildInit.diff deleted file mode 100644 index 55b6368..0000000 --- a/debian/patches/fix_buildInit.diff +++ /dev/null @@ -1,22 +0,0 @@ -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/jetty.diff b/debian/patches/jetty.diff new file mode 100644 index 0000000..2e760de --- /dev/null +++ b/debian/patches/jetty.diff @@ -0,0 +1,28 @@ +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 +--- 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, )" + dependency libraries.jetty_util + dependency libraries.servlet_api + } diff --git a/debian/patches/fix_launcher.diff b/debian/patches/launcher.diff similarity index 100% rename from debian/patches/fix_launcher.diff rename to debian/patches/launcher.diff diff --git a/debian/patches/remove_test_dependencies.diff b/debian/patches/remove_test_dependencies.diff index 1933253..ce0a8db 100644 --- a/debian/patches/remove_test_dependencies.diff +++ b/debian/patches/remove_test_dependencies.diff @@ -26,7 +26,7 @@ Last-Update: 2015-05-28 + //integTestRuntime project(':scala') } - /* + task generateTemplateVersionFile(type: GenerateVersionProperties) { --- a/subprojects/core/core.gradle +++ b/subprojects/core/core.gradle @@ -68,13 +68,6 @@ @@ -45,7 +45,7 @@ Last-Update: 2015-05-28 useTestFixtures() --- a/subprojects/core-impl/core-impl.gradle +++ b/subprojects/core-impl/core-impl.gradle -@@ -27,7 +27,7 @@ +@@ -28,7 +28,7 @@ testCompile libraries.groovy //this dependency is necessary to run IvySFtpResolverIntegrationTest on ibm jdk @@ -129,7 +129,7 @@ Last-Update: 2015-05-28 \ No newline at end of file --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle -@@ -28,7 +28,7 @@ +@@ -25,7 +25,7 @@ testCompile libraries.slf4j_api diff --git a/debian/patches/series b/debian/patches/series index c0384f5..2b85764 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,8 +11,8 @@ fix_DocGenerationException.diff 37_replace_internal_testng_api.diff 38_use_jdk7_nio_file_api.diff 39_ignore_test_processor_assertion.diff -fix_buildInit.diff -fix_launcher.diff +buildInit.diff +launcher.diff disable_docs.diff 33_scala_zinc.diff disable_distributions.diff @@ -21,6 +21,6 @@ remove_test_dependencies.diff fix_bintray_dependencies.diff build_comparison_css.diff rhino_rename.diff -servlet_api.diff +jetty.diff do_not_use_bcpg_jdk5.diff fix_bintray_api.diff diff --git a/debian/patches/servlet_api.diff b/debian/patches/servlet_api.diff deleted file mode 100644 index 1fb6211..0000000 --- a/debian/patches/servlet_api.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/gradle/dependencies.gradle -+++ b/gradle/dependencies.gradle -@@ -55,7 +55,8 @@ - } - - // Jetty --libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211@jar" -+//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 diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 5f31f42..0e1e057 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -52,7 +52,13 @@ Last-Update: 2015-05-24 dependencies { --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -90,14 +90,14 @@ +@@ -85,19 +85,19 @@ + jaxen: 'jaxen:jaxen:1.1@jar', + jcip: "net.jcip:jcip-annotations:1.0@jar", + jna: 'net.java.dev.jna:jna:3.2.7@jar', +- junit: 'junit:junit:4.11@jar', ++ junit: 'junit:junit:[4.11, )@jar', + 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', @@ -120,3 +126,21 @@ Last-Update: 2015-05-24 def plexusSecNoComps = "$plexusSec-noComps" ant { zip(destfile: plexusSecNoComps, update: true) { +--- a/subprojects/jetty/jetty.gradle ++++ b/subprojects/jetty/jetty.gradle +@@ -31,14 +31,12 @@ + } + + runtime module("org.mortbay.jetty:jsp-2.1:6.1.14") { +- dependency "org.eclipse.jdt:core:3.1.1@jar" + dependency "org.mortbay.jetty:jsp-api-2.1:6.1.14@jar" + dependency libraries.jetty_util + dependency libraries.servlet_api + } + + runtime "org.mortbay.jetty:jetty-annotations:6.1.25@jar" +- runtime "org.apache.geronimo.specs:geronimo-annotation_1.0_spec:1.0@jar" + } + + useTestFixtures() +\ No newline at end of file -- 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
