myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1410553 - in /myfaces/core/trunk: impl/pom.xml implee6/ parent/pom.xml shaded-impl/
Date Fri, 16 Nov 2012 20:00:08 GMT
Author: struberg
Date: Fri Nov 16 20:00:07 2012
New Revision: 1410553

URL: http://svn.apache.org/viewvc?rev=1410553&view=rev
Log:
MYFACES-3649 remove implee6 and shaded-impl

This now all gets handled in core/impl itself

Removed:
    myfaces/core/trunk/implee6/
    myfaces/core/trunk/shaded-impl/
Modified:
    myfaces/core/trunk/impl/pom.xml
    myfaces/core/trunk/parent/pom.xml

Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=1410553&r1=1410552&r2=1410553&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Fri Nov 16 20:00:07 2012
@@ -536,6 +536,28 @@
                 </executions>
             </plugin>
 
+            <!-- include implee6 via maven-shade-plugin -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                    <createSourcesJar>true</createSourcesJar>
+                    <artifactSet>
+                        <includes>
+                            <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
+                        </includes>
+                    </artifactSet>
+                </configuration>
+            </plugin>
 
             <!-- create OSGI-ready manifest.mf -->
             <plugin>

Modified: myfaces/core/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/parent/pom.xml?rev=1410553&r1=1410552&r2=1410553&view=diff
==============================================================================
--- myfaces/core/trunk/parent/pom.xml (original)
+++ myfaces/core/trunk/parent/pom.xml Fri Nov 16 20:00:07 2012
@@ -298,19 +298,10 @@
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- myfaces-impl-ee6 (will be packed together with myfaces-impl by shade-plugin)
-->
-            <dependency>
-                <groupId>org.apache.myfaces.core.internal</groupId>
-                <artifactId>myfaces-impl-ee6</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
 
-            
             <!-- SPEC DEPENDENCIES -->
 
-            <!-- Servlet 2.5 -->
+            <!-- Servlet 2.5 (for ee5 compat compile) -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
@@ -318,7 +309,7 @@
                 <scope>provided</scope>
             </dependency>
 
-            <!-- Servlet 3.0 (for myfaces-impl-ee6) -->
+            <!-- Servlet 3.0 (for ee6) -->
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_3.0_spec</artifactId>



Mime
View raw message