[gradle] 02/08: refreshed 01, 02 and 21 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 e54eca48aed652163807a77a48b821b333bbce8e
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date: Mon May 12 12:07:16 2014 +0000
refreshed 01, 02 and 21 patches
---
debian/patches/01_use_debian_jars.diff | 20 +++----
debian/patches/02_sonar.diff | 19 +++----
debian/patches/21_docs.diff | 99 ++++++++++++++++------------------
3 files changed, 63 insertions(+), 75 deletions(-)
diff --git a/debian/patches/01_use_debian_jars.diff b/debian/patches/01_use_debian_jars.diff
index f85c1e5..d20485c 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'
-@@ -107,7 +108,11 @@
+@@ -111,7 +112,11 @@
group = 'org.gradle'
repositories {
@@ -27,10 +27,10 @@ Last-Update: 2012-08-18
}
}
-@@ -193,4 +198,4 @@
- installDirPropertyName = 'gradle_installPath'
+@@ -198,4 +203,4 @@
}
+
-apply from: "gradle/intTestImage.gradle"
\ No newline at end of file
+apply from: "gradle/intTestImage.gradle"
@@ -65,7 +65,7 @@ Last-Update: 2012-08-18
- compile 'com.google.guava:guava:11.0.2 at jar'
+ compile 'com.google.guava:guava:debian at jar'
compile 'commons-lang:commons-lang:2.6 at jar'
- groovy localGroovy()
+ compile localGroovy()
- testCompile 'junit:junit:4.11 at jar'
+ testCompile 'junit:junit4:4.x at jar'
testCompile 'org.spockframework:spock-core:0.7-groovy-1.8 at jar', 'cglib:cglib-nodep:2.2', 'org.objenesis:objenesis:1.2'
@@ -74,7 +74,7 @@ Last-Update: 2012-08-18
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -25,16 +25,16 @@
- dependency 'org.apache.ant:ant-launcher:1.8.4 at jar'
+ dependency 'org.apache.ant:ant-launcher:1.9.2 at jar'
}
-libraries.asm = 'org.ow2.asm:asm-all:4.0 at jar'
@@ -187,7 +187,7 @@ Last-Update: 2012-08-18
]
--- a/subprojects/core/core.gradle
+++ b/subprojects/core/core.gradle
-@@ -60,7 +60,7 @@
+@@ -63,7 +63,7 @@
integTestCompile project(":internalIntegTesting")
@@ -222,7 +222,7 @@ Last-Update: 2012-08-18
}
--- a/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java
+++ b/subprojects/core/src/main/groovy/org/gradle/profile/ProfileReportRenderer.java
-@@ -35,7 +35,7 @@
+@@ -29,7 +29,7 @@
HtmlReportRenderer renderer = new HtmlReportRenderer();
renderer.requireResource(getClass().getResource("/org/gradle/reporting/base-style.css"));
renderer.requireResource(getClass().getResource("/org/gradle/reporting/report.js"));
@@ -246,7 +246,7 @@ Last-Update: 2012-08-18
+++ b/subprojects/javascript/javascript.gradle
@@ -17,7 +17,7 @@
dependencies {
- groovy libraries.groovy
+ compile libraries.groovy
- compile "org.mozilla:rhino:1.7R3"
+ compile "org.mozilla:js:1.7R3"
@@ -304,14 +304,14 @@ Last-Update: 2012-08-18
compile project(':plugins')
compile libraries.slf4j_api
-- compile module('biz.aQute:bndlib:1.50.0')
+- compile module('biz.aQute.bnd:bndlib:2.1.0')
+ compile module('biz.aQute:bndlib:debian')
}
useTestFixtures()
--- a/subprojects/plugins/plugins.gradle
+++ b/subprojects/plugins/plugins.gradle
-@@ -38,7 +38,7 @@
+@@ -39,7 +39,7 @@
compile libraries.commons_lang
compile libraries.junit
compile libraries.slf4j_api
diff --git a/debian/patches/02_sonar.diff b/debian/patches/02_sonar.diff
index 676a184..5597ef9 100644
--- a/debian/patches/02_sonar.diff
+++ b/debian/patches/02_sonar.diff
@@ -6,18 +6,18 @@ Last-Update: 2012-08-18
--- a/build.gradle
+++ b/build.gradle
-@@ -87,7 +87,7 @@
+@@ -90,7 +90,7 @@
publishedProjects = [project(':core'), project(':toolingApi'), project(':wrapper'), project(':baseServices'), project(':messaging')]
pluginProjects = [
'plugins', 'codeQuality', 'jetty', 'antlr', 'wrapper', 'osgi', 'maven',
- 'ide', 'announce', 'scala', 'sonar', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison',
+ 'ide', 'announce', 'scala', 'signing', 'cpp', 'ear', 'javascript', 'buildComparison',
- 'diagnostics', 'reporting', 'publish', 'ivy'
+ 'diagnostics', 'reporting', 'publish', 'ivy', 'jacoco', 'buildSetup', 'languageJvm', 'languageBase', 'buildSetup'
].collect {
project(it)
--- a/settings.gradle
+++ b/settings.gradle
-@@ -36,7 +36,7 @@
+@@ -37,7 +37,7 @@
include 'toolingApi'
include 'docs'
include 'integTest'
@@ -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
-@@ -339,9 +339,11 @@
+@@ -360,9 +360,11 @@
<tr>
<td>org.gradle.plugins.signing.Sign</td>
</tr>
@@ -40,13 +40,6 @@ Last-Update: 2012-08-18
<tr>
<td>org.gradle.api.tasks.Sync</td>
</tr>
-@@ -448,4 +450,4 @@
- </table>
- </section>
-
--</book>
-\ No newline at end of file
-+</book>
--- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml
+++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml
@@ -223,9 +223,8 @@
@@ -63,10 +56,10 @@ Last-Update: 2012-08-18
+</chapter>
--- a/subprojects/docs/src/docs/userguide/userguide.xml
+++ b/subprojects/docs/src/docs/userguide/userguide.xml
-@@ -60,8 +60,10 @@
- <xi:include href='findBugsPlugin.xml'/>
+@@ -61,8 +61,10 @@
<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'/>
diff --git a/debian/patches/21_docs.diff b/debian/patches/21_docs.diff
index 61e0110..e62283f 100644
--- a/debian/patches/21_docs.diff
+++ b/debian/patches/21_docs.diff
@@ -1,33 +1,34 @@
Description: Fix build of documentation to build everything
- using docbook-xsl, xalan2 and xhtmlrenderer from Debian
+using docbook-xsl, xalan2 and xhtmlrenderer from Debian
Author: Miguel Landaeta <miguel at miguel.cc>
Author: Damien Raude-Morvan <drazzib at debian.org>
Forwarded: not-needed
-Last-Update: 2012-08-18
+Last-Update: 2014-05-09
---- a/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
-+++ b/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
-@@ -71,8 +71,8 @@
+--- gradle-1.8.orig/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
++++ gradle-1.8/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
+@@ -71,8 +71,8 @@ class Docbook2Xhtml extends SourceTask {
jvmArgs '-Xmx256m'
classpath ClasspathUtil.getClasspathForClass(XslTransformer)
classpath this.classpath
- classpath new File(stylesheetsDir, 'extensions/xalan27.jar')
- systemProperty 'xslthl.config', new File("$stylesheetsDir/highlighting/xslthl-config.xml").toURI()
+ classpath new File('/usr/share/java/xalan2.jar')
-+ systemProperty 'xslthl.config', new File("/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/xslthl-config.xml").toURI()
++ systemProperty 'xslthl.config', new File("/usr/share/xml/docbook/stylesheet/docbook-xsl/highlighting/xslthl-config.xml").toURI()
systemProperty 'org.apache.xerces.xni.parser.XMLParserConfiguration', 'org.apache.xerces.parsers.XIncludeParserConfiguration'
}
}
---- a/subprojects/docs/docs.gradle
-+++ b/subprojects/docs/docs.gradle
-@@ -43,23 +43,22 @@
- }
+--- gradle-1.8.orig/subprojects/docs/docs.gradle
++++ gradle-1.8/subprojects/docs/docs.gradle
+@@ -47,33 +47,20 @@ repositories {
configurations {
+ groovydocGroovy {}
- userGuideStyleSheets
+ //userGuideStyleSheets
userGuideTask
jquery
+ jqueryTipTip
- fonts
+ //fonts
}
@@ -42,48 +43,45 @@ Last-Update: 2012-08-18
- userGuideTask 'xslthl:xslthl:2.0.1 at jar'
- userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
-+ //userGuideStyleSheets 'docbook:docbook-xsl:1.75.2 at zip'
jquery "jquery:jquery.min:1.8.0 at js"
-
+- jqueryTipTip "com.drewwilson.code:jquery.tipTip:1.3:minified at js"
+-
- fonts \
-+ /*fonts \
- "lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ at ttf",
- "lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw at ttf",
- "lato:bold:6:DvlFBScY1r-FMtZSYIYoYw at ttf",
-@@ -68,6 +67,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"
-+ */
+- "lato:regular:6:v0SdcGFAl2aezM9Vq_aFTQ at ttf",
+- "lato:regular-italic:6:LqowQDslGv4DmUBAfWa2Vw at ttf",
+- "lato:bold:6:DvlFBScY1r-FMtZSYIYoYw at ttf",
+- "lato:bold-italic:6:HkF_qI1x_noxlxhrhMQYEKCWcynf_cDxXwCLxiixG1c at ttf",
+- "ubuntumono:regular:3:ViZhet7Ak-LRXZMXzuAfkZ0EAVxt0G0biEntp43Qt6E at ttf",
+- "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"
+
+ groovydocGroovy libraries.groovy
- groovy libraries.groovy
- testCompile "org.pegdown:pegdown:1.1.0"
-@@ -97,7 +97,7 @@
+@@ -105,7 +92,7 @@ outputs.distDocs = files(distDocsDir) {
builtBy 'distDocs'
}
outputs.docs = files(docsDir) {
- builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml', 'releaseNotes'
-+ builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml' //, 'releaseNotes'
++ builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml'//, 'releaseNotes'
}
tasks.withType(Docbook2Xhtml) {
-@@ -131,12 +131,12 @@
+@@ -139,12 +126,7 @@ task configureCss << {
[it.name, it.bytes.encodeBase64().toString()]
}
- def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries {
-+ /*def fonts = configurations.fonts.resolvedConfiguration.resolvedArtifacts.collectEntries {
- def id = it.moduleVersion.id
- ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()]
+- def id = it.moduleVersion.id
+- ["${id.group}-${id.name}".toString(), it.file.bytes.encodeBase64().toString()]
- }
-+ }*/
-
+-
- ext.tokens = images + fonts
-+ ext.tokens = images // + fonts
++ ext.tokens = images
css.inputs.property 'tokens', tokens
css.filter ReplaceTokens, tokens: tokens
}
-@@ -176,10 +176,10 @@
+@@ -184,10 +166,6 @@ task userguideStyleSheets(type: Copy) {
include '*.xsl'
}
from(cssFiles)
@@ -91,15 +89,11 @@ Last-Update: 2012-08-18
- // Remove the prefix
- eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') }
- }
-+ //from({ zipTree(configurations.userGuideStyleSheets.singleFile) }) {
-+ // // Remove the prefix
-+ // eachFile { fcd -> fcd.path = fcd.path.replaceFirst('^docbook-xsl-[0-9\\.]+/', '') }
-+ //}
}
task samplesDocbook(type: AssembleSamplesDocTask) {
---- a/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
-+++ b/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
+--- gradle-1.8.orig/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
++++ gradle-1.8/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
@@ -116,8 +110,8 @@ Last-Update: 2012-08-18
-</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
+--- gradle-1.8.orig/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl
++++ gradle-1.8/subprojects/docs/src/docs/stylesheets/standaloneHtml.xsl
@@ -17,7 +17,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -134,8 +128,8 @@ Last-Update: 2012-08-18
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
---- a/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl
-+++ b/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl
+--- gradle-1.8.orig/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl
++++ gradle-1.8/subprojects/docs/src/docs/stylesheets/userGuideHtml.xsl
@@ -15,7 +15,7 @@
-->
<xsl:stylesheet
@@ -152,8 +146,8 @@ Last-Update: 2012-08-18
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
---- a/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl
-+++ b/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl
+--- gradle-1.8.orig/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl
++++ gradle-1.8/subprojects/docs/src/docs/stylesheets/userGuideHtmlCommon.xsl
@@ -16,8 +16,8 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xslthl="http://xslthl.sf.net"
@@ -165,14 +159,14 @@ Last-Update: 2012-08-18
<xsl:output method="html"
encoding="UTF-8"
---- a/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
-+++ b/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
+--- gradle-1.8.orig/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
++++ gradle-1.8/subprojects/docs/src/docs/stylesheets/userGuidePdf.xsl
@@ -14,7 +14,7 @@
~ limitations under the License.
-->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:import href="xhtml/docbook.xsl"/>
-+ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/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"
@@ -183,15 +177,16 @@ Last-Update: 2012-08-18
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
---- a/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl
-+++ b/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl
+--- gradle-1.8.orig/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl
++++ gradle-1.8/subprojects/docs/src/docs/stylesheets/userGuideSingleHtml.xsl
@@ -15,6 +15,6 @@
-->
<xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <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:import href="userGuideHtmlCommon.xsl"/>
-</xsl:stylesheet>
\ No newline at end of file
++ <xsl:import href="/usr/share/xml/docbook/stylesheet/docbook-xsl/html/docbook.xsl"/>
++ <xsl:import href="userGuideHtmlCommon.xsl"/>
+</xsl:stylesheet>
--
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