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/08/24 00:10:46 UTC
svn commit: r988338 - in /myfaces/extensions/cdi/trunk: ./ core/impl/
dist/jsf12/ dist/jsf20/ examples/jsf-examples/hello_myfaces-codi_jsf12/
examples/jsf-examples/hello_myfaces-codi_jsf20/ jee-modules/jsf-module/api/
jee-modules/jsf-module/impl/ jee-m...
Author: struberg
Date: Mon Aug 23 22:10:45 2010
New Revision: 988338
URL: http://svn.apache.org/viewvc?rev=988338&view=rev
Log:
fix version management in our poms
Modified:
myfaces/extensions/cdi/trunk/core/impl/pom.xml
myfaces/extensions/cdi/trunk/dist/jsf12/pom.xml
myfaces/extensions/cdi/trunk/dist/jsf20/pom.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml
myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/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/jse-modules/message-module/impl/pom.xml
myfaces/extensions/cdi/trunk/pom.xml
Modified: myfaces/extensions/cdi/trunk/core/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/core/impl/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/core/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/core/impl/pom.xml Mon Aug 23 22:10:45 2010
@@ -38,7 +38,6 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified: myfaces/extensions/cdi/trunk/dist/jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/dist/jsf12/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/dist/jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/dist/jsf12/pom.xml Mon Aug 23 22:10:45 2010
@@ -40,56 +40,48 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-bv1-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jse-modules</groupId>
<artifactId>myfaces-extcdi-message-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jse-modules</groupId>
<artifactId>myfaces-extcdi-message-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: myfaces/extensions/cdi/trunk/dist/jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/dist/jsf20/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/dist/jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/dist/jsf20/pom.xml Mon Aug 23 22:10:45 2010
@@ -40,56 +40,48 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-bv1-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jse-modules</groupId>
<artifactId>myfaces-extcdi-message-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jse-modules</groupId>
<artifactId>myfaces-extcdi-message-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf12/pom.xml Mon Aug 23 22:10:45 2010
@@ -48,42 +48,36 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-bv1-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-bv1-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
@@ -135,28 +129,24 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0.0-beta</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
- <version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>compile</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0-beta</version>
<scope>compile</scope>
</dependency>
@@ -200,9 +190,8 @@
<!-- el -->
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/examples/jsf-examples/hello_myfaces-codi_jsf20/pom.xml Mon Aug 23 22:10:45 2010
@@ -39,28 +39,24 @@
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
<artifactId>myfaces-extcdi-core-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.jee-modules</groupId>
<artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -106,28 +102,25 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0.0-beta</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-validation_1.0_spec</artifactId>
- <version>1.0</version>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
- <scope>compile</scope>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0-beta</version>
<scope>compile</scope>
</dependency>
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=988338&r1=988337&r2=988338&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 Mon Aug 23 22:10:45 2010
@@ -41,9 +41,8 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
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=988338&r1=988337&r2=988338&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 Mon Aug 23 22:10:45 2010
@@ -56,11 +56,11 @@
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <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=988338&r1=988337&r2=988338&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 Mon Aug 23 22:10:45 2010
@@ -50,16 +50,14 @@
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
<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>
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=988338&r1=988337&r2=988338&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 Mon Aug 23 22:10:45 2010
@@ -38,32 +38,27 @@
<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.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-jsf12-module-impl</artifactId>
- <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>1.0</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
<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>
Modified: myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/jse-modules/message-module/impl/pom.xml Mon Aug 23 22:10:45 2010
@@ -43,7 +43,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-atinject_1.0_spec</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -54,12 +53,14 @@
<scope>provided</scope>
</dependency>
+ <!-- TODO DROP junit and take testng like everywhere else! -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<scope>test</scope>
</dependency>
+
</dependencies>
<repositories>
Modified: myfaces/extensions/cdi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/pom.xml?rev=988338&r1=988337&r2=988338&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/pom.xml (original)
+++ myfaces/extensions/cdi/trunk/pom.xml Mon Aug 23 22:10:45 2010
@@ -97,19 +97,22 @@
<dependencies>
<!-- OWB specific dependencies-->
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
<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</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
@@ -217,8 +220,15 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_2.2_spec</artifactId>
- <version>1.0-beta</version>
+ <version>1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -243,15 +253,13 @@
<!-- atinject and cdi specs for OWB-->
<dependency>
- <groupId>javax.inject</groupId>
- <artifactId>javax.inject</artifactId>
- <version>1</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-atinject_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jcdi_1.0_spec</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>
@@ -259,7 +267,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-interceptor_1.1_spec</artifactId>
- <version>1.0</version>
<scope>provided</scope>
</dependency>