From 651c2b7928af4cd0d903d02701877ade1301069c Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Wed, 5 Aug 2009 17:44:54 +0000
Subject: [PATCH] SPR-5970 - Tidy up Maven central POM for spring-webmvc

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1695 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.web.servlet/pom.xml | 69 +++++++++++++++++++++++--
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/org.springframework.web.servlet/pom.xml b/org.springframework.web.servlet/pom.xml
index c9b2bd1f9ad..d3f323a9bc1 100644
--- a/org.springframework.web.servlet/pom.xml
+++ b/org.springframework.web.servlet/pom.xml
@@ -12,6 +12,22 @@
     <version>3.0.0.BUILD-SNAPSHOT</version>
   </parent>
 
+  <profiles>
+    <profile>
+      <id>tiger</id>
+      <activation>
+	<jdk>1.5</jdk>
+      </activation>
+      <dependencies>
+	<dependency>
+	  <groupId>stax</groupId>
+	  <artifactId>stax</artifactId>
+	  <version>1.2.0</version>
+	</dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+
   <dependencies>
     <dependency>
       <groupId>rome</groupId>
@@ -71,6 +87,12 @@
       <artifactId>jasperreports</artifactId>
       <version>2.0.5</version>
       <optional>true</optional>
+      <exclusions>
+	<exclusion>
+	  <groupId>xml-apis</groupId>
+	  <artifactId>xml-apis</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -87,21 +109,27 @@
     <dependency>
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-api</artifactId>
-      <version>2.0.5</version>
+      <version>2.1.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-core</artifactId>
-      <version>2.0.5</version>
+      <version>2.1.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.apache.tiles</groupId>
       <artifactId>tiles-jsp</artifactId>
-      <version>2.0.5</version>
+      <version>2.1.2</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>rhino</groupId>
+      <artifactId>js</artifactId>
+      <version>1.7R1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>velocity</groupId>
       <artifactId>velocity</artifactId>
@@ -165,7 +193,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
+      <version>4.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -191,12 +219,32 @@
       <artifactId>dom4j</artifactId>
       <version>1.6.1</version>
       <scope>test</scope>
+      <exclusions>
+	<exclusion>
+	  <groupId>xml-apis</groupId>
+	  <artifactId>xml-apis</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>jaxen</groupId>
       <artifactId>jaxen</artifactId>
       <version>1.1.1</version>
       <scope>test</scope>
+      <exclusions>
+	<exclusion>
+	  <groupId>xml-apis</groupId>
+	  <artifactId>xml-apis</artifactId>
+	</exclusion>
+	<exclusion>
+	  <groupId>xom</groupId>
+	  <artifactId>xom</artifactId>
+	</exclusion>
+	<exclusion>
+	  <groupId>xerces</groupId>
+	  <artifactId>xercesImpl</artifactId>
+	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
@@ -218,5 +266,18 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>jfree</groupId>
+      <artifactId>jfreechart</artifactId>
+      <version>1.0.7</version>
+      <scope>runtime</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.0.1</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
 </project>