[gradle-1.12] 75/211: Refresh patches for 1.4
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:10 UTC 2015
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 083305248e9a2985cb97011343d2d6ac5a68df95
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed Feb 6 00:03:29 2013 +0100
Refresh patches for 1.4
---
debian/bootstrap.sh | 4 +--
debian/patches/01_use_debian_jars.diff | 46 ++++++++++++++++---------------
debian/patches/02_sonar.diff | 6 ++--
debian/patches/13_fix_javadocs_links.diff | 6 ++--
debian/patches/21_docs.diff | 33 ++++++++++++----------
debian/patches/24_pegdown.diff | 33 ++++++++++------------
debian/patches/26_disable_commitid.diff | 4 +--
debian/patches/27_maven.diff | 2 +-
debian/patches/31_hamcrest_12.diff | 4 +--
debian/patches/32_disable_it.diff | 12 ++++----
debian/patches/33_scala_zinc.diff | 16 +++++------
11 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index 2918ed8..63c71c9 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -2,10 +2,10 @@
set -e
-URL="http://services.gradle.org/distributions/gradle-1.3-bin.zip"
+URL="http://services.gradle.org/distributions/gradle-1.4-bin.zip"
ZIP="$(basename $URL)"
DIR="$(echo $ZIP | sed 's/-bin\.zip$//')"
-VERSION="1.3+bootstrap"
+VERSION="1.4+bootstrap"
wget $URL -O $ZIP
unzip $ZIP
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index 91189d8..1fa4ada 100644
--- a/debian/patches/01_use_debian_jars.diff
+++ b/debian/patches/01_use_debian_jars.diff
@@ -14,7 +14,7 @@ Last-Update: 2012-08-18
defaultTasks 'assemble'
apply plugin: 'java-base'
-@@ -102,7 +103,11 @@
+@@ -107,7 +108,11 @@
group = 'org.gradle'
repositories {
@@ -27,7 +27,7 @@ Last-Update: 2012-08-18
}
}
-@@ -187,4 +192,4 @@
+@@ -193,4 +198,4 @@
installDirPropertyName = 'gradle_installPath'
}
@@ -65,9 +65,9 @@ Last-Update: 2012-08-18
compile 'com.google.guava:guava:11.0.2 at jar'
compile 'commons-lang:commons-lang:2.6 at jar'
groovy localGroovy()
-- testCompile 'junit:junit:4.10 at jar'
+- testCompile 'junit:junit:4.11 at jar'
+ testCompile 'junit:junit4:4.x at jar'
- testCompile 'org.spockframework:spock-core:0.6-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
+ testCompile 'org.spockframework:spock-core:0.7-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
compile "org.pegdown:pegdown:1.1.0"
--- a/gradle/dependencies.gradle
@@ -88,11 +88,11 @@ Last-Update: 2012-08-18
}
-libraries.jcip = "net.jcip:jcip-annotations:1.0 at jar"
-libraries.inject = dependencies.module('javax.inject:javax.inject:1')
-+libraries.jcip = "net.jcip:jcip:1.0 at jar"
++libraries.jcip = "net.jcip:jcip:debian"
+libraries.inject = dependencies.module('javax.inject:atinject-jsr330-api:1.0')
// Logging
- libraries.slf4j_api = 'org.slf4j:slf4j-api:1.6.6 at jar'
+ libraries.slf4j_api = 'org.slf4j:slf4j-api:1.7.2 at jar'
@@ -54,7 +54,7 @@
}
@@ -102,22 +102,24 @@ Last-Update: 2012-08-18
libraries.jetty_util = dependencies.module("org.mortbay.jetty:jetty-util:6.1.25") {
dependency libraries.slf4j_api
dependency libraries.servlet_api
-@@ -84,42 +84,44 @@
- jsr305: 'com.google.code.findbugs:jsr305:1.3.9',
+@@ -83,44 +83,46 @@
+ jsr305: 'com.google.code.findbugs:jsr305:1.3.9 at jar',
groovy: 'org.codehaus.groovy:groovy-all:1.8.6 at jar',
jaxen: 'jaxen:jaxen:1.1 at jar',
-- jcip: "net.jcip:jcip-annotations:1.0",
+- jcip: "net.jcip:jcip-annotations:1.0 at jar",
+ jcip: "net.jcip:jcip:debian",
jna: 'net.java.dev.jna:jna:3.2.7 at jar',
-- junit: 'junit:junit:4.10',
-+ junit: 'junit:junit4:4.10',
+- junit: 'junit:junit:4.11 at jar',
++ junit: 'junit:junit4:4.x at jar',
xmlunit: 'xmlunit:xmlunit:1.3',
- nekohtml: 'net.sourceforge.nekohtml:nekohtml:1.9.14',
+ nekohtml: dependencies.module('net.sourceforge.nekohtml:nekohtml:1.9.14') {
-+ dependency "xerces:xercesImpl:debian at jar"
-+ },
++ dependency "xerces:xercesImpl:debian at jar"
++ },
xbean: 'org.apache.xbean:xbean-reflect:3.4 at jar', //required by maven3 classes
- nativePlatform: 'net.rubygrapefruit:native-platform:0.2'
+ nativePlatform: 'net.rubygrapefruit:native-platform:0.2',
+ xerces: "xerces:xercesImpl:2.9.1",
+ objenesis: 'org.objenesis:objenesis:1.2 at jar'
]
-libraries.maven3 = dependencies.module("org.apache.maven:maven-core:3.0.4") {
@@ -166,24 +168,24 @@ Last-Update: 2012-08-18
//eather:
dependency "org.sonatype.aether:aether-api:1.13.1 at jar"
-@@ -135,11 +137,11 @@
+@@ -136,11 +138,11 @@
'cglib:cglib-nodep:2.2.2'
]
libraries.jmock = [
- 'org.jmock:jmock:2.5.1',
+ 'org.jmock:jmock2:2.5.1',
- 'org.hamcrest:hamcrest-core:1.1',
- 'org.hamcrest:hamcrest-library:1.1',
+ 'org.hamcrest:hamcrest-core:1.3',
+ 'org.hamcrest:hamcrest-library:1.3',
- dependencies.create('org.jmock:jmock-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
- 'org.jmock:jmock-legacy:2.5.1',
+ dependencies.create('org.jmock:jmock2-junit4:2.5.1') { exclude group: 'junit', module: 'junit-dep' }, //junit-dep pulls old definitions of core junit types.
+ 'org.jmock:jmock2-legacy:2.5.1',
- 'org.objenesis:objenesis:1.2',
+ libraries.objenesis,
'cglib:cglib-nodep:2.2'
]
--- a/subprojects/core-impl/core-impl.gradle
+++ b/subprojects/core-impl/core-impl.gradle
-@@ -68,4 +68,4 @@
+@@ -69,4 +69,4 @@
move(file: plexusSecNoComps, tofile: plexusSec)
}
}
@@ -192,7 +194,7 @@ Last-Update: 2012-08-18
+}
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
-@@ -57,7 +57,7 @@
+@@ -61,7 +61,7 @@
integTestCompile project(":internalIntegTesting")
@@ -294,7 +296,7 @@ Last-Update: 2012-08-18
+useTestFixtures()
--- a/subprojects/maven/maven.gradle
+++ b/subprojects/maven/maven.gradle
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
compile libraries.maven_ant_tasks
compile "org.sonatype.pmaven:pmaven-common:0.8-20100325 at jar"
compile "org.sonatype.pmaven:pmaven-groovy:0.8-20100325 at jar"
@@ -327,7 +329,7 @@ Last-Update: 2012-08-18
--- a/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java
+++ b/subprojects/plugins/src/main/groovy/org/gradle/api/internal/tasks/testing/junit/report/DefaultTestReport.java
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
public DefaultTestReport() {
htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js"));
htmlRenderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css"));
diff --git a/debian/patches/02_sonar.diff b/debian/patches/02_sonar.diff
index 5fd917c..fe5b0fb 100644
--- a/debian/patches/02_sonar.diff
+++ b/debian/patches/02_sonar.diff
@@ -6,7 +6,7 @@ Last-Update: 2012-08-18
--- a/build.gradle
+++ b/build.gradle
-@@ -82,7 +82,7 @@
+@@ -87,7 +87,7 @@
publishedProjects = [project(':core'), project(':toolingApi'), project(':wrapper'), project(':baseServices'), project(':messaging')]
pluginProjects = [
'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven',
@@ -28,7 +28,7 @@ Last-Update: 2012-08-18
include 'ear'
--- a/subprojects/docs/src/docs/dsl/dsl.xml
+++ b/subprojects/docs/src/docs/dsl/dsl.xml
-@@ -300,9 +300,11 @@
+@@ -318,9 +318,11 @@
<tr>
<td>org.gradle.plugins.signing.Sign</td>
</tr>
@@ -40,7 +40,7 @@ Last-Update: 2012-08-18
<tr>
<td>org.gradle.api.tasks.Sync</td>
</tr>
-@@ -409,4 +411,4 @@
+@@ -427,4 +429,4 @@
</table>
</section>
diff --git a/debian/patches/13_fix_javadocs_links.diff b/debian/patches/13_fix_javadocs_links.diff
index fb22585..0311aee 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
-@@ -265,8 +265,10 @@
+@@ -275,8 +275,10 @@
classpath = configurations.userGuideTask
}
@@ -17,9 +17,9 @@ Last-Update: 2012-08-18
+//def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
+def groovyApiUrl = "file:///usr/share/doc/groovy-doc/gapi/"
- task javadoc(type: Javadoc) {
+ task javadocAll(type: Javadoc) {
ext.stylesheetFile = file("src/docs/css/javadoc.css")
-@@ -288,8 +290,7 @@
+@@ -298,8 +300,7 @@
include 'org/gradle/testfixtures/**'
include 'org/gradle/tooling/**'
exclude '**/internal/**'
diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff
index c3a261f..6dcc120 100644
--- a/debian/patches/21_docs.diff
+++ b/debian/patches/21_docs.diff
@@ -20,7 +20,7 @@ Last-Update: 2012-08-18
}
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -40,23 +40,23 @@
+@@ -43,22 +43,23 @@
}
configurations {
@@ -33,7 +33,7 @@ Last-Update: 2012-08-18
}
dependencies {
-- userGuideTask 'xalan:xalan:2.7.1', 'xerces:xercesImpl:2.9.1'
+- userGuideTask 'xalan:xalan:2.7.1', libraries.xerces
- userGuideTask module('xhtmlrenderer:xhtmlrenderer:R8rc1') {
+ userGuideTask 'xalan:xalan2:2.7.1', 'xerces:xercesImpl:2.9.1'
+ userGuideTask module('xhtmlrenderer:core-renderer:R8rc1') {
@@ -45,21 +45,24 @@ Last-Update: 2012-08-18
+ //userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
jquery "jquery:jquery.min:1.8.0 at js"
-- fonts \
-+ /*fonts \
++ /*
+ fonts \
"lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ at ttf",
"lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw at ttf",
- "lato:bold:6:DvlFBScY1r-FMtZSYIYoYw at ttf",
-@@ -64,7 +64,7 @@
- "ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E at ttf",
+@@ -68,6 +69,7 @@
"ubuntumono:regular-italic:3:KAKuHXAHZOeECOWAHsRKA-LrC4Du4e_yfTJ8Ol60xk0 at ttf",
"ubuntumono:bold:3:ceqTZGKHipo8pJj4molytp_TkvowlIOtbR7ePgFOpF4 at ttf",
-- "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc at ttf"
-+ "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc at ttf"*/
- }
+ "ubuntumono:bold-italic:3:n_d8tv_JOIiYyMXR4eaV9WsGzsqhEorxQDpu60nfWEc at ttf"
++ */
- ext {
-@@ -91,7 +91,7 @@
+ groovy libraries.groovy
+ testCompile "org.pegdown:pegdown:1.1.0"
+@@ -97,11 +99,11 @@
+ builtBy 'distDocs'
+ }
+ outputs.docs = files(docsDir) {
+- builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml', 'releaseNotes'
++ builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml'
}
tasks.withType(Docbook2Xhtml) {
@@ -68,7 +71,7 @@ Last-Update: 2012-08-18
classpath = configurations.userGuideTask
stylesheetsDir = userguideStyleSheets.destinationDir
}
-@@ -121,12 +121,12 @@
+@@ -131,12 +133,12 @@
[it.name, it.bytes.encodeBase64().toString()]
}
@@ -82,9 +85,9 @@ Last-Update: 2012-08-18
- ext.tokens = images + fonts
+ ext.tokens = images // + fonts
css.inputs.property 'tokens', tokens
- css.filter org.apache.tools.ant.filters.ReplaceTokens, tokens: tokens
+ css.filter ReplaceTokens, tokens: tokens
}
-@@ -166,10 +166,10 @@
+@@ -176,10 +178,10 @@
include '*.xsl'
}
from(cssFiles)
diff --git a/debian/patches/24_pegdown.diff b/debian/patches/24_pegdown.diff
index 130d261..d20e3ab 100644
--- a/debian/patches/24_pegdown.diff
+++ b/debian/patches/24_pegdown.diff
@@ -11,7 +11,7 @@ Last-Update: 2012-08-18
+++ b/buildSrc/build.gradle
@@ -40,7 +40,6 @@
testCompile 'junit:junit4:4.x at jar'
- testCompile 'org.spockframework:spock-core:0.6-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
+ testCompile 'org.spockframework:spock-core:0.7-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
- compile "org.pegdown:pegdown:1.1.0"
compile "org.jsoup:jsoup:1.6.3"
@@ -62,24 +62,15 @@ Last-Update: 2012-08-18
void options(String... options) {
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -22,7 +22,6 @@
- import org.gradle.build.docs.dsl.source.ExtractDslMetaDataTask
+@@ -25,7 +25,6 @@
+ import org.apache.tools.ant.filters.ReplaceTokens
apply plugin: 'base'
-apply plugin: 'pegdown'
apply plugin: 'jsoup'
apply plugin: 'javascript-base'
-@@ -87,7 +86,7 @@
- builtBy 'distDocs'
- }
- outputs.docs = files(docsDir) {
-- builtBy 'javadoc', 'groovydoc', 'userguide', 'dslHtml', 'releaseNotes'
-+ builtBy 'javadoc', 'groovydoc', 'userguide', 'dslHtml'
- }
-
- tasks.withType(Docbook2Xhtml) {
-@@ -352,10 +351,10 @@
+@@ -364,10 +363,10 @@
group = 'documentation'
}
@@ -92,16 +83,20 @@ Last-Update: 2012-08-18
group = "release notes"
doLast {
Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md"))
-@@ -394,10 +393,10 @@
- doLast {
- Class.forName("java.awt.Desktop").newInstance().browse(new File(releaseNotes.destinationDir, releaseNotes.fileName).toURI())
- }
+@@ -412,14 +411,14 @@
+ systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile
+ systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName)
+
-}
+}*/
+ if (project.hasProperty('noDocsTests')) {
+ gradle.startParameter.excludedTaskNames << test.path
+ }
+
task docs {
-- dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml, releaseNotes
-+ dependsOn javadoc, groovydoc, userguide, distDocs, samplesDocs, dslHtml
+- dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml, releaseNotes
++ dependsOn javadocAll, groovydocAll, userguide, distDocs, samplesDocs, dslHtml
description = 'Generates all documentation'
group = 'documentation'
}
diff --git a/debian/patches/26_disable_commitid.diff b/debian/patches/26_disable_commitid.diff
index 7ec1dda..6a2fc25 100644
--- a/debian/patches/26_disable_commitid.diff
+++ b/debian/patches/26_disable_commitid.diff
@@ -32,5 +32,5 @@ Last-Update: 2012-08-18
- commitId: determineCommitId.commitId,
+ commitId: "UNKNOWN",
versionNumber: version,
- buildTimestamp: buildTimestamp,
- username: System.properties["user.name"],
+ versionBase: versionBase,
+ isSnapshot: isSnapshot,
diff --git a/debian/patches/27_maven.diff b/debian/patches/27_maven.diff
index f1c9402..fff07b4 100644
--- a/debian/patches/27_maven.diff
+++ b/debian/patches/27_maven.diff
@@ -4,7 +4,7 @@ Last-Update: 2012-08-18
--- a/subprojects/core-impl/core-impl.gradle
+++ b/subprojects/core-impl/core-impl.gradle
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
//I'm removing the components.xml file from the sec-dispatcher jar.
//This file contains only single component so I think we can remove it.
task.doLast {
diff --git a/debian/patches/31_hamcrest_12.diff b/debian/patches/31_hamcrest_12.diff
index bae7390..b841ebd 100644
--- a/debian/patches/31_hamcrest_12.diff
+++ b/debian/patches/31_hamcrest_12.diff
@@ -5,7 +5,7 @@ Last-Update: 2012-09-03
--- a/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
+++ b/subprojects/core/src/testFixtures/groovy/org/gradle/util/Matchers.java
-@@ -271,7 +271,7 @@
+@@ -273,7 +273,7 @@
}
@Factory
@@ -14,7 +14,7 @@ Last-Update: 2012-09-03
return new BaseMatcher<Task>() {
public boolean matches(Object o) {
Task task = (Task) o;
-@@ -301,7 +301,7 @@
+@@ -303,7 +303,7 @@
}
@Factory
diff --git a/debian/patches/32_disable_it.diff b/debian/patches/32_disable_it.diff
index 44d5790..5b6692d 100644
--- a/debian/patches/32_disable_it.diff
+++ b/debian/patches/32_disable_it.diff
@@ -29,9 +29,9 @@ Last-Update: 2012-09-03
include 'buildComparison'
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
-@@ -55,7 +55,7 @@
- testFixturesCompile project(":internalTesting")
- testFixturesRuntime project(':coreImpl')
+@@ -59,7 +59,7 @@
+
+ testCompile project(':coreImpl')
- integTestCompile project(":internalIntegTesting")
+ //integTestCompile project(":internalIntegTesting")
@@ -40,12 +40,12 @@ Last-Update: 2012-09-03
}
--- a/subprojects/performance/performance.gradle
+++ b/subprojects/performance/performance.gradle
-@@ -7,7 +7,7 @@
+@@ -8,7 +8,7 @@
dependencies {
- junit 'junit:junit:4.10'
+ junit 'junit:junit:4.11'
groovy libraries.groovy
- testFixturesCompile project(':internalIntegTesting')
+ //testFixturesCompile project(':internalIntegTesting')
+ plugin gradleApi()
}
- useTestFixtures()
diff --git a/debian/patches/33_scala_zinc.diff b/debian/patches/33_scala_zinc.diff
index 0637707..fd6e4e3 100644
--- a/debian/patches/33_scala_zinc.diff
+++ b/debian/patches/33_scala_zinc.diff
@@ -24,26 +24,26 @@ Forwarded: not-needed
if (!javaVersion.java6Compatible) {
--- 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
-@@ -101,11 +101,11 @@
- compile.scalaClasspath = project.configurations[SCALA_TOOLS_CONFIGURATION_NAME]
+@@ -119,11 +119,11 @@
+ compile.conventionMapping.scalaClasspath = { getScalaClasspath(compile.classpath) }
compile.conventionMapping.zincClasspath = {
def config = project.configurations[ZINC_CONFIGURATION_NAME]
- if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) {
- project.dependencies {
-- zinc("com.typesafe.zinc:zinc:0.2.0")
+- zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION")
- }
- }
+ //if (!compile.scalaCompileOptions.useAnt && config.dependencies.empty) {
-+ //project.dependencies {
-+ // zinc("com.typesafe.zinc:zinc:0.2.0")
-+ //}
++ // project.dependencies {
++ // zinc("com.typesafe.zinc:zinc:$DEFAULT_ZINC_VERSION")
++ // }
+ //}
config
}
}
-@@ -118,4 +118,4 @@
- scalaDoc.scalaClasspath = project.configurations[SCALA_TOOLS_CONFIGURATION_NAME]
+@@ -159,4 +159,4 @@
}
+ null
}
-}
\ 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
More information about the pkg-java-commits
mailing list