myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1410520 - in /myfaces/core/branches/2.2.x: impl/pom.xml implee6/ parent/pom.xml shaded-impl/
Date Fri, 16 Nov 2012 18:09:10 GMT
Author: struberg
Date: Fri Nov 16 18:09:09 2012
New Revision: 1410520

URL: http://svn.apache.org/viewvc?rev=1410520&view=rev
Log:
MYFACES-3649 remove implee and shading

this is now all contained in core/impl itself

Removed:
    myfaces/core/branches/2.2.x/implee6/
    myfaces/core/branches/2.2.x/shaded-impl/
Modified:
    myfaces/core/branches/2.2.x/impl/pom.xml
    myfaces/core/branches/2.2.x/parent/pom.xml

Modified: myfaces/core/branches/2.2.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/impl/pom.xml?rev=1410520&r1=1410519&r2=1410520&view=diff
==============================================================================
--- myfaces/core/branches/2.2.x/impl/pom.xml (original)
+++ myfaces/core/branches/2.2.x/impl/pom.xml Fri Nov 16 18:09:09 2012
@@ -553,25 +553,9 @@
                     <createSourcesJar>true</createSourcesJar>
                     <artifactSet>
                         <includes>
-                            <include>org.apache.myfaces.core.internal:myfaces-impl-ee6</include>
                             <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
                         </includes>
                     </artifactSet>
-                    <filters>
-                        <filter>
-                            <artifact>org.apache.myfaces.core.internal:myfaces-impl-ee6</artifact>
-                            <includes>
-                                <include>META-INF/services/**</include>
-                                <include>org/apache/myfaces/**</include>
-                            </includes>
-                            <excludes>
-                                <exclude>META-INF/LICENSE</exclude>
-                                <exclude>META-INF/NOTICE</exclude>
-                                <exclude>META-INF/DEPENDENCIES</exclude>
-                                <exclude>META-INF/MANIFEST.MF</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
                 </configuration>
             </plugin>
 
@@ -1023,13 +1007,6 @@
             <optional>true</optional> 
         </dependency>
 
-        <!-- maven-shade-plugin will exclude this dependency automatically -->
-        <dependency>
-            <groupId>org.apache.myfaces.core.internal</groupId>
-            <artifactId>myfaces-impl-ee6</artifactId>
-            <optional>true</optional> <!-- optional does not completely work
in dependencyManagement (MNG-1630) -->
-        </dependency>
-
         <!-- Servlet 3.0 by default. Use the -Pee5 compile for servlet-2.5 -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: myfaces/core/branches/2.2.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.2.x/parent/pom.xml?rev=1410520&r1=1410519&r2=1410520&view=diff
==============================================================================
--- myfaces/core/branches/2.2.x/parent/pom.xml (original)
+++ myfaces/core/branches/2.2.x/parent/pom.xml Fri Nov 16 18:09:09 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