From 690923b3c91f7d834ed5ed1a94206f8a65296fe9 Mon Sep 17 00:00:00 2001 From: Costin Leau Date: Mon, 4 Jul 2011 21:05:08 +0300 Subject: [PATCH] DATAKV-75 + fixed item replacement (note that ReplaceTask only accepts chars not strings and the GroovyStringTemplate seems to be fragile so the ${} got replaced with @@) --- docs/build.gradle | 15 ++++++++++++--- docs/src/reference/docbook/index.xml | 6 +++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/docs/build.gradle b/docs/build.gradle index 0c15eafc5..ebdf04155 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -1,3 +1,6 @@ +import org.apache.tools.ant.filters.FixCrLfFilter +import org.apache.tools.ant.filters.ReplaceTokens + // ----------------------------------------------------------------------------- // Configuration for the docs subproject // ----------------------------------------------------------------------------- @@ -28,16 +31,22 @@ refSpec = copySpec { into ('reference/images') { from (imagesDir) } - //expand(project.properties) - filter { String line -> - "[$line]" + + p = new Properties() + + for (e in project.properties) { + if (e.key != null && e.value != null) + p.setProperty(e.key, e.value.toString()) } + + filter(ReplaceTokens, tokens: p) } task reference (type: Copy) { dependsOn 'docbook' description = "Builds aggregated DocBook" group = "Documentation" + logger.info("Version is " + version) destinationDir = buildDir with(refSpec) } diff --git a/docs/src/reference/docbook/index.xml b/docs/src/reference/docbook/index.xml index 311f248d4..5e2782b6d 100644 --- a/docs/src/reference/docbook/index.xml +++ b/docs/src/reference/docbook/index.xml @@ -7,7 +7,7 @@ Spring Data Key-Value - Reference Documentation Spring Data Key-Value ${version} - ${version} + @version@ Spring Data Key-Value @@ -34,8 +34,8 @@ - +