[gradle] 07/08: refreshed 13, 32, 33 patches
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Fri May 16 07:04:44 UTC 2014
This is an automated email from the git hooks/post-receive script.
eugene-guest pushed a commit to branch 1.8
in repository gradle.
commit 1bb21ebf0d39e5f7dbff87d44158beaf1d93276c
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date: Thu May 15 10:42:53 2014 +0000
refreshed 13, 32, 33 patches
---
debian/patches/13_fix_javadocs_links.diff | 8 +-
debian/patches/32_disable_it.diff | 165 ++++++++++++++++++++++++++----
debian/patches/33_scala_zinc.diff | 20 +++-
3 files changed, 166 insertions(+), 27 deletions(-)
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
index 0311aee..c506847 100644
--- a/debian/patches/13_fix_javadocs_links.diff
+++ b/debian/patches/13_fix_javadocs_links.diff
@@ -6,7 +6,7 @@ Last-Update: 2012-08-18
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -275,8 +275,10 @@
+@@ -301,8 +301,10 @@
classpath = configurations.userGuideTask
}
@@ -19,9 +19,9 @@ Last-Update: 2012-08-18
task javadocAll(type: Javadoc) {
ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -298,8 +300,7 @@
- include 'org/gradle/testfixtures/**'
- include 'org/gradle/tooling/**'
+@@ -328,8 +330,7 @@
+ include 'org/gradle/testing/jacoco/**'
+ include 'org/gradle/buildsetup/**'
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")
diff --git a/debian/patches/32_disable_it.diff b/debian/patches/32_disable_it.diff
index aba0674..8572902 100644
--- a/debian/patches/32_disable_it.diff
+++ b/debian/patches/32_disable_it.diff
@@ -1,23 +1,12 @@
-Description: Disable integration tests until Apache SSHD
+Description: Disable integration tests until Apache SSHD
and littleproxy are packaged in Debian.
Author: Damien Raude-Morvan <drazzib at debian.org>
Bug-Debian: http://bugs.debian.org/683639
Forwarded: not-needed
Last-Update: 2012-09-03
---- a/gradle/integTest.gradle
-+++ b/gradle/integTest.gradle
-@@ -13,7 +13,7 @@
- }
-
- dependencies {
-- integTestCompile project(":internalIntegTesting")
-+ //integTestCompile project(":internalIntegTesting")
-
- //so that implicit help tasks are available:
- integTestRuntime project(':diagnostics')
---- a/settings.gradle
-+++ b/settings.gradle
+--- gradle-1.8.orig/settings.gradle
++++ gradle-1.8/settings.gradle
@@ -42,7 +42,7 @@
include 'ear'
include 'native'
@@ -27,8 +16,8 @@ Last-Update: 2012-09-03
include 'performance'
include 'javascript'
include 'buildComparison'
---- a/subprojects/core/core.gradle
-+++ b/subprojects/core/core.gradle
+--- gradle-1.8.orig/subprojects/core/core.gradle
++++ gradle-1.8/subprojects/core/core.gradle
@@ -58,7 +58,7 @@
testFixturesCompile project(":internalTesting")
testFixturesRuntime project(':coreImpl')
@@ -38,8 +27,8 @@ Last-Update: 2012-09-03
//reports 'css3-pie:css3-pie:1.0beta3'
}
---- a/subprojects/performance/performance.gradle
-+++ b/subprojects/performance/performance.gradle
+--- gradle-1.8.orig/subprojects/performance/performance.gradle
++++ gradle-1.8/subprojects/performance/performance.gradle
@@ -12,16 +12,16 @@ repositories {
dependencies {
@@ -64,3 +53,143 @@ Last-Update: 2012-09-03
testCompile libraries.jsoup
}
+--- gradle-1.8.orig/buildSrc/src/test/groovy/org/gradle/build/docs/model/SimpleClassMetaDataRepositoryTest.groovy
++++ gradle-1.8/buildSrc/src/test/groovy/org/gradle/build/docs/model/SimpleClassMetaDataRepositoryTest.groovy
+@@ -65,7 +65,7 @@ class SimpleClassMetaDataRepositoryTest
+ 1 * cl.call(['class2', value2] as Object[])
+ 0 * cl._
+ }
+-
++/*
+ def canIterateOverClassesUsingAction() {
+ TestDomainObject value1 = new TestDomainObject('a')
+ TestDomainObject value2 = new TestDomainObject('a')
+@@ -81,7 +81,7 @@ class SimpleClassMetaDataRepositoryTest
+ 1 * action.execute(value2)
+ 0 * action._
+ }
+-
++*/
+ def canPersistMetaData() {
+ TestDomainObject value = new TestDomainObject('a')
+ File file = tmpDir.newFile()
+--- gradle-1.8.orig/gradle/integTest.gradle
++++ gradle-1.8/gradle/integTest.gradle
+@@ -13,7 +13,7 @@
+ }
+
+ dependencies {
+- integTestCompile project(":internalIntegTesting")
++ //integTestCompile project(":internalIntegTesting")
+
+ //so that implicit help tasks are available:
+ integTestRuntime project(':diagnostics')
+@@ -29,7 +29,7 @@ integTestTasks.all { Test task ->
+ testSrcDirs = []
+ jvmArgs '-Xmx512m', '-XX:MaxPermSize=256m', '-XX:+HeapDumpOnOutOfMemoryError'
+
+- reports.junitXml.destination = file("${project.testResultsDir}/$name")
++// reports.junitXml.destination = file("${project.testResultsDir}/$name")
+
+ systemProperties['org.gradle.integtest.versions'] = project.hasProperty("testAllVersions") ? 'all' : 'latest'
+ if (project.hasProperty('crossVersionTestsOnly')) {
+@@ -41,7 +41,7 @@ integTestTasks.all { Test task ->
+
+ dependsOn project.task("configure${task.name.capitalize()}") << {
+ configure(task) {
+- reports.html.destination = file("${project.reporting.baseDir}/$name")
++// reports.html.destination = file("${project.reporting.baseDir}/$name")
+ systemProperties['integTest.gradleHomeDir'] = rootProject.intTestImage.destinationDir.absolutePath
+ systemProperties['integTest.gradleUserHomeDir'] = rootProject.file('intTestHomeDir').absolutePath
+ systemProperties['integTest.libsRepo'] = rootProject.file('build/repo')
+@@ -56,7 +56,7 @@ integTestTasks.all { Test task ->
+ }
+ }
+ }
+-
++/*
+ task integTest(type: Test) {
+ def defaultExecuter = project.hasProperty("defaultIntegTestExecuter") ? project.defaultIntegTestExecuter : "embedded"
+ systemProperties['org.gradle.integtest.executer'] = defaultExecuter
+@@ -69,7 +69,7 @@ check.dependsOn(integTest)
+ systemProperties['org.gradle.integtest.executer'] = mode
+ }
+ }
+-
++*/
+ plugins.withType(org.gradle.plugins.ide.idea.IdeaPlugin) { // lazy as plugin not applied yet
+ idea {
+ module {
+--- gradle-1.8.orig/subprojects/distributions/distributions.gradle
++++ gradle-1.8/subprojects/distributions/distributions.gradle
+@@ -37,7 +37,7 @@ configurations {
+ dists
+ }
+
+-daemonIntegTest.enabled = false
++//daemonIntegTest.enabled = false
+
+ evaluationDependsOn ":docs"
+
+@@ -125,7 +125,8 @@ task outputsZip(type: Zip) {
+ artifacts {
+ dists allZip, binZip, srcZip
+ }
+-
++/*
+ integTest {
+ inputs.files allZip, binZip, srcZip
+-}
+\ No newline at end of file
++}
++*/
+--- gradle-1.8.orig/subprojects/integ-test/integ-test.gradle
++++ gradle-1.8/subprojects/integ-test/integ-test.gradle
+@@ -25,9 +25,9 @@ integTestTasks.all {
+ // E.g. ./gradlew integTest:integTest -D:integTest:integTest.single=UserGuideSamplesIntegrationTest -Dorg.gradle.userguide.samples.filter=signing/.+
+ systemProperty "org.gradle.userguide.samples.filter", System.getProperty("org.gradle.userguide.samples.filter")
+ }
+-
++/*
+ parallelIntegTest {
+ systemProperty "org.gradle.userguide.samples.exclude", "multiProjectBuildSrc,multiprojectMessagesHack"
+ }
+-
+-useClassycle()
+\ No newline at end of file
++*/
++useClassycle()
+--- gradle-1.8.orig/subprojects/launcher/launcher.gradle
++++ gradle-1.8/subprojects/launcher/launcher.gradle
+@@ -71,11 +71,11 @@ class StartScriptGenerator extends Defau
+ }
+ }
+
+-daemonIntegTest {
++//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/**/*"
+-}
++// exclude "org/gradle/launcher/daemon/**/*"
++//}
+
+-useClassycle()
+\ No newline at end of file
++useClassycle()
+--- gradle-1.8.orig/subprojects/tooling-api/tooling-api.gradle
++++ gradle-1.8/subprojects/tooling-api/tooling-api.gradle
+@@ -23,9 +23,9 @@ integTestTasks.all {
+ dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
+ }
+
+-daemonIntegTest {
+- enabled = false //tooling integ tests use daemon anyway, don't rerun
+-}
++//daemonIntegTest {
++// enabled = false //tooling integ tests use daemon anyway, don't rerun
++//}
+
+ task jarjarJar(type: JarJarJar) {
+ appendix = "fat"
diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index cd1418f..98f6e6b 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -14,7 +14,7 @@ Forwarded: not-needed
+ // provided("com.typesafe.zinc:zinc:0.2.1")
testCompile libraries.slf4j_api
-
+
integTestRuntime project(":ide")
}
@@ -24,10 +24,20 @@ Forwarded: not-needed
useTestFixtures(project: ":plugins") // includes core test fixtures
if (!javaVersion.java6Compatible) {
+@@ -39,6 +42,6 @@
+ }
+ }
+
+-configure([integTest, daemonIntegTest]) {
+- jvmArgs "-XX:MaxPermSize=1g" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen
+-}
++//configure([integTest, daemonIntegTest]) {
++// jvmArgs "-XX:MaxPermSize=1g" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen
++//}
--- 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
-@@ -195,11 +195,11 @@
- compile.conventionMapping.scalaClasspath = { inferScalaCompilerClasspath(compile.classpath) }
+@@ -151,11 +151,11 @@
+ compile.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(compile.classpath) }
compile.conventionMapping.zincClasspath = {
def config = project.configurations[ZINC_CONFIGURATION_NAME]
- if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) {
@@ -43,8 +53,8 @@ Forwarded: not-needed
config
}
}
-@@ -212,4 +212,4 @@
- scalaDoc.conventionMapping.scalaClasspath = { inferScalaCompilerClasspath(scalaDoc.classpath) }
+@@ -168,4 +168,4 @@
+ scalaDoc.conventionMapping.scalaClasspath = { scalaRuntime.inferScalaClasspath(scalaDoc.classpath) }
}
}
-}
--
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