tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ple...@apache.org
Subject incubator-tamaya git commit: TAMAYA-7 Upgraded to Asciidoctor Maven Plugin 1.5.0 (was 0.1.4).
Date Fri, 28 Nov 2014 23:59:11 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master de9b041e5 -> 495e006ae


TAMAYA-7 Upgraded to Asciidoctor Maven Plugin 1.5.0 (was 0.1.4).


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/495e006a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/495e006a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/495e006a

Branch: refs/heads/master
Commit: 495e006ae90b01f94d01fb8e7fed7e4cf04067e9
Parents: de9b041
Author: Oliver B. Fischer <plexus@apache.org>
Authored: Sat Nov 29 00:57:02 2014 +0100
Committer: Oliver B. Fischer <plexus@apache.org>
Committed: Sat Nov 29 00:57:02 2014 +0100

----------------------------------------------------------------------
 api/pom.xml             | 27 ---------------------------
 modules/cdi/pom.xml     | 19 -------------------
 modules/managed/pom.xml | 19 -------------------
 pom.xml                 |  4 +++-
 4 files changed, 3 insertions(+), 66 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/495e006a/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index b778508..d2a853d 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -86,33 +86,6 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-                <configuration>
-                    <sourceDirectory>src/main/asciidoc</sourceDirectory>
-                    <baseDir>${project.basedir}</baseDir>
-                    <eruby>erubis</eruby>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>output-html</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/docs</outputDirectory>
-                            <!-- sourceHighlighter>highlightjs</sourceHighlighter
-->
-                            <sourceHighlighter>coderay</sourceHighlighter>
-                            <backend>html</backend>
-                            <embedAssets>true</embedAssets>
-                            <imagesDir>src/main/asciidoc/images/</imagesDir>
-                            <baseDir>src/main/asciidoc/</baseDir>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/495e006a/modules/cdi/pom.xml
----------------------------------------------------------------------
diff --git a/modules/cdi/pom.xml b/modules/cdi/pom.xml
index c692e8c..54d27c1 100644
--- a/modules/cdi/pom.xml
+++ b/modules/cdi/pom.xml
@@ -66,25 +66,6 @@ under the License.
                     <target>${maven.compile.targetLevel}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>output-html</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/docs</outputDirectory>
-                            <sourceHighlighter>highlightjs</sourceHighlighter>
-                            <!-- coderay -->
-                            <backend>html</backend>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/495e006a/modules/managed/pom.xml
----------------------------------------------------------------------
diff --git a/modules/managed/pom.xml b/modules/managed/pom.xml
index 53d0f2d..15b2372 100644
--- a/modules/managed/pom.xml
+++ b/modules/managed/pom.xml
@@ -59,25 +59,6 @@ under the License.
                     <target>${maven.compile.targetLevel}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>output-html</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>process-asciidoc</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/docs</outputDirectory>
-                            <sourceHighlighter>highlightjs</sourceHighlighter>
-                            <!-- coderay -->
-                            <backend>html</backend>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/495e006a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4272de1..c9c984b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,6 +48,8 @@ under the License.
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<junit.version>4.8.2</junit.version>
+
+        <asciidoctor.version>1.5.0</asciidoctor.version>
 	</properties>
 
     <licenses>
@@ -140,7 +142,7 @@ under the License.
                 <plugin>
                     <groupId>org.asciidoctor</groupId>
                     <artifactId>asciidoctor-maven-plugin</artifactId>
-                    <version>0.1.4</version>
+                    <version>${asciidoctor.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>


Mime
View raw message