You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2010/06/29 11:03:29 UTC

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

Author: struberg
Date: Tue Jun 29 09:03:29 2010
New Revision: 958888

URL: http://svn.apache.org/viewvc?rev=958888&view=rev
Log:
EXTCDI-27 configure maven-shade-plugin to reuse jsf12 code in the jsf20 module

Please note that this doesn't yet cover package exclusion but simply merges all
the classes from the jsf12 artifact into the jsf20 artifact.

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

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=958888&r1=958887&r2=958888&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 Tue Jun 29 09:03:29 2010
@@ -80,6 +80,7 @@
                 </includes>
             </resource>
         </resources>
+        
         <plugins>
             <plugin>
                 <inherited>true</inherited>
@@ -95,6 +96,30 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <createSourcesJar>true</createSourcesJar>
+                    <artifactSet>
+                        <includes>
+                            <include>org.apache.myfaces.extensions.cdi.jee-modules:myfaces-extcdi-jsf12-module-api</include>
+                        </includes>
+                    </artifactSet>
+                </configuration>
+            </plugin>
+            
         </plugins>
     </build>
 

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=958888&r1=958887&r2=958888&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 Tue Jun 29 09:03:29 2010
@@ -115,7 +115,29 @@
                     </execution>
                 </executions>
             </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>1.3.3</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <createDependencyReducedPom>true</createDependencyReducedPom>
+                    <createSourcesJar>true</createSourcesJar>
+                    <artifactSet>
+                        <includes>
+                            <include>org.apache.myfaces.extensions.cdi.jee-modules:myfaces-extcdi-jsf12-module-impl</include>
+                        </includes>
+                    </artifactSet>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
-
 </project>

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml?rev=958888&r1=958887&r2=958888&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/pom.xml Tue Jun 29 09:03:29 2010
@@ -36,6 +36,10 @@
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <myfaces2.version>2.0.0</myfaces2.version>
+    </properties>
+
     <modules>
         <module>api</module>
         <module>impl</module>
@@ -45,7 +49,7 @@
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
-            <version>${jsf.version}</version>
+            <version>${myfaces2.version}</version>
             <scope>compile</scope>
         </dependency>
 
@@ -57,7 +61,4 @@
         </dependency>
     </dependencies>
 
-    <properties>
-        <jsf.version>2.0.0-beta-2</jsf.version>
-    </properties>
 </project>