[gradle-1.12] 162/211: Re-enable building documentations
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Jul 1 14:18:46 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 a196fd97a1746e376ebabba9c6f50ad8d7bdcc88
Author: Kai-Chung Yan <seamlikok at gmail.com>
Date: Fri Jun 12 20:42:57 2015 +0800
Re-enable building documentations
---
debian/changelog | 17 +++-
debian/control | 15 ++-
debian/gradle-doc.install | 5 +-
debian/patches/32_disable_it.diff | 51 -----------
debian/patches/bintray_dependencies.diff | 2 +-
debian/patches/disable_docs.diff | 26 ------
debian/patches/disable_release_notes.diff | 65 +++++++++++++
.../patches/{02_sonar.diff => disable_sonar.diff} | 38 +++-----
debian/patches/disable_tests.diff | 34 +++----
debian/patches/{21_docs.diff => docs.diff} | 101 ++++++++++++---------
debian/patches/series | 6 +-
debian/patches/use_local_artifacts.diff | 14 ++-
debian/rules | 9 +-
13 files changed, 198 insertions(+), 185 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e308ec9..f476598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,9 +10,15 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low
- gradle-tooling-api.jar from gradle to libgradle-core-java
- gradle-wrapper.jar from libgradle-core-java to libgradle-plugins-java
* Remove all symlinks, placing all jars in /usr/share/java/
- * Abandon 23_replace_jna-posix_with_jnr-posix.diff: Future Gradle do not use
- jnr any more
- * Abandon 90_respect_user_java_home.diff
+ * Drop multiple patches under debian/patches/:
+ - 13_fix_javadocs_links.diff: Already merged into docs.diff
+ - 23_replace_jna-posix_with_jnr-posix.diff: Future Gradle no longer use jnr
+ - 24_pegdown.diff: Pegdown is already in Debian
+ - 27_maven.diff: Already merged into use_local_artifacts.diff
+ - 28_findbugs.diff: Findbugs is already in Debian
+ - 30_envyjs.diff: Simpleframework is already in Debian
+ - 31_hamcrest_12.diff: This patch is for tests codes, hence not needed
+ - 90_respect_user_java_home.diff: No longer needed in Gradle 1.12
* Multiple new patches under debian/patches/
- asm5_version.diff: Fix ASM version mismatch
- bintray-api.diff: Update the usage of bintray APIs 0.8.1
@@ -20,9 +26,10 @@ gradle (1.12+dfsg-1) UNRELEASED; urgency=low
- build_comparison.diff:
- build_init.diff: build-init.gradle uses APIs higher than Gradle 1.5
- disable_buildSrc_tests.diff: Disable buildSrc tests
- - disable_distributions.diff:
+ - disable_distributions.diff: Disable the tasks to generate a Zip file
- disable_docs.diff: Temporarily disable Gradle documentations
- - disable_tests.diff: Disable tests when building Gradle
+ - disable_sonar.diff: Updated version of 02_sonar.diff
+ - disable_tests.diff: Extended version of 32_disable_it.diff
- do_not_use_bcpg_jdk5.diff: BouncyCastle libraries do not ship jdk5 variety
- do_not_use_jdk5_guava.diff: Guava does not ship jdk5 variety
- fix_DocGenerationException.diff:
diff --git a/debian/control b/debian/control
index 6c5edfd..f7f1aef 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,11 @@ Build-Depends: ant,
bnd (>= 2.1.0),
debhelper (>= 9),
default-jdk (>= 1:1.6),
+ default-jdk-doc,
docbook-xsl,
gradle (>= 1.5),
groovy,
+ groovy-doc,
ivy,
javahelper,
junit4,
@@ -25,6 +27,7 @@ Build-Depends: ant,
libcommons-collections3-java,
libcommons-io-java,
libcommons-lang-java (>= 2.6),
+ libcore-renderer-java,
libdom4j-java,
libgoogle-gson-java,
libguava-java,
@@ -33,11 +36,12 @@ Build-Depends: ant,
libjansi-java,
libjarjar-java,
libjatl-java,
- libjaxon-java,
+ libjaxen-java,
libjetty-java,
libjetty-extra-java,
libjcifs-java,
libjcip-annotations-java,
+ libjhighlight-java,
libjsch-java,
libjsoup-java,
libjmock2-java,
@@ -47,6 +51,7 @@ Build-Depends: ant,
libkryo-java,
liblogback-java,
libmaven-ant-tasks-java,
+ libmaven2-core-java-doc,
libnative-platform-java (>= 0.10),
libnekohtml-java,
libpegdown-java,
@@ -155,7 +160,7 @@ Depends: ant-optional,
libgoogle-gson-java,
libgradle-core-java (>= ${binary:Version}),
libjatl-java,
- libjaxon-java,
+ libjaxen-java,
libjetty-java,
libjetty-extra-java,
libmaven-ant-tasks-java,
@@ -271,8 +276,10 @@ Description: Groovy based build system - All plugins
Package: gradle-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Suggests: default-jdk-doc, groovy-doc
+Depends: default-jdk-doc,
+ groovy-doc,
+ libmaven2-core-java-doc,
+ ${misc:Depends}
Description: Documentation for gradle
Documentation for the Gradle core library.
.
diff --git a/debian/gradle-doc.install b/debian/gradle-doc.install
index eb19470..b7ccaf6 100644
--- a/debian/gradle-doc.install
+++ b/debian/gradle-doc.install
@@ -1,2 +1,3 @@
-subprojects/launcher/build/docs/javadoc/* /usr/share/doc/gradle/api/launcher/
-subprojects/ui/build/docs/javadoc/* /usr/share/doc/gradle/api/ui/
\ No newline at end of file
+subprojects/docs/build/docs/* /usr/share/doc/gradle/
+subprojects/docs/build/distDocs/getting-started.html /usr/share/doc/gradle/
+subprojects/docs/build/samples/ /usr/share/doc/gradle/
\ No newline at end of file
diff --git a/debian/patches/32_disable_it.diff b/debian/patches/32_disable_it.diff
deleted file mode 100644
index e4d4f3f..0000000
--- a/debian/patches/32_disable_it.diff
+++ /dev/null
@@ -1,51 +0,0 @@
-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
-@@ -42,7 +42,7 @@
- include 'ear'
- include 'native'
- include 'internalTesting'
--include 'internalIntegTesting'
-+//include 'internalIntegTesting'
- include 'performance'
- include 'javascript'
- include 'buildComparison'
---- a/subprojects/core/core.gradle
-+++ b/subprojects/core/core.gradle
-@@ -58,7 +58,7 @@
- testFixturesCompile project(":internalTesting")
- testFixturesRuntime project(':coreImpl')
-
-- integTestCompile project(":internalIntegTesting")
-+ //integTestCompile project(":internalIntegTesting")
-
- //reports 'css3-pie:css3-pie:1.0beta3'
- }
---- a/subprojects/performance/performance.gradle
-+++ b/subprojects/performance/performance.gradle
-@@ -8,7 +8,7 @@
- dependencies {
- junit 'junit:junit:4.11'
- groovy libraries.groovy
-- testFixturesCompile project(':internalIntegTesting')
-+ //testFixturesCompile project(':internalIntegTesting')
- plugin gradleApi()
- }
-
diff --git a/debian/patches/bintray_dependencies.diff b/debian/patches/bintray_dependencies.diff
index a25bb66..300aed4 100644
--- a/debian/patches/bintray_dependencies.diff
+++ b/debian/patches/bintray_dependencies.diff
@@ -7,7 +7,7 @@ Last-Update: 2015-06-08
+++ b/subprojects/core/core.gradle
@@ -48,7 +48,7 @@
- //runtime project(":docs")
+ runtime project(":docs")
- compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') {
+ compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-service', version: '[0.8.1, )') {
diff --git a/debian/patches/disable_docs.diff b/debian/patches/disable_docs.diff
deleted file mode 100644
index f3ef90d..0000000
--- a/debian/patches/disable_docs.diff
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Temporarily disable docs because jhighlight are not in Debian
- yet
-Author: Kai-Chung Yan <seamlikok at gmail.com>
-Last-Update: 2015-05-28
---- a/subprojects/core/core.gradle
-+++ b/subprojects/core/core.gradle
-@@ -46,7 +46,7 @@
- compile project(":cli")
- compile project(":native")
-
-- runtime project(":docs")
-+ //runtime project(":docs")
-
- compile(group: 'com.jfrog.bintray.client', name: 'bintray-client-java-impl', version: '0.1.0') {
- exclude module:'groovy-all'
---- a/settings.gradle
-+++ b/settings.gradle
-@@ -35,7 +35,7 @@
- include 'ui'
- include 'openApi'
- include 'toolingApi'
--include 'docs'
-+//include 'docs'
- include 'integTest'
- include 'sonar'
- include 'signing'
diff --git a/debian/patches/disable_release_notes.diff b/debian/patches/disable_release_notes.diff
new file mode 100644
index 0000000..27da78f
--- /dev/null
+++ b/debian/patches/disable_release_notes.diff
@@ -0,0 +1,65 @@
+Description: libpegdown-java_1.4.2-1 and libparboiled-java_1.1.6-1 do not
+ work well, so we need disable the release notes compilation.
+Author: Kai-Chung Yan
+Last-Update: 2015-06-12
+--- a/subprojects/docs/docs.gradle
++++ b/subprojects/docs/docs.gradle
+@@ -83,7 +83,7 @@
+ builtBy 'distDocs'
+ }
+ outputs.docs = files(docsDir) {
+- builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml', 'releaseNotes'
++ builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml'
+ }
+
+ tasks.withType(Docbook2Xhtml) {
+@@ -370,48 +370,10 @@
+ group = 'documentation'
+ }
+
+-import org.gradle.plugins.pegdown.PegDown
+-
+-task editReleaseNotes() {
+- group = "release notes"
+- doLast {
+- Class.forName("java.awt.Desktop").newInstance().edit(file("src/docs/release/notes.md"))
+- }
+-}
+-
+-task releaseNotesMarkdown(type: PegDown) {
+- group = "release notes"
+- source "src/docs/release/notes.md"
+- destination "$buildDir/release-notes-raw/release-notes.html"
+-}
+-
+-task releaseNotes(type: Copy) {
+- group = "release notes"
+- ext.fileName = "release-notes.html"
+- into "$docsDir"
+- from releaseNotesMarkdown
+- jsoup.plugins "src/transforms/release-notes.gradle"
+- filter(ReplaceTokens, tokens: [version: project.version.toString(), versionBase: rootProject.versionBase])
+-}
+-
+-task viewReleaseNotes(dependsOn: releaseNotes) {
+- group = "release notes"
+- doLast {
+- Class.forName("java.awt.Desktop").newInstance().browse(new File(releaseNotes.destinationDir, releaseNotes.fileName).toURI())
+- }
+-}
+-
+ sourceSets.main.output.dir generatedResourcesDir, builtBy: defaultImports
+
+-test {
+- dependsOn releaseNotes
+- systemProperty "org.gradle.docs.releasenotes.source", releaseNotesMarkdown.source.singleFile
+- systemProperty "org.gradle.docs.releasenotes.rendered", new File(releaseNotes.destinationDir, releaseNotes.fileName)
+-
+-}
+-
+ task docs {
+- 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/02_sonar.diff b/debian/patches/disable_sonar.diff
similarity index 79%
rename from debian/patches/02_sonar.diff
rename to debian/patches/disable_sonar.diff
index 676a184..62c41f6 100644
--- a/debian/patches/02_sonar.diff
+++ b/debian/patches/disable_sonar.diff
@@ -6,47 +6,37 @@ Last-Update: 2012-08-18
--- a/build.gradle
+++ b/build.gradle
-@@ -87,7 +87,7 @@
+@@ -92,7 +92,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', 'buildInit', 'languageJvm', 'languageBase'
].collect {
project(it)
--- a/settings.gradle
+++ b/settings.gradle
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,6 @@
+ include 'openApi'
include 'toolingApi'
include 'docs'
- include 'integTest'
-include 'sonar'
-+//include 'sonar'
include 'signing'
include 'cpp'
include 'ear'
--- a/subprojects/docs/src/docs/dsl/dsl.xml
+++ b/subprojects/docs/src/docs/dsl/dsl.xml
-@@ -339,9 +339,11 @@
- <tr>
+@@ -364,9 +364,6 @@
<td>org.gradle.plugins.signing.Sign</td>
</tr>
-+<!--
- <tr>
- <td>org.gradle.api.plugins.sonar.SonarAnalyze</td>
- </tr>
-+-->
<tr>
+- <td>org.gradle.api.plugins.sonar.SonarAnalyze</td>
+- </tr>
+- <tr>
<td>org.gradle.api.tasks.Sync</td>
</tr>
-@@ -448,4 +450,4 @@
- </table>
- </section>
-
--</book>
-\ No newline at end of file
-+</book>
+ <tr>
--- a/subprojects/docs/src/docs/userguide/sonarPlugin.xml
+++ b/subprojects/docs/src/docs/userguide/sonarPlugin.xml
@@ -223,9 +223,8 @@
@@ -63,14 +53,12 @@ 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,6 @@
<xi:include href='jdependPlugin.xml'/>
<xi:include href='pmdPlugin.xml'/>
-+<!--
- <xi:include href='sonarPlugin.xml'/>
- <xi:include href='sonarRunnerPlugin.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'/>
diff --git a/debian/patches/disable_tests.diff b/debian/patches/disable_tests.diff
index 527a735..7152090 100644
--- a/debian/patches/disable_tests.diff
+++ b/debian/patches/disable_tests.diff
@@ -9,7 +9,7 @@ Last-Update: 2015-05-28
apply from: "gradle/noDependencyResolutionDuringConfiguration.gradle"
-apply from: "gradle/testSetup.gradle"
-apply from: "gradle/testGroupings.gradle"
-
+
allprojects {
group = 'org.gradle'
@@ -202,6 +200,4 @@
@@ -27,7 +27,7 @@ Last-Update: 2015-05-28
@@ -65,13 +65,16 @@
def compileConfiguration = sourceSet == "main" ? "compile" : "${sourceSet}Compile"
def runtimeConfiguration = sourceSet == "main" ? "runtime" : "${sourceSet}Runtime"
-
+
+ /*
dependencies {
add(compileConfiguration, project(path: projectPath, configuration: "testFixturesUsageCompile"))
@@ -36,7 +36,7 @@ Last-Update: 2015-05-28
}
+ */
}
-
+
+/*
if (file("src/testFixtures").exists()) {
apply from: "$rootDir/gradle/testFixtures.gradle"
@@ -44,29 +44,29 @@ Last-Update: 2015-05-28
@@ -80,6 +83,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
@@ -67,11 +67,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.
@@ -79,21 +79,21 @@ Last-Update: 2015-05-28
--- a/subprojects/tooling-api/tooling-api.gradle
+++ b/subprojects/tooling-api/tooling-api.gradle
@@ -21,13 +21,17 @@
-
+
useTestFixtures()
-
+
+/*
integTestTasks.all {
dependsOn({ rootProject.getTasksByName('publishLocalArchives', true) }, ':distributions:binZip')
}
+*/
-
+
+/*
daemonIntegTest {
enabled = false //tooling integ tests use daemon anyway, don't rerun
}
+*/
-
+
task jarjarJar(type: JarJarJar) {
appendix = "fat"
--- a/subprojects/wrapper/wrapper.gradle
@@ -101,21 +101,21 @@ Last-Update: 2015-05-28
@@ -35,9 +35,11 @@
from configurations.runtime.allDependencies.withType(ProjectDependency).collect { it.dependencyProject.sourceSets.main.output }
}
-
+
+/*
integTestTasks.all {
inputs.files { project(":distributions").binZip }
}
+*/
-
+
useTestFixtures()
useClassycle()
--- a/subprojects/scala/scala.gradle
+++ b/subprojects/scala/scala.gradle
@@ -39,6 +39,8 @@
-
+
useTestFixtures(project: ":plugins") // includes core test fixtures
-
+
+/*
configure([integTest, daemonIntegTest]) {
jvmArgs "-XX:MaxPermSize=1g" // AntInProcessScalaCompilerIntegrationTest needs lots of permgen
@@ -127,7 +127,7 @@ Last-Update: 2015-05-28
@@ -36,15 +36,11 @@
include 'openApi'
include 'toolingApi'
- //include 'docs'
+ include 'docs'
-include 'integTest'
include 'sonar'
include 'signing'
diff --git a/debian/patches/21_docs.diff b/debian/patches/docs.diff
similarity index 74%
rename from debian/patches/21_docs.diff
rename to debian/patches/docs.diff
index 61e0110..00f5253 100644
--- a/debian/patches/21_docs.diff
+++ b/debian/patches/docs.diff
@@ -3,7 +3,7 @@ Description: Fix build of documentation to build everything
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: 2015-06-11
--- a/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
+++ b/buildSrc/src/main/groovy/org/gradle/build/docs/Docbook2XHtml.groovy
@@ -20,54 +20,41 @@ Last-Update: 2012-08-18
}
--- a/subprojects/docs/docs.gradle
+++ b/subprojects/docs/docs.gradle
-@@ -43,23 +43,22 @@
- }
-
- configurations {
-- userGuideStyleSheets
-+ //userGuideStyleSheets
- userGuideTask
- jquery
-- fonts
-+ //fonts
+@@ -39,26 +39,19 @@
+ fonts
}
++repositories {
++ flatDir {
++ dirs "/usr/share/javascript/jquery/"
++ }
++}
++
dependencies {
-- userGuideTask 'xalan:xalan:2.7.1', libraries.xerces
+ 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') {
dependency 'itext:itext:2.0.8 at jar'
}
-- userGuideTask 'xslthl:xslthl:2.0.1 at jar'
-
+ 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"
- groovy libraries.groovy
- testCompile "org.pegdown:pegdown:1.1.0"
-@@ -97,7 +97,7 @@
- builtBy 'distDocs'
- }
- outputs.docs = files(docsDir) {
-- builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml', 'releaseNotes'
-+ builtBy 'javadocAll', 'groovydocAll', 'userguide', 'dslHtml' //, 'releaseNotes'
- }
+ groovydocGroovy libraries.groovy
- tasks.withType(Docbook2Xhtml) {
-@@ -131,12 +131,12 @@
+@@ -124,12 +117,12 @@
[it.name, it.bytes.encodeBase64().toString()]
}
@@ -79,11 +66,11 @@ Last-Update: 2012-08-18
+ }*/
- 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 @@
+@@ -174,10 +167,6 @@
include '*.xsl'
}
from(cssFiles)
@@ -91,13 +78,30 @@ 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) {
+@@ -291,8 +280,8 @@
+ classpath = configurations.userGuideTask
+ }
+
+-def javaApiUrl = "http://docs.oracle.com/javase/1.5.0/docs/api/"
+-def groovyApiUrl = "http://groovy.codehaus.org/gapi/"
++def javaApiUrl = "file:///usr/share/doc/default-jdk/api/"
++def groovyApiUrl = "file:///usr/share/doc/groovy/api"
+
+ task javadocAll(type: Javadoc) {
+ ext.stylesheetFile = file("src/docs/css/javadoc.css")
+@@ -319,8 +308,7 @@
+ include 'org/gradle/testing/jacoco/**'
+ include 'org/gradle/buildinit/**'
+ 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")
++ options.links(javaApiUrl, groovyApiUrl, "file:///usr/share/doc/libmaven2-core-java/api")
+ doFirst {
+ title = "Gradle API $version"
+ }
--- a/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
+++ b/subprojects/docs/src/docs/stylesheets/dslHtml.xsl
@@ -14,7 +14,7 @@
@@ -195,3 +199,14 @@ Last-Update: 2012-08-18
-</xsl:stylesheet>
\ No newline at end of file
+</xsl:stylesheet>
+--- a/subprojects/docs/src/transforms/release-notes.gradle
++++ b/subprojects/docs/src/transforms/release-notes.gradle
+@@ -1,6 +1,7 @@
+ buildscript {
+ repositories {
+- mavenCentral()
++ maven { url "file:///usr/share/maven-repo/" }
++ flatDir { dirs "/usr/share/java/" }
+ }
+ dependencies {
+ classpath('com.uwyn:jhighlight:1.0') {
diff --git a/debian/patches/series b/debian/patches/series
index 1444374..e0bfcea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,21 +5,21 @@ do_not_use_jdk5_guava.diff
asm5_version.diff
fix_DocGenerationException.diff
03_plexus.diff
-13_fix_javadocs_links.diff
35_ivy_23.diff
36_java8_compatibility.diff
37_replace_internal_testng_api.diff
38_use_jdk7_nio_file_api.diff
39_ignore_test_processor_assertion.diff
build_init.diff
-disable_docs.diff
33_scala_zinc.diff
disable_distributions.diff
disable_tests.diff
remove_test_dependencies.diff
bintray_dependencies.diff
-build_comparison_css.diff
rhino_rename.diff
jetty.diff
do_not_use_bcpg_jdk5.diff
bintray_api.diff
+docs.diff
+disable_sonar.diff
+disable_release_notes.diff
diff --git a/debian/patches/use_local_artifacts.diff b/debian/patches/use_local_artifacts.diff
index 2f1f6a9..fcc1e26 100644
--- a/debian/patches/use_local_artifacts.diff
+++ b/debian/patches/use_local_artifacts.diff
@@ -50,6 +50,18 @@ Last-Update: 2015-05-24
}
dependencies {
+@@ -36,6 +36,11 @@
+ compile "org.pegdown:pegdown:1.1.0"
+ compile "org.jsoup:jsoup:1.6.3"
+
++ // Needed by pegdown
++ compile "org.parboiled:parboiled-core:[1, )"
++ compile "org.parboiled:parboiled-java:[1, )"
++ compile "org.ow2.asm:asm-all:[5, )"
++
+ //below dependency was deployed to the repo.gradle.org
+ //it's built from sources at: https://github.com/szczepiq/jarjar
+ //if code changes are needed in this library we need to figure out a better way of distributing them.
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -85,19 +85,19 @@
@@ -167,7 +179,7 @@ Last-Update: 2015-05-24
// we don't ship these dependencies because findbugs plugin will download them (and more) at runtime
- provided "com.google.code.findbugs:findbugs:2.0.1 at jar"
- provided "com.google.code.findbugs:bcel:2.0.1 at jar"
-+ provided "com.google.code.findbugs:findbugs:[2.0.1, )@jar"
++ provided "com.google.code.findbugs:findbugs"
+ provided "org.apache.bcel:findbugs-bcel:[2.0.1, )@jar"
provided "dom4j:dom4j:1.6.1 at jar"
provided "jaxen:jaxen:1.1.1 at jar"
diff --git a/debian/rules b/debian/rules
index 214fed6..c16176d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,13 @@
#!/usr/bin/make -f
-UPSTREAM_VERSION := $(shell cat version.txt)
-SUBPROJECTS_LIST := announce antlr baseServices baseServicesGroovy buildComparison buildInit cli codeQuality core coreImpl cpp diagnostics ear ide ivy jacoco javascript jetty languageBase languageJvm launcher native openApi osgi plugins publish maven messaging reporting resources scala signing toolingApi ui wrapper
-GRADLE_TASKS := $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):assemble)
-GRADLE_TASKS += $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):javadoc)
-GRADLE_TASKS += $(foreach TASK, $(SUBPROJECTS_LIST), :$(TASK):groovydoc)
-GRADLE_TASKS += :launcher:startScripts
+GRADLE_TASKS := assemble docs startScripts
# Only for debug purpose
# export JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
# Under fakeroot Gradle will show error while creating /root/.gradle, hence
# specifies the Gradle home location
-GRADLE_FLAGS := --project-prop finalRelease=true --offline --gradle-user-home .gradlehome
+GRADLE_FLAGS := --project-prop finalRelease=true --offline --gradle-user-home .gradlehome --stacktrace
# Support for DEB_BUILD_OPTIONS parallel=n
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
--
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