Author: craigmcc
Date: Sun Oct 1 10:17:07 2006
New Revision: 451771
URL: http://svn.apache.org/viewvc?view=rev&rev=451771
Log:
Tweak the jsfri and jsfri12 profiles to improve the selection of dependencies.
Current status of jsfri profile:
- Invoke via "mvn -Djsf=ri" on the command line
- Uses the official 1.1_02 APIs from java.net
- Requires manual installation of two JARs as described in Maven output
- Standard unit tests for all sample apps work; however the ExceptionTestCase
integration test for shale-usecases appears to go into an endless loop
Current status of jsfri12 profile:
- Invoke via "mvn -Djsf=ri12" on the command line
- Uses the official 1.2_02 APIs from java.net (and the
official version of JSP 2.1 APIs as well)
- Marks all of these APIs as "provided" because they will
be installed already on a Java EE 5 container
- Unit tests currently fail on shale-usecases; we will need
a JSF 1.2 compatible version of shale-test to deal with that
Modified:
shale/framework/trunk/shale-apps/pom.xml
Modified: shale/framework/trunk/shale-apps/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-apps/pom.xml?view=diff&rev=451771&r1=451770&r2=451771
==============================================================================
--- shale/framework/trunk/shale-apps/pom.xml (original)
+++ shale/framework/trunk/shale-apps/pom.xml Sun Oct 1 10:17:07 2006
@@ -65,6 +65,12 @@
</dependency>
<dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.7</version>
@@ -128,21 +134,53 @@
</property>
</activation>
<dependencies>
+ <!-- Force Commons Collections 3.1 so 2.1 is not selected -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.1</version>
+ </dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.1_02</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>1.1_02</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
- <version>2.0</version>
+ <version>1.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -160,18 +198,25 @@
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
- <version>1.2_01-SNAPSHOT</version>
+ <version>1.2_02</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-impl</artifactId>
- <version>1.2_01-SNAPSHOT</version>
- <scope>runtime</scope>
+ <version>1.2_02</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- <version>6.0.0beta17</version>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
