myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1420950 - in /myfaces/core/branches/2.1.x-client-window: impl/pom.xml pom.xml
Date Wed, 12 Dec 2012 20:28:32 GMT
Author: lu4242
Date: Wed Dec 12 20:28:31 2012
New Revision: 1420950

URL: http://svn.apache.org/viewvc?rev=1420950&view=rev
Log:
merge revisions 1410540,1410553,1410652,1412781,1412831,1412932,1417719,1418586,1418589 from
trunk

Modified:
    myfaces/core/branches/2.1.x-client-window/impl/pom.xml
    myfaces/core/branches/2.1.x-client-window/pom.xml

Modified: myfaces/core/branches/2.1.x-client-window/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/impl/pom.xml?rev=1420950&r1=1420949&r2=1420950&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/impl/pom.xml (original)
+++ myfaces/core/branches/2.1.x-client-window/impl/pom.xml Wed Dec 12 20:28:31 2012
@@ -629,124 +629,6 @@
 
 
     <profiles>
-        <!-- 
-        <profile>
-            <id>add-shared-dependency</id>
-            <activation>
-                <property>
-                    <name>dev</name>
-                    <value>true</value>
-                </property>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.myfaces.shared</groupId>
-                    <artifactId>myfaces-shared-impl</artifactId>
-                    <scope>compile</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-
-        <profile>
-            <id>unpack-shared</id>
-            <activation>
-                <property>
-                    <name>!dev</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <version>2.0</version>
-                        <executions>
-                            
-                            <execution>
-                                <id>unpack-shared-impl</id>
-                                <phase>process-classes</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.apache.myfaces.shared</groupId>
-                                            <artifactId>myfaces-shared-impl</artifactId>
-                                            <version>${myfaces-shared.version}</version>
-                                            <excludes>META-INF/DEPENDENCIES,META-INF/LICENSE,META-INF/NOTICE,META-INF/MANIFEST.MF</excludes>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </configuration>
-                            </execution>
-                            
-                            <execution>
-                                <id>unpack-shared-impl-sources</id>
-                                <phase>process-sources</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.apache.myfaces.shared</groupId>
-                                            <artifactId>myfaces-shared-impl</artifactId>
-                                            <version>${myfaces-shared.version}</version>
-                                            <classifier>sources</classifier>
-                                            <excludes>META-INF/**</excludes>
-                                        </artifactItem>
-                                    </artifactItems>
-                                    <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
-                                </configuration>
-                            </execution>
-                            
-                            <execution>
-                                <id>unpack-impl-ee6</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                  <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                  <artifactItems>
-                                    <artifactItem>
-                                      <groupId>org.apache.myfaces.core.internal</groupId>
-                                      <artifactId>myfaces-impl-ee6</artifactId>
-                                      <version>${project.version}</version>
-                                    </artifactItem>
-                                  </artifactItems>
-                                  <includes>org/**</includes>
-                                  <outputDirectory>${project.build.directory}/classes</outputDirectory>
-                                </configuration>
-                            </execution>
-                      
-                        </executions>
-                    </plugin>
-                    
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>build-helper-maven-plugin</artifactId>
-                        <version>1.0</version>
-                        <executions>
-                            <execution>
-                                <id>add-source-shared</id>
-                                <phase>process-sources</phase>
-                                <goals>
-                                    <goal>add-source</goal>
-                                </goals>
-                                <configuration>
-                                    <sources>
-                                        <source>${project.build.directory}/shared_sources</source>
-                                    </sources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-        -->
 
         <!--
           - Whenever the full website is generated, the command
@@ -1060,6 +942,38 @@
             </pluginRepositories>
         </profile>
 
+        <profile>
+            <id>ee5</id>
+            <dependencies>
+                <!-- disable Servlet 3.0 -->
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                    <scope>test</scope> <!-- just to make it go away -->
+                </dependency>
+
+                <!-- and enable Servlet 2.5 -->
+                <dependency>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                </dependency>
+            </dependencies>
+
+            <build>
+                <plugins>
+                  <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                      <excludes>
+                         <exclude>src/main/java/org/apache/myfaces/ee6</exclude>
+                      </excludes>
+                    </configuration>
+                  </plugin>
+                </plugins>
+            </build>
+        </profile>
+
     </profiles>
 
     
@@ -1095,17 +1009,11 @@
             <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 2.5 -->
+        <!-- Servlet 3.0 by default. Use the -Pee5 compile for servlet-2.5 -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
 
         <!-- JSP 2.1 -->

Modified: myfaces/core/branches/2.1.x-client-window/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x-client-window/pom.xml?rev=1420950&r1=1420949&r2=1420950&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x-client-window/pom.xml (original)
+++ myfaces/core/branches/2.1.x-client-window/pom.xml Wed Dec 12 20:28:31 2012
@@ -50,8 +50,10 @@
     <modules>
         <module>parent</module>
         <module>api</module>
+<!-- TODO REMOVE!
         <module>shaded-impl</module>
         <module>implee6</module>
+-->
         <module>shared-public</module>
         <module>shared</module>
         <module>impl</module>



Mime
View raw message