You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2014/12/19 15:30:56 UTC
incubator-tamaya git commit: TAMAYA-10 Enabled diagramm support for
the Asciidoctor Maven plugin.
Repository: incubator-tamaya
Updated Branches:
refs/heads/master dcf007387 -> 28aba6dc6
TAMAYA-10 Enabled diagramm support for the Asciidoctor Maven plugin.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/28aba6dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/28aba6dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/28aba6dc
Branch: refs/heads/master
Commit: 28aba6dc67fbe5502d2e36096e7ec2ec93de430e
Parents: dcf0073
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Fri Dec 19 15:25:13 2014 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Fri Dec 19 15:25:13 2014 +0100
----------------------------------------------------------------------
docs/pom.xml | 53 +++++++++++++++++++++---
docs/src/main/asciidoc/example/example.adoc | 2 +-
pom.xml | 15 +++++++
3 files changed, 64 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/28aba6dc/docs/pom.xml
----------------------------------------------------------------------
diff --git a/docs/pom.xml b/docs/pom.xml
index 5e02db1..a34503d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -32,20 +32,50 @@ under the License.
<description>The Documentation projects keeps together the documentation files in asciidic and other formats
for the Apache Tamaya project.
</description>
- <packaging>jar</packaging>
- <properties>
- <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
- <maven.compile.sourceLevel>1.8</maven.compile.sourceLevel>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor-diagram</artifactId>
+ <type>gem</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <configuration>
+ <jrubyVersion>${jruby.version}</jrubyVersion>
+ <gemHome>${project.build.directory}/gems</gemHome>
+ <gemPath>${project.build.directory}/gems</gemPath>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>initialize</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.asciidoctor</groupId>
<artifactId>asciidoctor-maven-plugin</artifactId>
<configuration>
<eruby>erubis</eruby>
+ <!-- The gem-maven-plugin appends the scope (e.g., provided) to the gemPath defined in the plugin configuration -->
+ <gemPath>${project.build.directory}/gems-provided</gemPath>
+ <requires>
+ <require>asciidoctor-diagram</require>
+ </requires>
</configuration>
<executions>
<execution>
@@ -87,5 +117,18 @@ under the License.
</plugins>
</build>
+ <repositories>
+ <repository>
+ <id>rubygems-proxy-releases</id>
+ <name>RubyGems.org Proxy (Releases)</name>
+ <url>http://rubygems-proxy.torquebox.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/28aba6dc/docs/src/main/asciidoc/example/example.adoc
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/example/example.adoc b/docs/src/main/asciidoc/example/example.adoc
index 3818bb1..55ed049 100644
--- a/docs/src/main/asciidoc/example/example.adoc
+++ b/docs/src/main/asciidoc/example/example.adoc
@@ -13,7 +13,7 @@ with different examples of Asciidoctors capabilities.
Some facts on the current Asciidoctor environment.
-Asciidoctor verision:: {asciidoctor-version}
+Asciidoctor version:: {asciidoctor-version}
== Plant UML
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/28aba6dc/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 933e134..da07666 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,10 +54,14 @@ under the License.
<!-- Dependency and plugin relate version properties go here -->
<asciidoctor.version>1.5.0</asciidoctor.version>
+ <asciidoctor-diagramm.version>1.2.1</asciidoctor-diagramm.version>
<asciidoctorj.version>1.5.2</asciidoctorj.version>
<enforcer.version>1.3.1</enforcer.version>
+ <gem.plugin>1.0.7</gem.plugin>
<hamcrest.version>1.3</hamcrest.version>
<javadoc.version>2.9.1</javadoc.version>
+ <!-- Must/should match the JRuby version used by AsciidoctorJ -->
+ <jruby.version>1.7.16.1</jruby.version>
<findbugs.version>3.0.0</findbugs.version>
<rat.version>0.11</rat.version>
</properties>
@@ -146,6 +150,11 @@ under the License.
<pluginManagement>
<plugins>
<plugin>
+ <groupId>de.saumya.mojo</groupId>
+ <artifactId>gem-maven-plugin</artifactId>
+ <version>${gem.plugin}</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>${findbugs.version}</version>
@@ -376,6 +385,12 @@ under the License.
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>rubygems</groupId>
+ <artifactId>asciidoctor-diagram</artifactId>
+ <version>${asciidoctor-diagramm.version}</version>
+ <type>gem</type>
+ </dependency>
</dependencies>
</dependencyManagement>