This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository gradle.
commit 047d1ac78fdfa5bf4eca152fbb8c92fcd74e745c Author: Emmanuel Bourg <[email protected]> Date: Tue May 3 01:41:30 2016 +0200 Refreshed the patches --- debian/changelog | 6 +++-- debian/patches/33_scala_zinc.diff | 15 +++++------ debian/patches/disable_aws.diff | 10 +++---- debian/patches/disable_sonar.diff | 4 +-- debian/patches/disable_tests.diff | 40 ++++++++++++++-------------- debian/patches/docs.diff | 28 +++++++++---------- debian/patches/eclipse-aether.diff | 2 +- debian/patches/generate_classpath.diff | 2 +- debian/patches/generate_pom.diff | 2 +- debian/patches/jcommander.diff | 8 +++--- debian/patches/maven-3.3-compatibility.patch | 6 ++--- debian/patches/nekohtml.diff | 2 +- debian/patches/use_local_artifacts.diff | 10 +++---- 13 files changed, 68 insertions(+), 67 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8fde8cb..3358a04 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ -gradle (2.10-3) UNRELEASED; urgency=medium +gradle (2.11-1) UNRELEASED; urgency=medium * Team upload. + * New upstream release + - Refreshed the patches * Removed the unused dependency on libclassworlds-java * Depend on libasm-java instead of libasm4-java * Depend on libcglib-nodep-java instead of libcglib3-java @@ -23,7 +25,7 @@ gradle (2.10-2) unstable; urgency=medium * Standards-Version updated to 3.9.7 (no changes) * Use a secure Vcs-Git URL - -- Emmanuel Bourg <[email protected]> Thu, 03 Mar 2016 16:56:38 +0100 + -- Emmanuel Bourg <[email protected]> Tue, 01 Mar 2016 15:17:36 +0100 gradle (2.10-1) unstable; urgency=medium diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff index 4b502c8..73de244 100644 --- a/debian/patches/33_scala_zinc.diff +++ b/debian/patches/33_scala_zinc.diff @@ -24,7 +24,7 @@ Forwarded: not-needed +sourceSets.main.java { exclude "**/ZincScalaCompiler.java" } --- 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 -@@ -120,15 +120,7 @@ +@@ -106,15 +106,7 @@ private void configureCompileDefaults() { project.tasks.withType(ScalaCompile.class) { ScalaCompile compile -> compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) } @@ -43,7 +43,7 @@ Forwarded: not-needed --- a/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java +++ b/subprojects/language-scala/src/main/java/org/gradle/language/scala/internal/toolchain/DefaultScalaToolProvider.java -@@ -21,7 +21,6 @@ +@@ -20,7 +20,6 @@ import org.gradle.api.internal.tasks.scala.DaemonScalaCompiler; import org.gradle.api.internal.tasks.scala.NormalizingScalaCompiler; import org.gradle.api.internal.tasks.scala.ScalaJavaJointCompileSpec; @@ -51,14 +51,13 @@ Forwarded: not-needed import org.gradle.language.base.internal.compile.CompileSpec; import org.gradle.language.base.internal.compile.Compiler; import org.gradle.platform.base.internal.toolchain.ToolProvider; -@@ -47,12 +46,7 @@ +@@ -48,11 +47,7 @@ @SuppressWarnings("unchecked") public <T extends CompileSpec> org.gradle.language.base.internal.compile.Compiler<T> newCompiler(Class<T> spec) { - if (ScalaJavaJointCompileSpec.class.isAssignableFrom(spec)) { -- File projectDir = projectFinder.getProject(":").getProjectDir(); -- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new ZincScalaCompiler(resolvedScalaClasspath, resolvedZincClasspath); -- return (Compiler<T>) new NormalizingScalaCompiler(new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(projectDir, scalaCompiler, compilerDaemonManager, resolvedZincClasspath)); +- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new ZincScalaCompiler(resolvedScalaClasspath, resolvedZincClasspath, gradleUserHomeDir); +- return (Compiler<T>) new NormalizingScalaCompiler(new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(rootProjectDir, scalaCompiler, compilerDaemonManager, resolvedZincClasspath)); - } - throw new IllegalArgumentException(String.format("Cannot create Compiler for unsupported CompileSpec type '%s'", spec.getSimpleName())); + throw new org.gradle.api.GradleException("Gradle in Debian does not support Zinc compiler."); @@ -67,11 +66,11 @@ Forwarded: not-needed @Override --- a/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java +++ b/subprojects/scala/src/main/groovy/org/gradle/api/internal/tasks/scala/ScalaCompilerFactory.java -@@ -64,7 +64,7 @@ +@@ -66,7 +66,7 @@ Set<File> zincClasspathFiles = zincClasspath.getFiles(); // currently, we leave it to ZincScalaCompiler to also compile the Java code -- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(rootProjectDirectory, new ZincScalaCompiler(scalaClasspathFiles, zincClasspathFiles), compilerDaemonFactory, zincClasspathFiles); +- Compiler<ScalaJavaJointCompileSpec> scalaCompiler = new DaemonScalaCompiler<ScalaJavaJointCompileSpec>(rootProjectDirectory, new ZincScalaCompiler(scalaClasspathFiles, zincClasspathFiles, gradleUserHomeDir), compilerDaemonFactory, zincClasspathFiles); - return new NormalizingScalaCompiler(scalaCompiler); + Compiler<ScalaJavaJointCompileSpec> scalaCompiler = null; + throw new GradleException("Gradle in Debian does not support Zinc compiler."); diff --git a/debian/patches/disable_aws.diff b/debian/patches/disable_aws.diff index 27a2564..726f115 100644 --- a/debian/patches/disable_aws.diff +++ b/debian/patches/disable_aws.diff @@ -4,14 +4,14 @@ Last-Update: 2015-07-07 --- a/build.gradle +++ b/build.gradle @@ -145,7 +145,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' + 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingBase', + 'testingNative', 'testingJvm', 'pluginDevelopment', 'pluginUse', 'resourcesHttp', +- 'resourcesSftp', 'resourcesS3', 'toolingApiBuilders' ++ 'resourcesSftp', 'toolingApiBuilders' ].collect { project(it) + } --- a/settings.gradle +++ b/settings.gradle @@ -24,7 +24,6 @@ diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff index f57a5ab..dafc24a 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 -@@ -141,7 +141,7 @@ +@@ -140,7 +140,7 @@ publicGroovyProjects = groovyProjects - internalProjects pluginProjects = [ 'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven', @@ -14,7 +14,7 @@ Last-Update: 2015-07-02 + 'ide', 'announce', 'scala', 'signing', 'ear', 'javascript', 'buildComparison', 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildInit', 'platformBase', 'platformJvm', 'languageJvm', 'languageJava', 'languageGroovy', 'languageScala', - 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingNative', + 'platformNative', 'platformPlay', 'languageNative', 'ideNative', 'testingBase', --- a/settings.gradle +++ b/settings.gradle @@ -41,7 +41,6 @@ diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index 21c620c..3083976 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -9,16 +9,16 @@ Last-Update: 2015-09-30 -apply from: "gradle/testGroupings.gradle" apply from: 'gradle/buildSplits.gradle' - ext { -@@ -172,7 +171,6 @@ + jvm = org.gradle.internal.jvm.Jvm.current() +@@ -171,7 +170,6 @@ apply from: "gradle/classycle.gradle" apply from: "gradle/strictCompile.gradle" apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle" -apply from: "gradle/testSetup.gradle" apply from: "gradle/taskOrdering.gradle" apply from: "gradle/fix-GRADLE-2492.gradle" - + apply from: 'gradle/customM2Check.gradle' @@ -270,7 +268,6 @@ dependsOn ':killExistingDaemons' } @@ -315,11 +315,11 @@ Last-Update: 2015-09-30 testCompile libraries.groovy - -- integTestCompile project(":core") +- integTestCompile project(':core') - integTestRuntime project(':plugins') - -- testFixturesCompile project(":internalTesting") -- testFixturesCompile project(":core") +- testFixturesCompile project(':internalTesting') +- testFixturesCompile project(':core') } useTestFixtures() @@ -327,14 +327,14 @@ Last-Update: 2015-09-30 +++ b/subprojects/platform-native/platform-native.gradle @@ -20,12 +20,6 @@ compile project(':core') - compile project(":platformBase") - compile project(":diagnostics") + compile project(':platformBase') + compile project(':diagnostics') - -- integTestRuntime project(":maven") +- integTestRuntime project(':maven') - // Required to test visual studio project file generation for generated sources -- integTestRuntime project(":ideNative") +- integTestRuntime project(':ideNative') - -- testFixturesCompile project(":internalIntegTesting") +- testFixturesCompile project(':internalIntegTesting') } useTestFixtures() @@ -366,9 +366,9 @@ Last-Update: 2015-09-30 useTestFixtures() --- a/subprojects/plugins/plugins.gradle +++ b/subprojects/plugins/plugins.gradle -@@ -44,8 +44,6 @@ +@@ -42,8 +42,6 @@ + runtime libraries.commons_cli - testCompile "com.google.inject:guice:2.0@jar" testCompile libraries.jsoup - - integTestRuntime project(":maven") @@ -377,12 +377,12 @@ Last-Update: 2015-09-30 evaluationDependsOn(":wrapper") --- a/subprojects/testing-native/testing-native.gradle +++ b/subprojects/testing-native/testing-native.gradle -@@ -20,8 +20,6 @@ - compile project(':languageNative') +@@ -21,8 +21,6 @@ + compile project(':testingBase') testCompile libraries.groovy - -- integTestRuntime project(":ideNative") +- integTestRuntime project(':ideNative') } useTestFixtures() @@ -436,12 +436,12 @@ Last-Update: 2015-09-30 +++ b/subprojects/platform-base/platform-base.gradle @@ -2,7 +2,6 @@ compile libraries.groovy - compile project(":core") - compile project(":dependencyManagement") -- testFixturesCompile project(path: ":modelCore", configuration: "testFixturesUsageRuntime") + compile project(':core') + compile project(':dependencyManagement') +- testFixturesCompile project(path: ':modelCore', configuration: 'testFixturesUsageRuntime') } - //useClassycle(exclude: ["org.gradle.language.base.internal/**"]) + //useClassycle(exclude: ['org.gradle.language.base.internal/**']) --- a/subprojects/platform-play/platform-play.gradle +++ b/subprojects/platform-play/platform-play.gradle @@ -7,17 +7,7 @@ diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff index 043908c..6cd46ab 100644 --- a/debian/patches/docs.diff +++ b/debian/patches/docs.diff @@ -8,10 +8,10 @@ Last-Update: 2015-09-30 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle -@@ -117,12 +117,7 @@ +@@ -121,12 +121,7 @@ [it.name, it.bytes.encodeBase64().toString()] } - + - def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries { - def id = it.moduleVersion.id - ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()] @@ -22,7 +22,7 @@ Last-Update: 2015-09-30 css.inputs.property 'tokens', tokens css.filter ReplaceTokens, tokens: tokens } -@@ -169,10 +164,6 @@ +@@ -173,10 +168,6 @@ include '*.xsl' } from(cssFiles) @@ -31,20 +31,20 @@ Last-Update: 2015-09-30 - eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } - } } - + task samplesDocbook(type: AssembleSamplesDocTask) { -@@ -292,8 +283,8 @@ +@@ -296,8 +287,8 @@ classpath = configurations.userGuideTask } - + -def javaApiUrl = "https://docs.oracle.com/javase/6/docs/api"; -def groovyApiUrl = "http://docs.groovy-lang.org/docs/groovy-${versions.groovy}/html/gapi"; +def javaApiUrl = "file:///usr/share/doc/default-jdk/api/" +def groovyApiUrl = "file:///usr/share/doc/groovy/api/" - + task javadocAll(type: Javadoc) { ext.stylesheetFile = file("src/docs/css/javadoc.css") -@@ -333,8 +324,7 @@ +@@ -337,8 +328,7 @@ include 'org/gradle/model/**' include 'org/gradle/testkit/**' exclude '**/internal/**' @@ -63,7 +63,7 @@ Last-Update: 2015-09-30 - <xsl:import href="html/chunkfast.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:output method="html" doctype-system="http://www.w3.org/TR/html4/strict.dtd"; --- a/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl +++ b/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl @@ -74,7 +74,7 @@ Last-Update: 2015-09-30 - <xsl:import href="html/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:param name="section.autolabel">0</xsl:param> @@ -36,4 +36,4 @@ <xi:include href="userguide.css" parse="text"/> @@ -92,12 +92,12 @@ Last-Update: 2015-09-30 - <xsl:import href="html/chunkfast.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/chunkfast.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:param name="root.filename">userguide</xsl:param> @@ -84,4 +84,4 @@ </div> </xsl:template> - + -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> @@ -111,7 +111,7 @@ Last-Update: 2015-09-30 - <xsl:import href="html/highlight.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/common.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/highlight.xsl"/> - + <xsl:output method="html" encoding="UTF-8" --- a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl @@ -123,7 +123,7 @@ Last-Update: 2015-09-30 - <xsl:import href="xhtml/docbook.xsl"/> + <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/docbook.xsl"/> <xsl:import href="userGuideHtmlCommon.xsl"/> - + <xsl:output method="xml" @@ -59,4 +59,4 @@ <xsl:apply-templates select=".." mode="title.markup"/> diff --git a/debian/patches/eclipse-aether.diff b/debian/patches/eclipse-aether.diff index 11e165e..d4ad21b 100644 --- a/debian/patches/eclipse-aether.diff +++ b/debian/patches/eclipse-aether.diff @@ -4,7 +4,7 @@ Author: Kai-Chung Yan <[email protected]> Last-Update: 2015-09-30 --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -130,11 +130,11 @@ +@@ -131,11 +131,11 @@ dependency 'org.apache.maven.wagon:wagon-http-shared-2.x' //eather: diff --git a/debian/patches/generate_classpath.diff b/debian/patches/generate_classpath.diff index 3149c9a..d35a0bc 100644 --- a/debian/patches/generate_classpath.diff +++ b/debian/patches/generate_classpath.diff @@ -13,6 +13,6 @@ Lasy-Update: 2015-10-03 apply from: 'gradle/buildSplits.gradle' +apply from: 'debian/generate_classpath.gradle' - ext { jvm = org.gradle.internal.jvm.Jvm.current() + javaVersion = JavaVersion.current() diff --git a/debian/patches/generate_pom.diff b/debian/patches/generate_pom.diff index 2de3a80..ec46308 100644 --- a/debian/patches/generate_pom.diff +++ b/debian/patches/generate_pom.diff @@ -11,6 +11,6 @@ Last-Updtae: 2015-10-08 apply from: 'gradle/buildSplits.gradle' apply from: 'debian/generate_classpath.gradle' +apply from: 'debian/generate_pom.gradle' - ext { jvm = org.gradle.internal.jvm.Jvm.current() + javaVersion = JavaVersion.current() diff --git a/debian/patches/jcommander.diff b/debian/patches/jcommander.diff index 35a7d3a..9aa2a29 100644 --- a/debian/patches/jcommander.diff +++ b/debian/patches/jcommander.diff @@ -25,7 +25,7 @@ Last-Update: 2015-09-30 --- a/subprojects/tooling-api-builders/tooling-api-builders.gradle +++ b/subprojects/tooling-api-builders/tooling-api-builders.gradle @@ -2,6 +2,7 @@ - compile project(':plugins') + compile project(':testingJvm') compile project(':launcher') compile project(':toolingApi') + compile "com.beust:jcommander" @@ -34,10 +34,10 @@ Last-Update: 2015-09-30 useClassycle() --- a/subprojects/plugins/plugins.gradle +++ b/subprojects/plugins/plugins.gradle -@@ -39,6 +39,7 @@ - compile libraries.junit +@@ -38,6 +38,7 @@ + compile libraries.commons_io + compile libraries.commons_lang compile libraries.slf4j_api - compile 'org.testng:testng:6.3.1' + compile "com.beust:jcommander" runtime libraries.commons_cli diff --git a/debian/patches/maven-3.3-compatibility.patch b/debian/patches/maven-3.3-compatibility.patch index 5d924f7..c00cb76 100644 --- a/debian/patches/maven-3.3-compatibility.patch +++ b/debian/patches/maven-3.3-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: no --- a/gradle/dependencies.gradle +++ b/gradle/dependencies.gradle -@@ -105,8 +105,13 @@ +@@ -106,8 +106,13 @@ dependency "org.codehaus.plexus:plexus-utils:2.0.6@jar" dependency "org.codehaus.plexus:plexus-interpolation:1.14@jar" dependency "org.codehaus.plexus:plexus-component-annotations-1.5" @@ -19,7 +19,7 @@ Forwarded: no //sonatype plexus dependency "org.sonatype.plexus:plexus-cipher:1.7@jar" -@@ -117,6 +122,7 @@ +@@ -118,6 +123,7 @@ dependency "org.apache.maven:maven3-compat" dependency "org.apache.maven:maven3-model-builder" dependency "org.apache.maven:maven3-model" @@ -27,7 +27,7 @@ Forwarded: no //somewhat core: dependency "org.apache.maven:maven3-artifact" -@@ -135,6 +141,8 @@ +@@ -136,6 +142,8 @@ dependency "org.eclipse.aether:eclipse-aether-spi" dependency "org.eclipse.aether:eclipse-aether-util" dependency 'org.eclipse.aether:eclipse-aether-connector-basic' diff --git a/debian/patches/nekohtml.diff b/debian/patches/nekohtml.diff index 260e14a..7ea6281 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 -@@ -95,6 +95,8 @@ +@@ -96,6 +96,8 @@ jsoup:'org.jsoup:jsoup:1.6.3' ] diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff index 5546c66..4627ab2 100644 --- a/debian/patches/use_local_artifacts.diff +++ b/debian/patches/use_local_artifacts.diff @@ -78,7 +78,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 -@@ -79,13 +79,13 @@ +@@ -80,13 +80,13 @@ libraries += [ dom4j: 'dom4j:dom4j:1.6.1@jar', @@ -95,7 +95,7 @@ Last-Update: 2015-07-08 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 -@@ -95,14 +95,14 @@ +@@ -96,14 +96,14 @@ jsoup:'org.jsoup:jsoup:1.6.3' ] @@ -114,7 +114,7 @@ Last-Update: 2015-07-08 dependency "org.codehaus.plexus:plexus-container-default:1.5.5@jar" dependency "org.codehaus.plexus:plexus-classworlds:2.4@jar" -@@ -111,21 +111,21 @@ +@@ -112,21 +112,21 @@ dependency "org.sonatype.plexus:plexus-sec-dispatcher:1.3@jar" //core: @@ -149,7 +149,7 @@ Last-Update: 2015-07-08 //eather: dependency "org.sonatype.aether:aether-api:1.13.1@jar" -@@ -156,8 +156,8 @@ +@@ -157,8 +157,8 @@ dependency "org.apache.mina:mina-core:2.0.8" } @@ -160,7 +160,7 @@ Last-Update: 2015-07-08 dependency libraries.bouncycastle_provider } -@@ -171,15 +171,3 @@ +@@ -172,15 +172,3 @@ 'com.fasterxml.jackson.core:jackson-annotations:2.3.2@jar', 'com.fasterxml.jackson.core:jackson-databind:2.3.2@jar' ] + libraries.commons_httpclient + libraries.joda -- 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
