[gradle] 04/05: Refresh patches
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Sat Jan 16 16:11:04 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository gradle.
commit bca8cf037a2ef69c85d0f7be03b57876997fb767
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Sun Jan 17 00:08:42 2016 +0800
Refresh patches
---
debian/patches/26_disable_commitid.diff | 4 +-
debian/patches/disable_sonar.diff | 13 +----
debian/patches/disable_tests.diff | 84 +++++++++++++++++----------------
debian/patches/use_local_artifacts.diff | 14 +++---
4 files changed, 54 insertions(+), 61 deletions(-)
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
index 0ba10d3..e97dd2a 100644
--- a/debian/patches/26_disable_commitid.diff
+++ b/debian/patches/26_disable_commitid.diff
@@ -13,7 +13,7 @@ Last-Update: 2012-08-18
ext.commitId = null
doLast {
-@@ -98,9 +98,9 @@
+@@ -103,9 +103,9 @@
throw new InvalidUserDataException("Could not determine commit id")
}
}
@@ -25,7 +25,7 @@ Last-Update: 2012-08-18
ext.receiptFile = file("$buildDir/$buildReceiptFileName")
outputs.file receiptFile
outputs.upToDateWhen { false }
-@@ -122,7 +122,7 @@
+@@ -127,7 +127,7 @@
}
}
def data = [
diff --git a/debian/patches/disable_sonar.diff b/debian/patches/disable_sonar.diff
index 0a10c0e..11693da 100644
--- a/debian/patches/disable_sonar.diff
+++ b/debian/patches/disable_sonar.diff
@@ -35,20 +35,9 @@ Last-Update: 2015-07-02
<td>Analyzes a project hierarchy and stores the results in the Sonar database.</td>
</tr>
</table>
---- a/subprojects/docs/src/docs/userguide/userguide.xml
-+++ b/subprojects/docs/src/docs/userguide/userguide.xml
-@@ -61,8 +61,6 @@
- <xi:include href='jdependPlugin.xml'/>
- <xi:include href='pmdPlugin.xml'/>
- <xi:include href='jacocoPlugin.xml'/>
-- <xi:include href='sonarPlugin.xml'/>
-- <xi:include href='sonarRunnerPlugin.xml'/>
- <xi:include href='osgi.xml'/>
- <xi:include href='eclipsePlugin.xml'/>
- <xi:include href='ideaPlugin.xml'/>
--- a/subprojects/docs/src/docs/dsl/dsl.xml
+++ b/subprojects/docs/src/docs/dsl/dsl.xml
-@@ -425,12 +425,6 @@
+@@ -428,12 +428,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 093045f..a07ba9c 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -65,45 +65,6 @@ Last-Update: 2015-09-30
evaluationDependsOn ":docs"
ext {
---- a/subprojects/launcher/launcher.gradle
-+++ b/subprojects/launcher/launcher.gradle
-@@ -14,11 +14,6 @@
-
- testCompile libraries.groovy
-
-- integTestCompile project(':internalIntegTesting')
-- integTestRuntime project(':plugins')
--
-- testFixturesCompile project(':internalIntegTesting')
--
- startScriptGenerator project(':plugins')
- }
-
-@@ -26,12 +21,6 @@
- useTestFixtures(project: ':languageJava')
- useTestFixtures(project: ':messaging')
-
--integTestTasks.all {
-- if (isCiServer) {
-- maxParallelForks = Math.min(3, rootProject.maxParallelForks)
-- }
--}
--
- jar {
- manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain")
- doFirst {
-@@ -80,11 +69,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/**/*"
--}
--
- useClassycle()
--- a/subprojects/tooling-api/tooling-api.gradle
+++ b/subprojects/tooling-api/tooling-api.gradle
@@ -7,39 +7,6 @@
@@ -468,7 +429,7 @@ Last-Update: 2015-09-30
//useClassycle(exclude: ["org.gradle.language.base.internal/**"])
--- a/subprojects/platform-play/platform-play.gradle
+++ b/subprojects/platform-play/platform-play.gradle
-@@ -7,16 +7,7 @@
+@@ -7,17 +7,7 @@
compile project(":languageScala")
compile project(":javascript")
compile project(":diagnostics")
@@ -482,6 +443,7 @@ Last-Update: 2015-09-30
-useTestFixtures(project: ':languageJvm', sourceSet: 'testFixtures')
-useTestFixtures(project: ":launcher", sourceSet: 'testFixtures')
-useTestFixtures(project: ":diagnostics")
+-useTestFixtures(project: ':platformBase')
-
useClassycle()
strictCompile()
@@ -511,3 +473,45 @@ Last-Update: 2015-09-30
- }
+ return task
}
+--- a/subprojects/launcher/launcher.gradle
++++ b/subprojects/launcher/launcher.gradle
+@@ -16,14 +16,6 @@
+
+ testCompile libraries.groovy
+
+- integTestCompile project(':internalIntegTesting')
+- integTestRuntime project(':plugins')
+-
+- testFixturesCompile project(':internalIntegTesting')
+-
+- // Needed for testing debug command line option
+- testFixturesCompile files(Jvm.current().toolsJar)
+-
+ startScriptGenerator project(':plugins')
+ }
+
+@@ -31,12 +23,6 @@
+ useTestFixtures(project: ':languageJava')
+ useTestFixtures(project: ':messaging')
+
+-integTestTasks.all {
+- if (isCiServer) {
+- maxParallelForks = Math.min(3, rootProject.maxParallelForks)
+- }
+-}
+-
+ jar {
+ manifest.mainAttributes('Main-Class': "org.gradle.launcher.GradleMain")
+ doFirst {
+@@ -85,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.
+- //excluding to avoid unnecessary re-running and stealing resources.
+- exclude "org/gradle/launcher/daemon/**/*"
+-}
+-
+ useClassycle()
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 1bf4eae..3af0e1f 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -26,19 +26,19 @@ Last-Update: 2015-07-08
repositories {
- maven { url 'https://repo.gradle.org/gradle/libs' }
- mavenCentral()
-+ maven { url "/usr/share/maven-repo" }
-+ flatDir { dirs "/usr/share/java" }
++ maven { url 'file:///usr/share/maven-repo' }
++ flatDir { dirs '/usr/share/java' }
}
dependencies {
compile gradleApi()
- compile 'com.google.guava:guava-jdk5:14.0.1 at jar'
-+ compile 'com.google.guava:guava:[14.0.1, )@jar'
++ compile 'com.google.guava:guava:[14.0.1, )'
compile 'commons-lang:commons-lang:2.6 at jar'
compile localGroovy()
testCompile 'junit:junit:4.12 at jar'
-- testCompile 'org.spockframework:spock-core:0.7-groovy-2.0 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
-+ testCompile 'org.spockframework:spock-core:0.7-groovy-2.0 at jar', 'cglib:cglib3-nodep', 'org.objenesis:objenesis:1.2'
+- testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
++ testCompile 'org.spockframework:spock-core:1.0-groovy-2.4 at jar', 'cglib:cglib3-nodep', 'org.objenesis:objenesis:1.2'
- compile "org.pegdown:pegdown:1.1.0"
+ compile "org.pegdown:pegdown:[1.1.0, )"
@@ -73,7 +73,7 @@ Last-Update: 2015-07-08
libraries.commons_io = dependencies.module(versions.commons_io)
-libraries.commons_lang = 'commons-lang:commons-lang:2.6 at jar'
-libraries.commons_collections = 'commons-collections:commons-collections:3.2.1 at jar'
--libraries.jsch = "com.jcraft:jsch:0.1.51"
+-libraries.jsch = "com.jcraft:jsch:0.1.53"
-libraries.ivy = dependencies.module('org.apache.ivy:ivy:2.2.0'){
+libraries.commons_lang = 'commons-lang:commons-lang'
+libraries.commons_collections = 'commons-collections:commons-collections3'
@@ -111,7 +111,7 @@ Last-Update: 2015-07-08
// Jetty
-libraries.servlet_api = "org.mortbay.jetty:servlet-api:2.5-20081211 at jar"
-+libraries.servlet_api = "javax.servlet:servlet-api-3.1 at jar"
++libraries.servlet_api = "javax.servlet:servlet-api-3.1"
libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
dependency libraries.slf4j_api
dependency libraries.servlet_api
--
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