Author: rmannibucau
Date: Thu Jul 19 18:29:11 2012
New Revision: 1363461
URL: http://svn.apache.org/viewvc?rev=1363461&view=rev
Log:
trying to get rid of openejb-jsf
Modified:
openejb/trunk/openejb/container/openejb-jsf/pom.xml
openejb/trunk/openejb/container/pom.xml
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/tomee/tomee-embedded/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
Modified: openejb/trunk/openejb/container/openejb-jsf/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jsf/pom.xml?rev=1363461&r1=1363460&r2=1363461&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jsf/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-jsf/pom.xml Thu Jul 19 18:29:11 2012
@@ -44,8 +44,8 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.apache.openejb.patch</groupId>
- <artifactId>openejb-openwebbeans-jsf</artifactId>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
<version>${org.apache.openwebbeans.version}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/container/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/pom.xml?rev=1363461&r1=1363460&r2=1363461&view=diff
==============================================================================
--- openejb/trunk/openejb/container/pom.xml (original)
+++ openejb/trunk/openejb/container/pom.xml Thu Jul 19 18:29:11 2012
@@ -35,7 +35,6 @@
<module>openejb-jee</module>
<module>openejb-jee-accessors</module>
<module>openejb-junit</module>
- <module>openejb-jsf</module>
<module>openejb-jpa-integration</module>
</modules>
</project>
\ No newline at end of file
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1363461&r1=1363460&r2=1363461&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Thu Jul 19 18:29:11 2012
@@ -143,7 +143,7 @@
<junit.version>4.9</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
<scannotation.version>1.0.2</scannotation.version>
- <org.apache.openwebbeans.version>1.1.4</org.apache.openwebbeans.version>
+
<org.apache.openwebbeans.version>1.1.5-SNAPSHOT</org.apache.openwebbeans.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
Modified: openejb/trunk/openejb/tomee/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/pom.xml?rev=1363461&r1=1363460&r2=1363461&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/pom.xml Thu Jul 19 18:29:11 2012
@@ -87,12 +87,17 @@
</build>
<dependencies>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jsf</artifactId>
- <version>${openejb.version}</version>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${org.apache.openwebbeans.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb.version}</version>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1363461&r1=1363460&r2=1363461&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Thu Jul 19 18:29:11 2012
@@ -148,16 +148,14 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-jsf</artifactId>
- <version>${openejb.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${org.apache.openwebbeans.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ <version>${myfaces.version}</version>
</dependency>
<dependency>
<groupId>org.apache.openejb</groupId>
