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/03/31 23:33:36 UTC
svn commit: r929724 - in /myfaces/extensions/cdi/trunk: ./ core/ core/api/
core/impl/ jee-modules/jsf-module/api/ jee-modules/jsf-module/impl/
jee-modules/jsf20-module/api/ jee-modules/jsf20-module/impl/ parent/
Author: struberg
Date: Wed Mar 31 21:33:35 2010
New Revision: 929724
URL: http://svn.apache.org/viewvc?rev=929724&view=rev
Log:
EXTCDI-7 further pom cleanup
* moving all module version to the <dependencyManagement> section of parent/pom.xml
* cleanup of common dependencies and inter module dependencies
Modified:
myfaces/extensions/cdi/trunk/core/api/pom.xml
myfaces/extensions/cdi/trunk/core/impl/pom.xml
myfaces/extensions/cdi/trunk/core/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/pom.xml
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/pom.xml
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/parent/pom.xml
myfaces/extensions/cdi/trunk/pom.xml
Modified: myfaces/extensions/cdi/trunk/core/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/api/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/api/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/core/api/pom.xml Wed Mar 31 21:33:35 2010
@@ -27,7 +27,6 @@
<artifactId>myfaces-extcdi-core-api</artifactId>
<name>MyFaces Extensions-CDI Core-API</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
@@ -35,21 +34,6 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <dependencies>
- <dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0.0-beta</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
<build>
<resources>
<resource>
Modified: myfaces/extensions/cdi/trunk/core/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/core/impl/pom.xml Wed Mar 31 21:33:35 2010
@@ -27,7 +27,6 @@
<artifactId>myfaces-extcdi-core-impl</artifactId>
<name>MyFaces Extensions-CDI Core-Impl</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
@@ -40,7 +39,6 @@
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
</dependencies>
Modified: myfaces/extensions/cdi/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/core/pom.xml Wed Mar 31 21:33:35 2010
@@ -26,9 +26,9 @@
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>core-project</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<name>MyFaces Extensions-CDI Core</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi</groupId>
@@ -56,11 +56,6 @@
</repositories>
<dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0-beta</version>
- </dependency>
</dependencies>
</project>
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/api/pom.xml Wed Mar 31 21:33:35 2010
@@ -27,7 +27,6 @@
<artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
<name>MyFaces Extensions-CDI JSF 1.2 Module API</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
@@ -48,13 +47,6 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0.0-beta</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/pom.xml Wed Mar 31 21:33:35 2010
@@ -27,7 +27,6 @@
<artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
<name>MyFaces Extensions-CDI JSF 1.2 Module Impl</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
@@ -54,13 +53,6 @@
<version>1.0</version>
<scope>provided</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0.0-beta</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>
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=929724&r1=929723&r2=929724&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 Wed Mar 31 21:33:35 2010
@@ -27,7 +27,6 @@
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
<name>MyFaces Extensions-CDI JSF 2.0 Module API</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
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=929724&r1=929723&r2=929724&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 Wed Mar 31 21:33:35 2010
@@ -27,7 +27,6 @@
<artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
<name>MyFaces Extensions-CDI JSF 2.0 Module Impl</name>
- <version>1.0.0-SNAPSHOT</version>
<parent>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
Modified: myfaces/extensions/cdi/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/parent/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/parent/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/parent/pom.xml Wed Mar 31 21:33:35 2010
@@ -60,6 +60,125 @@
<inceptionYear>2008</inceptionYear>
+ <properties>
+ <owb.version>1.0.0-SNAPSHOT</owb.version>
+ <myfaces.version>2.0.0-SNAPSHOT</myfaces.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- OWB specific dependencies-->
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0-beta</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <version>1.0.0-beta</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-impl</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-spi</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-web</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans.test</groupId>
+ <artifactId>cditest</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openwebbeans.test</groupId>
+ <artifactId>cditest-owb</artifactId>
+ <version>${owb.version}</version>
+ </dependency>
+
+
+
+ <!-- the JSF independent core -->
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
+ <artifactId>myfaces-extcdi-core-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.core</groupId>
+ <artifactId>myfaces-extcdi-core-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- the JSF-1.2 specific library -->
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+
+ <!-- the JSF-2.0 specific library, which includes the JSF-1.2 parts -->
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ </dependencyManagement>
+
+ <!-- These dependencies are needed for each and every module in this project -->
+ <dependencies>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <version>1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+ <version>1.0-beta</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+ <version>1.0.0-beta</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
<build>
<resources>
<resource>
Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=929724&r1=929723&r2=929724&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Wed Mar 31 21:33:35 2010
@@ -63,14 +63,6 @@
module and then on each module listed below.
-->
- <properties>
- <owb.version>1.0.0-SNAPSHOT</owb.version>
- <myfaces.version>2.0.0-SNAPSHOT</myfaces.version>
- </properties>
-
- <dependencyManagement>
-
- </dependencyManagement>
<modules>
<module>parent</module>