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 2012/04/05 09:22:59 UTC

svn commit: r1309674 - in /myfaces/extensions/cdi/trunk: bundles/pom.xml pom.xml

Author: gpetracek
Date: Thu Apr  5 07:22:58 2012
New Revision: 1309674

URL: http://svn.apache.org/viewvc?rev=1309674&view=rev
Log:
EXTCDI-272 exclude alternative modules by default

Modified:
    myfaces/extensions/cdi/trunk/bundles/pom.xml
    myfaces/extensions/cdi/trunk/pom.xml

Modified: myfaces/extensions/cdi/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/bundles/pom.xml?rev=1309674&r1=1309673&r2=1309674&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/bundles/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/bundles/pom.xml Thu Apr  5 07:22:58 2012
@@ -38,8 +38,15 @@
         <module>jsf20</module>
         <module>jsf12-osgi</module>
         <module>jsf20-osgi</module>
-        <module>alternative-configuration</module>
-        <module>alternative-configuration-osgi</module>
     </modules>
 
+    <profiles>
+        <profile>
+            <id>deprecated</id>
+            <modules>
+                <module>alternative-configuration</module>
+                <module>alternative-configuration-osgi</module>
+            </modules>
+        </profile>
+    </profiles>
 </project>

Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=1309674&r1=1309673&r2=1309674&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Thu Apr  5 07:22:58 2012
@@ -326,25 +326,6 @@
                 <version>1.0.5-SNAPSHOT</version>
             </dependency>
 
-            <!-- optional configuration modules -->
-            <dependency>
-                <groupId>org.apache.myfaces.extensions.cdi.modules.alternative</groupId>
-                <artifactId>myfaces-extcdi-core-alternative-configuration</artifactId>
-                <version>1.0.5-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.extensions.cdi.modules.alternative</groupId>
-                <artifactId>myfaces-extcdi-jsf-alternative-configuration</artifactId>
-                <version>1.0.5-SNAPSHOT</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.extensions.cdi.modules.alternative</groupId>
-                <artifactId>myfaces-extcdi-alternative-implementation-module</artifactId>
-                <version>1.0.5-SNAPSHOT</version>
-            </dependency>
-
             <!--
                 We currently need this for the CDI test container to emulate the @SessionScoped.
                 TODO: Finally this should not be necessary anymore.
@@ -648,6 +629,29 @@
             <modules>
                 <module>alternative-modules</module>
             </modules>
+
+            <dependencyManagement>
+                <dependencies>
+                    <!-- optional configuration modules -->
+                    <dependency>
+                        <groupId>org.apache.myfaces.extensions.cdi.modules.alternative</groupId>
+                        <artifactId>myfaces-extcdi-core-alternative-configuration</artifactId>
+                        <version>1.0.5-SNAPSHOT</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.myfaces.extensions.cdi.modules.alternative</groupId>
+                        <artifactId>myfaces-extcdi-jsf-alternative-configuration</artifactId>
+                        <version>1.0.5-SNAPSHOT</version>
+                    </dependency>
+
+                    <dependency>
+                        <groupId>org.apache.myfaces.extensions.cdi.modules.alternative</groupId>
+                        <artifactId>myfaces-extcdi-alternative-implementation-module</artifactId>
+                        <version>1.0.5-SNAPSHOT</version>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
         </profile>
 
         <profile>