You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/06/25 08:39:37 UTC
svn commit: r671444 - /myfaces/orchestra/trunk/examples/pom.xml
Author: skitching
Date: Tue Jun 24 23:39:37 2008
New Revision: 671444
URL: http://svn.apache.org/viewvc?rev=671444&view=rev
Log:
Use cglib-nodep instead of cglib, now orchestra-sandbox uses ASM.
Update to latest snapshots of orchestra core and core15.
Modified:
myfaces/orchestra/trunk/examples/pom.xml
Modified: myfaces/orchestra/trunk/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/pom.xml?rev=671444&r1=671443&r2=671444&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/pom.xml (original)
+++ myfaces/orchestra/trunk/examples/pom.xml Tue Jun 24 23:39:37 2008
@@ -75,6 +75,7 @@
<name>!jsf</name>
</property>
</activation>
+
<dependencies>
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -82,13 +83,14 @@
<version>1.1.6-SNAPSHOT</version>
</dependency>
- <!-- needed just to run jetty -->
<dependency>
+ <!-- needed just to run jetty -->
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
<version>1.1.6-SNAPSHOT</version>
- <scope>runtime</scope>
+
</dependency>
+
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
@@ -170,6 +172,7 @@
<artifactId>jsf-api</artifactId>
<version>1.2_04-p02</version>
</dependency>
+
<!-- needed just to run jetty -->
<dependency>
<groupId>javax.faces</groupId>
@@ -177,6 +180,7 @@
<version>1.2_04-p02</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-el_1.0_spec</artifactId>
@@ -205,47 +209,62 @@
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-core</artifactId>
- <version>1.2-SNAPSHOT</version>
+ <version>1.3-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-core15</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.orchestra</groupId>
<artifactId>myfaces-orchestra-sandbox</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk</artifactId>
<version>1.1.7-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.apache.myfaces.tomahawk</groupId>
<artifactId>tomahawk-sandbox</artifactId>
<version>1.1.7-SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
- <version>2.0.6</version>
+ <version>2.5.3</version>
</dependency>
+
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope>
</dependency>
+
<dependency>
+ <!--
+ - Spring's pom declares an optional dependency on cglib, but it it
+ - needed for any AOP-related functionality. So it must be explicitly
+ - declared as a dependency here. The -nodep variety is used so that
+ - its ASM library usage is hidden internally and does not conflict
+ - with the asm lib used by the orchestra sandbox.
+ -->
<groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
+ <artifactId>cglib-nodep</artifactId>
<version>2.1_3</version>
</dependency>