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 14:53:08 UTC
[myfaces-tobago] branch tobago-3.0.x updated: 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 tobago-3.0.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-3.0.x by this push:
new de4ed3d TOBAGO-1654: TLD doc as JAR isn't distributed
de4ed3d is described below
commit de4ed3d274b42bc5fe9ecfd25ffd05a7605b8036
Author: Udo Schnurpfeil <lo...@apache.org>
AuthorDate: Fri Jan 5 15:37:19 2018 +0100
TOBAGO-1654: TLD doc as JAR isn't distributed
---
tobago-assembly/pom.xml | 38 ++++---------------------
tobago-core/pom.xml | 75 +++++++++++--------------------------------------
2 files changed, 22 insertions(+), 91 deletions(-)
diff --git a/tobago-assembly/pom.xml b/tobago-assembly/pom.xml
index 2e9b2df..a1c847f 100644
--- a/tobago-assembly/pom.xml
+++ b/tobago-assembly/pom.xml
@@ -93,34 +93,10 @@
<classifier>javadoc</classifier>
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/javadoc
- </outputDirectory>
+ <outputDirectory>${project.build.directory}/javadoc</outputDirectory>
</configuration>
</execution>
- <!--execution>
- <id>copy-project</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>${project.groupId}</groupId>
- <artifactId>tobago</artifactId>
- <version>${project.version}</version>
- <classifier>source-release</classifier>
- <type>zip</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/assembly/out
- </outputDirectory>
- <unpackMarkersDirectory>${project.build.directory}/project
- </unpackMarkersDirectory>
- </configuration>
- </execution-->
-
<execution>
<id>copy-sandbox</id>
<phase>generate-resources</phase>
@@ -140,8 +116,6 @@
</configuration>
</execution>
-<!--
-XXX TOBAGO-1654
<execution>
<id>copy-tlddoc</id>
<phase>generate-resources</phase>
@@ -159,13 +133,11 @@ XXX TOBAGO-1654
</artifactItem>
</artifactItems>
- <outputDirectory>${project.build.directory}/tlddoc
- </outputDirectory>
+ <outputDirectory>${project.build.directory}/tlddoc</outputDirectory>
</configuration>
</execution>
--->
- <execution>
+ <execution>
<id>copy-tld</id>
<phase>generate-resources</phase>
<goals>
@@ -254,7 +226,9 @@ XXX TOBAGO-1654
</goals>
<configuration>
- <descriptor>src/main/assembly/dep.xml</descriptor>
+ <descriptors>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </descriptors>
<finalName>myfaces-tobago-${project.version}</finalName>
<outputDirectory>target/assembly/out</outputDirectory>
<workDirectory>target/assembly/work</workDirectory>
diff --git a/tobago-core/pom.xml b/tobago-core/pom.xml
index e9702aa..d166a86 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,13 +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>
@@ -116,7 +122,9 @@
<executions>
<execution>
<id>attach-source</id>
- <goals><goal>jar</goal></goals>
+ <goals>
+ <goal>jar</goal>
+ </goals>
</execution>
</executions>
</plugin>
@@ -226,7 +234,7 @@
<executions>
<execution>
<id>attach-tlddoc</id>
- <phase>generate-sources</phase>
+ <phase>prepare-package</phase>
<goals>
<goal>vdldoc</goal>
</goals>
@@ -239,14 +247,13 @@
<executions>
<execution>
<id>tlddoc-jar</id>
- <phase>process-resources</phase>
+ <phase>package</phase>
<goals>
- <goal>assembly</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
- <classifier>tlddoc</classifier>
<descriptors>
<descriptor>assembly-tlddoc.xml</descriptor>
</descriptors>
@@ -257,56 +264,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>assembly</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <classifier>tlddoc</classifier>
- <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>'].