You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2018/01/05 12:46:53 UTC

[myfaces-tobago] 01/02: TOBAGO-1654: TLD doc as JAR isn't distributed

This is an automated email from the ASF dual-hosted git repository.

lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git

commit fbd1f27649b3ca96b9d2cb216b8013ca8220972c
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Thu Jan 4 17:57:12 2018 +0100

    TOBAGO-1654: TLD doc as JAR isn't distributed
---
 tobago-core/pom.xml | 70 +++++++++++------------------------------------------
 1 file changed, 14 insertions(+), 56 deletions(-)

diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index 9486553..9780698 100644
--- a/tobago-core/pom.xml
+++ b/tobago-core/pom.xml
@@ -52,6 +52,11 @@
             <arg>-AtargetCheckstyle=META-INF</arg>
           </compilerArgs>
         </configuration>
+        <executions>
+          <execution>
+            <id>generate-sources</id>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-resources-plugin</artifactId>
@@ -81,14 +86,14 @@
           <execution>
             <id>test-jar</id>
             <goals>
-             <goal>test-jar</goal>
-           </goals>
+              <goal>test-jar</goal>
+            </goals>
           </execution>
           <execution>
             <id>default-jar</id>
             <goals>
-             <goal>jar</goal>
-           </goals>
+              <goal>jar</goal>
+            </goals>
           </execution>
         </executions>
         <configuration>
@@ -118,7 +123,9 @@
         <executions>
           <execution>
             <id>attach-source</id>
-            <goals><goal>jar</goal></goals>
+            <goals>
+              <goal>jar</goal>
+            </goals>
           </execution>
         </executions>
       </plugin>
@@ -221,7 +228,7 @@
             <executions>
               <execution>
                 <id>attach-tlddoc</id>
-                <phase>generate-sources</phase>
+                <phase>prepare-package</phase>
                 <goals>
                   <goal>vdldoc</goal>
                 </goals>
@@ -234,7 +241,7 @@
             <executions>
               <execution>
                 <id>tlddoc-jar</id>
-                <phase>process-resources</phase>
+                <phase>package</phase>
                 <goals>
                   <goal>single</goal>
                 </goals>
@@ -251,55 +258,6 @@
     </profile>
 
     <profile>
-      <id>generate-assembly</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.github.matinh.vdldoc</groupId>
-            <artifactId>vdldoc-maven-plugin</artifactId>
-            <configuration>
-              <destDir>tlddoc</destDir>
-              <documentTitle>Tag Library Documentation</documentTitle>
-              <excludes>
-                <exclude>target/classes/**</exclude>
-              </excludes>
-              <includes>
-                <include>target/generated/META-INF/tobago.taglib.xml</include>
-              </includes>
-              <reportOutputDirectory>target</reportOutputDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <id>attach-tlddoc</id>
-                <phase>generate-resources</phase>
-                <goals>
-                  <goal>vdldoc</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>tlddoc-jar</id>
-                <phase>process-resources</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <descriptors>
-                <descriptor>assembly-tlddoc.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
       <id>attach-source</id>
       <build>
         <plugins>

-- 
To stop receiving notification emails like this one, please contact
"commits@myfaces.apache.org" <co...@myfaces.apache.org>.