Author: rmannibucau
Date: Wed Oct 5 09:07:59 2011
New Revision: 1179115
URL: http://svn.apache.org/viewvc?rev=1179115&view=rev
Log:
removing myfaces-api from dependencies since it is in javaee-api >
6.0.3-SNAPSHOT
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml
openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml
openejb/trunk/openejb/assembly/openejb-tomcat/tomee-webservices/pom.xml
openejb/trunk/openejb/container/openejb-jsf/pom.xml
openejb/trunk/openejb/examples/webapps/moviefun/app/pom.xml
openejb/trunk/openejb/pom.xml
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
(original)
+++
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-catalina/pom.xml
Wed Oct 5 09:07:59 2011
@@ -79,11 +79,6 @@
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
</dependencies>
</project>
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
(original)
+++ openejb/trunk/openejb/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
Wed Oct 5 09:07:59 2011
@@ -59,13 +59,14 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>${myfaces.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openejb.patch</groupId>
Modified: openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml (original)
+++ openejb/trunk/openejb/assembly/openejb-tomcat/pom.xml Wed Oct 5 09:07:59
2011
@@ -169,9 +169,5 @@
</dependencies>
</profile>
</profiles>
-
- <properties>
- <myfaces.version>2.1.2</myfaces.version>
- </properties>
</project>
Modified: openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml
(original)
+++ openejb/trunk/openejb/assembly/openejb-tomcat/tomee-embedded/pom.xml Wed
Oct 5 09:07:59 2011
@@ -61,12 +61,12 @@
<artifactId>myfaces-impl</artifactId>
<version>2.1.2</version>
<scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.1.2</version>
- <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.myfaces.core</groupId>
+ <artifactId>myfaces-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified:
openejb/trunk/openejb/assembly/openejb-tomcat/tomee-webservices/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/openejb-tomcat/tomee-webservices/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/openejb-tomcat/tomee-webservices/pom.xml
(original)
+++ openejb/trunk/openejb/assembly/openejb-tomcat/tomee-webservices/pom.xml Wed
Oct 5 09:07:59 2011
@@ -100,12 +100,6 @@
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
</project>
Modified: openejb/trunk/openejb/container/openejb-jsf/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jsf/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jsf/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-jsf/pom.xml Wed Oct 5 09:07:59 2011
@@ -38,12 +38,6 @@
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>${myfaces.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>org.apache.openejb.patch</groupId>
<artifactId>openejb-openwebbeans-jsf</artifactId>
<version>1.1.2-SNAPSHOT</version>
Modified: openejb/trunk/openejb/examples/webapps/moviefun/app/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/moviefun/app/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/examples/webapps/moviefun/app/pom.xml (original)
+++ openejb/trunk/openejb/examples/webapps/moviefun/app/pom.xml Wed Oct 5
09:07:59 2011
@@ -88,11 +88,6 @@
<version>2.0.3</version>
</dependency>
<dependency>
- <groupId>org.apache.myfaces.core</groupId>
- <artifactId>myfaces-api</artifactId>
- <version>2.0.3</version>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-core</artifactId>
<version>4.0.0-beta-2-SNAPSHOT</version>
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1179115&r1=1179114&r2=1179115&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Wed Oct 5 09:07:59 2011
@@ -124,7 +124,7 @@
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
<org.apache.openwebbeans.version>1.1.1</org.apache.openwebbeans.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
- <myfaces.version>2.0.7</myfaces.version>
+ <myfaces.version>2.1.2</myfaces.version>
</properties>
<build>
