You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/11/22 06:59:34 UTC
[19/22] incubator-tinkerpop git commit: removed the maven replacer
plugin; version numbers are now being replaced by the AsciiDocs post-processor
removed the maven replacer plugin; version numbers are now being replaced by the AsciiDocs post-processor
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/cc0c2baf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/cc0c2baf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/cc0c2baf
Branch: refs/heads/master
Commit: cc0c2baff2bef1518f5ffb3e69a2d30304bd8be2
Parents: 3b7d7c9
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Nov 20 22:11:18 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Nov 20 22:11:18 2015 +0100
----------------------------------------------------------------------
docs/postprocessor/postprocess.sh | 13 +++++++++----
pom.xml | 28 ----------------------------
2 files changed, 9 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cc0c2baf/docs/postprocessor/postprocess.sh
----------------------------------------------------------------------
diff --git a/docs/postprocessor/postprocess.sh b/docs/postprocessor/postprocess.sh
index fd14f4c..cef9b93 100755
--- a/docs/postprocessor/postprocess.sh
+++ b/docs/postprocessor/postprocess.sh
@@ -20,10 +20,15 @@
pushd "$(dirname $0)/../.." > /dev/null
-if [ -f "target/docs/htmlsingle/index.html" ]; then
- awk -f "docs/postprocessor/processor.awk" target/docs/htmlsingle/index.html \
- | perl -0777 -pe 's/<span class="comment">\/\*\n \*\/<\/span>//igs' \
- > /tmp/index.html && mv /tmp/index.html target/docs/htmlsingle/
+TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep -o 'version>[^<]*' | grep -o '>.*' | cut -d '>' -f2 | head -n1)
+
+if [ -d "target/docs" ]; then
+ find target/docs -name index.html | while read file ; do
+ awk -f "docs/postprocessor/processor.awk" "${file}" \
+ | perl -0777 -pe 's/<span class="comment">\/\*\n \*\/<\/span>//igs' \
+ | sed "s/x\.y\.z/${TP_VERSION}/" \
+ > "${file}.tmp" && mv "${file}.tmp" "${file}"
+ done
fi
popd > /dev/null
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/cc0c2baf/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c098598..0ed7b98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -658,34 +658,6 @@ limitations under the License.
</execution>
</executions>
</plugin>
- <!-- replaces x.y.z in asciidoc with the tinkerpop version from the pom. using an attribute
- in the asciidoctor-maven-plugin doesn't work properly in all cases for some reasons,
- specifically in the code examples -->
- <plugin>
- <groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
- <version>1.5.3</version>
- <inherited>false</inherited>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>replace</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <includes>
- <include>${asciidoc.input.dir}/*.asciidoc</include>
- </includes>
- <replacements>
- <replacement>
- <token>x\.y\.z</token>
- <value>${project.version}</value>
- </replacement>
- </replacements>
- </configuration>
- </plugin>
<plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>