This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository gradle.
commit cb21c4e1b6bbc1094a05e9b5d3d1438fdc8aad7f Author: Kai-Chung Yan <[email protected]> Date: Wed Sep 30 06:09:02 2015 +0800 Refresh patches --- debian/changelog | 2 + debian/patches/33_scala_zinc.diff | 21 ++- debian/patches/disable_distributions.diff | 3 +- debian/patches/disable_release_notes.diff | 4 +- debian/patches/disable_sonar.diff | 2 +- debian/patches/disable_tests.diff | 170 +++++++++++---------- debian/patches/docs.diff | 33 ++-- debian/patches/eclipse-aether.diff | 84 +++++----- debian/patches/maven-aether-provider.diff | 14 +- .../{maven_depends.diff => maven_jcommander.diff} | 0 debian/patches/search_system_jar.diff | 33 ++-- debian/patches/series | 3 +- 12 files changed, 177 insertions(+), 192 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9156e52..50b353a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ gradle (2.7-1) UNRELEASED; urgency=low * New upstream release * d/copyright: Simplify file exclusion pattern with *.min.js + * Refresh patches + * Remove maven_testng.diff: No longer needed. -- Kai-Chung Yan <[email protected]> Wed, 30 Sep 2015 04:37:18 +0800 diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff index dd22aef..057bd97 100644 --- a/debian/patches/33_scala_zinc.diff +++ b/debian/patches/33_scala_zinc.diff @@ -3,7 +3,7 @@ Description: No Zinc Compiler (https://github.com/typesafehub/zinc) in Debian. See SBT ITP : http://bugs.debian.org/639910 Author: Damien Raude-Morvan <[email protected]> Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-03 +Last-Update: 2015-09-30 Forwarded: not-needed --- a/subprojects/language-scala/language-scala.gradle +++ b/subprojects/language-scala/language-scala.gradle @@ -12,17 +12,14 @@ Forwarded: not-needed compile project(":languageJava") compile project(":languageJvm") - // keep in sync with ScalaLanguagePlugin code -- provided("com.typesafe.zinc:zinc:0.3.0") - +- provided("com.typesafe.zinc:zinc:0.3.7") + testCompile libraries.groovy } -@@ -14,4 +12,6 @@ - strictCompile() +@@ -15,3 +13,5 @@ useTestFixtures() useTestFixtures(project: ":languageJvm", sourceSet: 'testFixtures') --useTestFixtures(project: ":platformBase") -\ No newline at end of file -+useTestFixtures(project: ":platformBase") + useTestFixtures(project: ":platformBase") + +sourceSets.main.java { exclude "**/ZincScalaCompiler.java" } \ No newline at end of file @@ -44,7 +41,7 @@ Forwarded: not-needed + compile.conventionMapping.zincClasspath = {} } } - + --- 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 @@ @@ -56,7 +53,7 @@ Forwarded: not-needed import org.gradle.language.base.internal.compile.Compiler; import org.gradle.platform.base.internal.toolchain.ToolProvider; @@ -47,12 +46,7 @@ - + @SuppressWarnings("unchecked") public <T extends CompileSpec> org.gradle.language.base.internal.compile.Compiler<T> newCompiler(Class<T> spec) { - if (ScalaJavaJointCompileSpec.class.isAssignableFrom(spec)) { @@ -67,13 +64,13 @@ Forwarded: not-needed - 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."); } - + @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 @@ 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); - return new NormalizingScalaCompiler(scalaCompiler); diff --git a/debian/patches/disable_distributions.diff b/debian/patches/disable_distributions.diff index d7d34a1..dc8d390 100644 --- a/debian/patches/disable_distributions.diff +++ b/debian/patches/disable_distributions.diff @@ -15,7 +15,7 @@ Last-Update: 2015-07-08 include 'core' --- a/build.gradle +++ b/build.gradle -@@ -202,21 +202,4 @@ +@@ -203,22 +203,5 @@ } } @@ -37,3 +37,4 @@ Last-Update: 2015-07-08 - - apply from: "gradle/intTestImage.gradle" + apply from: 'gradle/pullRequestBuild.gradle' diff --git a/debian/patches/disable_release_notes.diff b/debian/patches/disable_release_notes.diff index 01711fe..b4f43a0 100644 --- a/debian/patches/disable_release_notes.diff +++ b/debian/patches/disable_release_notes.diff @@ -13,7 +13,7 @@ Last-Update: 2015-07-02 } tasks.withType(Docbook2Xhtml) { -@@ -391,31 +391,6 @@ +@@ -393,31 +393,6 @@ group = 'documentation' } @@ -45,7 +45,7 @@ Last-Update: 2015-07-02 tasks.addRule("view«Doc Task Name» - Opens entry point") { String taskName -> if (taskName.startsWith("view")) { def realTaskName = (taskName - "view") -@@ -434,15 +409,8 @@ +@@ -436,15 +411,8 @@ sourceSets.main.output.dir generatedResourcesDir, builtBy: defaultImports diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff index ad51e58..6e83bf4 100644 --- a/debian/patches/disable_sonar.diff +++ b/debian/patches/disable_sonar.diff @@ -52,7 +52,7 @@ Last-Update: 2015-07-02 <xi:include href='ideaPlugin.xml'/> --- a/subprojects/docs/src/docs/dsl/dsl.xml +++ b/subprojects/docs/src/docs/dsl/dsl.xml -@@ -391,12 +391,6 @@ +@@ -425,12 +425,6 @@ <td>org.gradle.plugins.signing.Sign</td> </tr> <tr> diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff index 4e54726..8c05be0 100644 --- a/debian/patches/disable_tests.diff +++ b/debian/patches/disable_tests.diff @@ -1,6 +1,6 @@ Description: Disable tests Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-02 +Last-Update: 2015-09-30 --- a/build.gradle +++ b/build.gradle @@ -124,8 +124,6 @@ @@ -11,22 +11,19 @@ Last-Update: 2015-07-02 -apply from: "gradle/testGroupings.gradle" apply from: "gradle/taskOrdering.gradle" apply from: "gradle/fix-GRADLE-2492.gradle" - -@@ -200,6 +198,4 @@ - sleep mins * 60 * 1000 - } + +@@ -203,5 +201,4 @@ } --} -- + } + -apply from: "gradle/intTestImage.gradle" -+} -\ No newline at end of file + apply from: 'gradle/pullRequestBuild.gradle' --- a/gradle/groovyProject.gradle +++ b/gradle/groovyProject.gradle -@@ -67,13 +67,16 @@ +@@ -68,13 +68,16 @@ def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile" def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime" - + + /* dependencies { add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile")) @@ -35,46 +32,47 @@ Last-Update: 2015-07-02 } + */ } - + +/* if (file("src/testFixtures").exists()) { apply from: "$rootDir/gradle/testFixtures.gradle" } -@@ -82,6 +85,8 @@ +@@ -83,6 +86,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,8 +37,6 @@ dists } - + -daemonIntegTest.enabled = false - evaluationDependsOn ":docs" - + ext { --- a/subprojects/launcher/launcher.gradle +++ b/subprojects/launcher/launcher.gradle -@@ -14,21 +14,12 @@ - +@@ -14,9 +14,6 @@ + testCompile libraries.groovy - + - integTestCompile project(':internalIntegTesting') - integTestRuntime project(':plugins') - + testFixturesCompile project(':internalIntegTesting') + startScriptGenerator project(':plugins') - } - - useTestFixtures() +@@ -26,12 +23,6 @@ useTestFixtures(project: ':languageJava') - + useTestFixtures(project: ':messaging') + -integTestTasks.all { - if (isCiServer) { - maxParallelForks = Math.min(3, rootProject.maxParallelForks) @@ -84,10 +82,10 @@ Last-Update: 2015-07-02 jar { manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain") doFirst { -@@ -77,11 +68,4 @@ +@@ -80,11 +71,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. @@ -98,12 +96,13 @@ Last-Update: 2015-07-02 useClassycle() --- a/subprojects/tooling-api/tooling-api.gradle +++ b/subprojects/tooling-api/tooling-api.gradle -@@ -8,33 +8,11 @@ +@@ -7,39 +7,6 @@ + compile project(':wrapper') compile project(':baseServices') publishCompile libraries.slf4j_api - +- - testFixturesCompile project(':baseServicesGroovy') - testCompile libraries.groovy +- testCompile libraries.groovy - - // lots of integTest errors otherwise - integTestCompile project(':internalIntegTesting') @@ -112,14 +111,21 @@ Last-Update: 2015-07-02 - integTestRuntime project(':buildComparison') - integTestRuntime project(":ivy") - integTestRuntime project(":maven") +- - integTestRuntime project(":toolingApiBuilders") - } - - useTestFixtures() - +-} +- +-useTestFixtures() +- -integTestTasks.all { - dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip') +-} +- +-integTest { +- jvmArgs "-XX:MaxPermSize=500m" +-} - +-forkingIntegTest { - if (isCiServer) { - maxParallelForks = Math.min(2, rootProject.maxParallelForks) - } @@ -127,26 +133,24 @@ Last-Update: 2015-07-02 - -daemonIntegTest { - enabled = false //tooling integ tests use daemon anyway, don't rerun --} -- + } + task jarjarJar(type: JarJarJar) { - appendix = "fat" - dependsOn jar --- a/subprojects/wrapper/wrapper.gradle +++ b/subprojects/wrapper/wrapper.gradle @@ -18,8 +18,6 @@ - + testCompile libraries.groovy testCompile libraries.ant - - integTestRuntime rootProject.configurations.testRuntime.allDependencies } - + task buildReceiptResource(type: Copy, dependsOn: rootProject.createBuildReceipt) { @@ -35,9 +33,5 @@ from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output } } - + -integTestTasks.all { - inputs.files { project(":distributions").binZip } -} @@ -155,21 +159,19 @@ Last-Update: 2015-07-02 useClassycle() --- a/subprojects/scala/scala.gradle +++ b/subprojects/scala/scala.gradle -@@ -24,12 +24,6 @@ - - +@@ -24,12 +24,4 @@ + + testCompile libraries.slf4j_api - - integTestRuntime project(":ide") - } - +-} +- -useTestFixtures(project: ":plugins") // includes core test fixtures - --configure([integTest, daemonIntegTest]) { +-integTest { - jvmArgs "-XX:MaxPermSize=1500m" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen --} -+useTestFixtures(project: ":plugins") // includes core test fixtures -\ No newline at end of file + } --- a/settings.gradle +++ b/settings.gradle @@ -41,14 +41,10 @@ @@ -195,7 +197,7 @@ Last-Update: 2015-07-02 compile project(':core') - integTestRuntime project(':plugins') } - + useTestFixtures() --- a/subprojects/build-init/build-init.gradle +++ b/subprojects/build-init/build-init.gradle @@ -206,12 +208,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") - @@ -225,26 +227,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" - + testCompile libraries.xmlunit - - integTestCompile project(":ear") @@ -253,7 +255,7 @@ Last-Update: 2015-07-02 - - testFixturesCompile project(":internalIntegTesting") } - + useTestFixtures() --- a/subprojects/open-api/open-api.gradle +++ b/subprojects/open-api/open-api.gradle @@ -269,30 +271,30 @@ Last-Update: 2015-07-02 +++ 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@js" } --- a/subprojects/dependency-management/dependency-management.gradle +++ b/subprojects/dependency-management/dependency-management.gradle @@ -18,16 +18,6 @@ compile libraries.maven3 - + testCompile libraries.groovy - - integTestRuntime project(":ivy") @@ -305,7 +307,7 @@ Last-Update: 2015-07-02 - - testFixturesCompile project(":internalIntegTesting") } - + if (isWindows && javaVersion.java5) { --- a/subprojects/diagnostics/diagnostics.gradle +++ b/subprojects/diagnostics/diagnostics.gradle @@ -318,13 +320,13 @@ Last-Update: 2015-07-02 - 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") @@ -333,7 +335,7 @@ Last-Update: 2015-07-02 - testFixturesCompile project(":internalTesting") - testFixturesCompile project(":core") } - + useTestFixtures() --- a/subprojects/platform-native/platform-native.gradle +++ b/subprojects/platform-native/platform-native.gradle @@ -348,20 +350,20 @@ Last-Update: 2015-07-02 - - 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 @@ -374,41 +376,41 @@ Last-Update: 2015-07-02 - - 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() --- 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 @@ -420,37 +422,37 @@ Last-Update: 2015-07-02 - // 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 @@ -5,8 +5,6 @@ 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/platform-base/platform-base.gradle +++ b/subprojects/platform-base/platform-base.gradle -@@ -1,7 +1,6 @@ - dependencies { +@@ -2,7 +2,6 @@ compile libraries.groovy compile project(":core") + compile project(":dependencyManagement") - testFixturesCompile project(path: ":modelCore", configuration: "testFixturesUsageRuntime") } - + useClassycle() diff --git a/debian/patches/docs.diff b/debian/patches/docs.diff index 2723748..0215fd6 100644 --- a/debian/patches/docs.diff +++ b/debian/patches/docs.diff @@ -4,14 +4,14 @@ Author: Miguel Landaeta <[email protected]> Damien Raude-Morvan <[email protected]> Kai-Chung Yan <[email protected]> Forwarded: not-needed -Last-Update: 2015-07-08 +Last-Update: 2015-09-30 --- a/subprojects/docs/docs.gradle +++ b/subprojects/docs/docs.gradle @@ -117,12 +117,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()] @@ -31,22 +31,22 @@ Last-Update: 2015-07-08 - eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') } - } } - + task samplesDocbook(type: AssembleSamplesDocTask) { @@ -292,8 +283,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/groovy2/api/" - + task javadocAll(type: Javadoc) { ext.stylesheetFile = file("src/docs/css/javadoc.css") -@@ -331,8 +322,7 @@ - include 'org/gradle/tooling/**' +@@ -333,8 +324,7 @@ include 'org/gradle/model/**' + include 'org/gradle/testkit/**' exclude '**/internal/**' - options.links(javaApiUrl, groovyApiUrl, "http://maven.apache.org/ref/2.2.1/maven-core/apidocs";, - "http://maven.apache.org/ref/2.2.1/maven-model/apidocs";) @@ -63,15 +63,8 @@ Last-Update: 2015-07-08 - <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"; -@@ -209,4 +209,4 @@ - <dt><xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>:</dt> - <dd><xsl:apply-templates/></dd> - </xsl:template> --</xsl:stylesheet> -\ No newline at end of file -+</xsl:stylesheet> --- a/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl +++ b/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl @@ -17,7 +17,7 @@ @@ -81,7 +74,7 @@ Last-Update: 2015-07-08 - <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"/> @@ -99,12 +92,12 @@ Last-Update: 2015-07-08 - <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> @@ -118,7 +111,7 @@ Last-Update: 2015-07-08 - <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 @@ -130,7 +123,7 @@ Last-Update: 2015-07-08 - <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 2d90c53..4e48b75 100644 --- a/debian/patches/eclipse-aether.diff +++ b/debian/patches/eclipse-aether.diff @@ -1,53 +1,47 @@ Description: Maven module originally uses aether which is deprecated. This patch changes it to use eclipse-aether. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-13 +Last-Update: 2015-09-30 --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/SnapshotVersionManager.java -@@ -17,16 +17,16 @@ +@@ -16,13 +16,13 @@ + package org.gradle.api.publication.maven.internal.action; - - import org.gradle.internal.UncheckedException; --import org.sonatype.aether.RepositorySystem; + -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.deployment.DeployRequest; -import org.sonatype.aether.impl.MetadataGenerator; -import org.sonatype.aether.impl.MetadataGeneratorFactory; --import org.sonatype.aether.impl.internal.DefaultDeployer; --import org.sonatype.aether.impl.internal.DefaultRepositorySystem; -import org.sonatype.aether.installation.InstallRequest; -import org.sonatype.aether.metadata.Metadata; -+import org.eclipse.aether.RepositorySystem; +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.deployment.DeployRequest; +import org.eclipse.aether.impl.MetadataGenerator; +import org.eclipse.aether.impl.MetadataGeneratorFactory; -+import org.eclipse.aether.internal.impl.DefaultDeployer; -+import org.eclipse.aether.internal.impl.DefaultRepositorySystem; +import org.eclipse.aether.installation.InstallRequest; +import org.eclipse.aether.metadata.Metadata; - - import java.lang.reflect.Field; + import java.util.Collection; -@@ -53,8 +53,8 @@ + import java.util.Collections; +@@ -35,8 +35,8 @@ } - + @Override - public int getPriority() { - return -100; + public float getPriority() { + return -100.0F; } - + @Override --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenDeployAction.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/MavenDeployAction.java @@ -19,14 +19,14 @@ - import java.util.Collection; - - import org.apache.maven.artifact.ant.RemoteRepository; + import org.gradle.api.GradleException; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; @@ -64,28 +58,27 @@ Last-Update: 2015-07-13 +import org.eclipse.aether.repository.Authentication; +import org.eclipse.aether.repository.Proxy; +import org.eclipse.aether.util.repository.DefaultProxySelector; - import org.gradle.api.GradleException; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; -@@ -61,7 +61,7 @@ + + import java.io.File; + import java.util.Collection; +@@ -56,7 +56,7 @@ throw new GradleException("Must specify a repository for deployment"); } - + - org.sonatype.aether.repository.RemoteRepository aetherRepo = createRepository(gradleRepo); + org.eclipse.aether.repository.RemoteRepository aetherRepo = createRepository(gradleRepo); - + DeployRequest request = new DeployRequest(); request.setRepository(aetherRepo); -@@ -75,23 +75,27 @@ +@@ -68,22 +68,26 @@ repositorySystem.deploy(session, request); } - + - private org.sonatype.aether.repository.RemoteRepository createRepository(RemoteRepository gradleRepo) { -- org.sonatype.aether.repository.RemoteRepository repo = new org.sonatype.aether.repository.RemoteRepository("remote", +- org.sonatype.aether.repository.RemoteRepository repo = new org.sonatype.aether.repository.RemoteRepository("remote", gradleRepo.getLayout(), gradleRepo.getUrl()); + private org.eclipse.aether.repository.RemoteRepository createRepository(RemoteRepository gradleRepo) { -+ org.eclipse.aether.repository.RemoteRepository.Builder repo = new org.eclipse.aether.repository.RemoteRepository.Builder("remote", - gradleRepo.getLayout(), gradleRepo.getUrl()); - ++ org.eclipse.aether.repository.RemoteRepository.Builder repo = new org.eclipse.aether.repository.RemoteRepository.Builder("remote", gradleRepo.getLayout(), gradleRepo.getUrl()); + org.apache.maven.artifact.ant.Authentication auth = gradleRepo.getAuthentication(); if (auth != null) { - repo.setAuthentication(new Authentication(auth.getUserName(), auth.getPassword(), auth.getPrivateKey(), auth.getPassphrase())); @@ -93,7 +86,7 @@ Last-Update: 2015-07-13 + authBuilder.addUsername(auth.getUserName()).addPassword(auth.getPassword()).addPrivateKey(auth.getPrivateKey(), auth.getPassphrase()); + repo.setAuthentication(authBuilder.build()); } - + org.apache.maven.artifact.ant.Proxy proxy = gradleRepo.getProxy(); if (proxy != null) { DefaultProxySelector proxySelector = new DefaultProxySelector(); @@ -105,7 +98,7 @@ Last-Update: 2015-07-13 - repo.setProxy(proxySelector.getProxy(repo)); + repo.setProxy(proxySelector.getProxy(repo.build())); } - + - return repo; + return repo.build(); } @@ -115,7 +108,7 @@ Last-Update: 2015-07-13 @@ -18,11 +18,11 @@ import java.io.File; import java.util.Collection; - + -import org.sonatype.aether.RepositorySystem; -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; @@ -126,12 +119,12 @@ Last-Update: 2015-07-13 +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.installation.InstallRequest; +import org.eclipse.aether.installation.InstallationException; - + public class MavenInstallAction extends AbstractMavenPublishAction { - + --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java -@@ -25,14 +25,15 @@ +@@ -27,16 +27,16 @@ import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.gradle.api.GradleException; import org.gradle.internal.UncheckedException; @@ -140,6 +133,8 @@ Last-Update: 2015-07-13 -import org.sonatype.aether.RepositorySystemSession; -import org.sonatype.aether.artifact.Artifact; -import org.sonatype.aether.artifact.ArtifactType; +-import org.sonatype.aether.impl.Deployer; +-import org.sonatype.aether.impl.internal.DefaultDeployer; -import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager; -import org.sonatype.aether.util.DefaultRepositorySystemSession; -import org.sonatype.aether.util.artifact.DefaultArtifact; @@ -148,26 +143,27 @@ Last-Update: 2015-07-13 +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.artifact.ArtifactType; ++import org.eclipse.aether.impl.Deployer; ++import org.eclipse.aether.internal.impl.DefaultDeployer; +import org.eclipse.aether.repository.LocalRepository; -+import org.eclipse.aether.internal.impl.DefaultRepositorySystem; +import org.eclipse.aether.DefaultRepositorySystemSession; +import org.eclipse.aether.artifact.DefaultArtifact; - + import java.io.File; import java.io.FileReader; -@@ -61,7 +62,7 @@ +@@ -66,7 +66,7 @@ } - + public void setLocalMavenRepositoryLocation(File localMavenRepository) { - session.setLocalRepositoryManager(new SimpleLocalRepositoryManager(localMavenRepository)); + session.setLocalRepositoryManager(new DefaultRepositorySystem().newLocalRepositoryManager(session, new LocalRepository(localMavenRepository))); } - + public void setMainArtifact(File file) { --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/LoggingMavenTransferListener.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/LoggingMavenTransferListener.java @@ -18,9 +18,9 @@ - + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sonatype.aether.transfer.AbstractTransferListener; @@ -176,7 +172,7 @@ Last-Update: 2015-07-13 +import org.eclipse.aether.transfer.AbstractTransferListener; +import org.eclipse.aether.transfer.TransferEvent; +import org.eclipse.aether.transfer.TransferEvent.RequestType; - + class LoggingMavenTransferListener extends AbstractTransferListener { private static final Logger LOGGER = LoggerFactory.getLogger(LoggingMavenTransferListener.class); --- a/subprojects/build-init/src/main/groovy/org/gradle/buildinit/plugins/internal/maven/MavenProjectsCreator.java @@ -190,5 +186,5 @@ Last-Update: 2015-07-13 +import org.eclipse.aether.RepositorySystemSession; +import org.eclipse.aether.DefaultRepositorySystemSession; import org.gradle.util.CollectionUtils; - + import java.io.File; diff --git a/debian/patches/maven-aether-provider.diff b/debian/patches/maven-aether-provider.diff index d2a4100..dc50b44 100644 --- a/debian/patches/maven-aether-provider.diff +++ b/debian/patches/maven-aether-provider.diff @@ -1,23 +1,23 @@ Description: Maven module uses a deprecated API of maven-aether-provider. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-13 +Last-Update: 2015-09-30 --- a/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java +++ b/subprojects/maven/src/main/groovy/org/gradle/api/publication/maven/internal/action/AbstractMavenPublishAction.java @@ -18,7 +18,7 @@ - + import org.apache.maven.model.Model; import org.apache.maven.model.io.xpp3.MavenXpp3Reader; -import org.apache.maven.repository.internal.MavenRepositorySystemSession; +import org.apache.maven.repository.internal.MavenRepositorySystemUtils; + import org.apache.maven.repository.internal.SnapshotMetadataGeneratorFactory; + import org.apache.maven.repository.internal.VersionsMetadataGeneratorFactory; import org.codehaus.plexus.DefaultPlexusContainer; - import org.codehaus.plexus.PlexusContainer; - import org.codehaus.plexus.PlexusContainerException; -@@ -52,7 +52,7 @@ - +@@ -56,7 +56,7 @@ + protected AbstractMavenPublishAction(File pomFile) { container = newPlexusContainer(); - session = new MavenRepositorySystemSession(); + session = MavenRepositorySystemUtils.newSession(); session.setTransferListener(new LoggingMavenTransferListener()); session.getConfigProperties().put("maven.metadata.legacy", "true"); - + diff --git a/debian/patches/maven_depends.diff b/debian/patches/maven_jcommander.diff similarity index 100% rename from debian/patches/maven_depends.diff rename to debian/patches/maven_jcommander.diff diff --git a/debian/patches/search_system_jar.diff b/debian/patches/search_system_jar.diff index 87e563d..0c92289 100644 --- a/debian/patches/search_system_jar.diff +++ b/debian/patches/search_system_jar.diff @@ -5,34 +5,29 @@ Description: Gradle searches its own directory for Java libraries ignoring may be possible to remove. Maintaining so many symlinks is too error prone. Author: Kai-Chung Yan <[email protected]> -Last-Update: 2015-07-02 ---- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java -+++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultModuleRegistry.java -@@ -74,6 +74,7 @@ - +Last-Update: 2015-09-30 +--- a/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultGradleDistributionLocator.java ++++ b/subprojects/core/src/main/groovy/org/gradle/api/internal/classpath/DefaultGradleDistributionLocator.java +@@ -42,6 +42,7 @@ + if (distDir != null) { libDirs.addAll(findLibDirs(distDir)); -+ libDirs.add(new File("/usr/share/java/")); ++ libDirs.add(new File("/usr/share/java")); } } - -@@ -91,18 +92,7 @@ - } - - private static File findDistDir() { -- File codeSource = ClasspathUtil.getClasspathForClass(DefaultModuleRegistry.class); + +@@ -69,13 +70,7 @@ + }; + + private static File findDistDir(Class<?> clazz) { +- File codeSource = ClasspathUtil.getClasspathForClass(clazz); - if (codeSource.isFile()) { -- // Loaded from a JAR - let's see if its in the lib directory, and there's a lib/plugins directory -- File libDir = codeSource.getParentFile(); -- if (!libDir.getName().equals("lib") || !new File(libDir, "plugins").isDirectory()) { -- return null; -- } -- return libDir.getParentFile(); +- return determineDistRootDir(codeSource); - } else { - // Loaded from a classes dir - assume we're running from the ide or tests - return null; - } + return new File("/usr/share/gradle"); } - + /** diff --git a/debian/patches/series b/debian/patches/series index a3c3ea4..caec092 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,11 +15,10 @@ search_system_jar.diff 26_disable_commitid.diff disable_aws.diff taskOrdering.diff -maven_depends.diff +maven_jcommander.diff nekohtml.diff relax_warnings.diff disable_java9.diff -maven_testng.diff eclipse-aether.diff maven-aether-provider.diff maven_builder_support.diff -- 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
