You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2011/06/14 20:31:16 UTC
svn commit: r1135733 - in /myfaces/extensions/cdi/trunk/bundles:
jsf12/pom.xml jsf20/pom.xml
Author: jakobk
Date: Tue Jun 14 18:31:16 2011
New Revision: 1135733
URL: http://svn.apache.org/viewvc?rev=1135733&view=rev
Log:
EXTCDI-201 Use maven-dependency-plugin instead of shade to produce bundle artifacts (keep shared mechanism and instead override javadoc-plugin configuration from apache-parent in order to include dependencies for javadoc generation)
Modified:
myfaces/extensions/cdi/trunk/bundles/jsf12/pom.xml
myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml
Modified: myfaces/extensions/cdi/trunk/bundles/jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/jsf12/pom.xml?rev=1135733&r1=1135732&r2=1135733&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/bundles/jsf12/pom.xml Tue Jun 14 18:31:16 2011
@@ -143,4 +143,41 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <!-- override apache-release profile for custom javadoc configuration -->
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- overrides attach-javadocs from apache-parent -->
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <!-- switch on dependency-driven aggregation -->
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceExcludes>
+ <!-- exclude org.apache.geronimo.specs artifacts -->
+ <dependencySourceExclude>org.apache.geronimo.specs:*</dependencySourceExclude>
+ </dependencySourceExcludes>
+
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml?rev=1135733&r1=1135732&r2=1135733&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml Tue Jun 14 18:31:16 2011
@@ -143,4 +143,41 @@
</plugins>
</build>
+ <profiles>
+ <profile>
+ <!-- override apache-release profile for custom javadoc configuration -->
+ <id>apache-release</id>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- overrides attach-javadocs from apache-parent -->
+ <id>attach-javadocs</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <!-- switch on dependency-driven aggregation -->
+ <includeDependencySources>true</includeDependencySources>
+
+ <dependencySourceExcludes>
+ <!-- exclude org.apache.geronimo.specs artifacts -->
+ <dependencySourceExclude>org.apache.geronimo.specs:*</dependencySourceExclude>
+ </dependencySourceExcludes>
+
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>