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 2015/06/19 20:30:20 UTC
[2/2] incubator-tamaya git commit: TAMAYA-80 AsciiDoctor
documentation is now a part of the dist.
TAMAYA-80 AsciiDoctor documentation is now a part of the dist.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/eb28de00
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/eb28de00
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/eb28de00
Branch: refs/heads/master
Commit: eb28de000650bcec0f87d06f602384496fbe06cd
Parents: 8a50a55
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Fri Jun 19 20:29:31 2015 +0200
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Fri Jun 19 20:29:31 2015 +0200
----------------------------------------------------------------------
distribution/pom.xml | 33 +++++++++++++++++++-
distribution/src/main/assembly/distribution.xml | 8 +++++
2 files changed, 40 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/eb28de00/distribution/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 05f7b9c..39a166b 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,7 +34,17 @@ under the License.
<dependencies>
- <!--Java 7 related artifacts-->
+ <!-- The documentation of Tamaya -->
+
+ <dependency>
+ <groupId>org.apache.tamaya</groupId>
+ <artifactId>tamaya-docs</artifactId>
+ <version>${project.version}</version>
+ <classifier>documentation</classifier>
+ <type>zip</type>
+ </dependency>
+
+ <!-- Java 7 related artifacts-->
<dependency>
<groupId>org.apache.tamaya</groupId>
<artifactId>tamaya-java7-api</artifactId>
@@ -137,6 +147,27 @@ under the License.
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-asciidoc</id>
+ <goals>
+ <goal>unpack-dependencies</goal>
+ </goals>
+ <phase>generate-resources</phase>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-documentation</outputDirectory>
+ <includeTypes>zip</includeTypes>
+ <includeClassifiers>documentation</includeClassifiers>
+ <stripVersion>true</stripVersion>
+ <stripClassifier>true</stripClassifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/eb28de00/distribution/src/main/assembly/distribution.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/assembly/distribution.xml b/distribution/src/main/assembly/distribution.xml
index fc11b4b..a58c475 100644
--- a/distribution/src/main/assembly/distribution.xml
+++ b/distribution/src/main/assembly/distribution.xml
@@ -23,6 +23,7 @@ under the License.
<id>distribution</id>
<formats>
+ <format>dir</format>
<format>zip</format>
<format>tar.gz</format>
</formats>
@@ -91,5 +92,12 @@ under the License.
</dependencySets>
+ <fileSets>
+ <fileSet>
+ <outputDirectory>/</outputDirectory>
+ <directory>${project.build.directory}/generated-documentation/apache-tamaya-docs-${project.version}</directory>
+ </fileSet>
+ </fileSets>
+
</assembly>
\ No newline at end of file