You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2011/06/22 06:42:30 UTC

svn commit: r1138300 - in /myfaces/extensions/cdi/trunk: bundles/jsf20/pom.xml jee-modules/jsf20-module/api/pom.xml jee-modules/jsf20-module/impl/pom.xml

Author: gpetracek
Date: Wed Jun 22 04:42:30 2011
New Revision: 1138300

URL: http://svn.apache.org/viewvc?rev=1138300&view=rev
Log:
EXTCDI-201 fixed javadoc generation

Modified:
    myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml

Modified: myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml?rev=1138300&r1=1138299&r2=1138300&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/bundles/jsf20/pom.xml Wed Jun 22 04:42:30 2011
@@ -106,6 +106,7 @@
             <scope>compile</scope>
         </dependency>
 
+        <!-- needed for the javadoc generation -->
         <dependency>
             <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
             <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml?rev=1138300&r1=1138299&r2=1138300&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/api/pom.xml Wed Jun 22 04:42:30 2011
@@ -113,4 +113,42 @@
         </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>
+                                        <dependencySourceExclude>org.apache.myfaces.core:*</dependencySourceExclude>
+                                        <dependencySourceExclude>org.apache.myfaces.extensions.cdi.core:*</dependencySourceExclude>
+                                    </dependencySourceExcludes>
+
+                                    <encoding>UTF-8</encoding>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml?rev=1138300&r1=1138299&r2=1138300&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/pom.xml Wed Jun 22 04:42:30 2011
@@ -65,6 +65,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- needed for the javadoc generation -->
+        <dependency>
+            <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+            <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -137,4 +143,45 @@
             </plugin>
         </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>
+                                        <dependencySourceExclude>org.apache.myfaces.core:*</dependencySourceExclude>
+                                        <dependencySourceExclude>org.apache.myfaces.extensions.cdi.core:*</dependencySourceExclude>
+                                        <dependencySourceExclude>org.apache.myfaces.extensions.cdi.modules:myfaces-extcdi-message-module-api</dependencySourceExclude>
+                                        <dependencySourceExclude>org.apache.myfaces.extensions.cdi.modules:myfaces-extcdi-message-module-impl</dependencySourceExclude>
+                                    </dependencySourceExcludes>
+
+                                    <encoding>UTF-8</encoding>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>