Author: craigmcc
Date: Fri Apr 13 21:39:14 2007
New Revision: 528759
URL: http://svn.apache.org/viewvc?view=rev&rev=528759
Log:
[SHALE-435] Make it possible to compile shale-test under JDK 1.6. This does
not solve all 1.6 related problems; for example, shale-core's test target fails
because the servet API jar is not put on the test classpath (???). This bears
more investigation, and might be a Maven 2.0.4 thing.
Modified:
shale/framework/trunk/pom.xml
shale/framework/trunk/shale-test/pom.xml
Modified: shale/framework/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/pom.xml?view=diff&rev=528759&r1=528758&r2=528759
==============================================================================
--- shale/framework/trunk/pom.xml (original)
+++ shale/framework/trunk/pom.xml Fri Apr 13 21:39:14 2007
@@ -101,6 +101,15 @@
</modules>
</profile>
<profile>
+ <id>shale-parent-jdk16</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <modules>
+ <module>shale-tiger</module>
+ </modules>
+ </profile>
+ <profile>
<id>release</id>
<activation>
<property>
Modified: shale/framework/trunk/shale-test/pom.xml
URL:
http://svn.apache.org/viewvc/shale/framework/trunk/shale-test/pom.xml?view=diff&rev=528759&r1=528758&r2=528759
==============================================================================
--- shale/framework/trunk/shale-test/pom.xml (original)
+++ shale/framework/trunk/shale-test/pom.xml Fri Apr 13 21:39:14 2007
@@ -181,6 +181,39 @@
</dependencies>
</profile>
+ <profile>
+ <id>shale-test-jdk16</id>
+ <activation>
+ <jdk>1.6</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_03</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_03</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
</profiles>
</project>
