From e11dc8597d86e2486fd4779dc7a97567ef17002e Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 9 Jun 2011 13:10:09 +0000
Subject: [PATCH] shortened build properties "org.junit.version" to
 "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J
 version back to 1.5.3 (for Hibernate 3.3.1 compatibility)

---
 org.springframework.web.struts/ivy.xml | 106 ++++++++++++-------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/org.springframework.web.struts/ivy.xml b/org.springframework.web.struts/ivy.xml
index 79c85ef2aca..78a6de187c2 100644
--- a/org.springframework.web.struts/ivy.xml
+++ b/org.springframework.web.struts/ivy.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
-<ivy-module
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
-        version="1.3">
-
-	<info organisation="org.springframework" module="${ant.project.name}">
-		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
-	</info>
-
-	<configurations>
-		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
-		<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
-		<conf name="tiles" extends="runtime" description="JARs neeeded to create beans for Tiles"/>
-	</configurations>
-
-	<publications>
-		<artifact name="${ant.project.name}"/>
-		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
-		<artifact name="license" type="license" ext="txt"/>
-		<artifact name="notice" type="notice" ext="txt"/>
-	</publications>
-
-	<dependencies>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
-                    conf="compile, commons-logging->compile"/>
-		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
-                    conf="compile->compile"/>
-		<dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration"
-                    conf="compile->compile"/>
-		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration"
-                    conf="optional, tiles->compile"/>
-		<!-- test dependencies -->
- 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${org.junit.version}" conf="test->runtime"/>
-		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
-		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration"
-                    conf="test->compile"/>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0"
-                    conf="test->compile"/>
-		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2"
-                    conf="test->compile"/>
-	</dependencies>
-
-</ivy-module>
+<?xml version="1.0" encoding="UTF-8"?>
+<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
+<ivy-module
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
+        version="1.3">
+
+	<info organisation="org.springframework" module="${ant.project.name}">
+		<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
+	</info>
+
+	<configurations>
+		<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
+		<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
+		<conf name="tiles" extends="runtime" description="JARs neeeded to create beans for Tiles"/>
+	</configurations>
+
+	<publications>
+		<artifact name="${ant.project.name}"/>
+		<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
+		<artifact name="license" type="license" ext="txt"/>
+		<artifact name="notice" type="notice" ext="txt"/>
+	</publications>
+
+	<dependencies>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
+                    conf="compile, commons-logging->compile"/>
+		<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.beanutils" rev="1.7.0"
+                    conf="compile->compile"/>
+		<dependency org="org.apache.struts" name="com.springsource.org.apache.struts" rev="1.2.9" conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration"
+                    conf="compile->compile"/>
+		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration"
+                    conf="optional, tiles->compile"/>
+		<!-- test dependencies -->
+ 		<dependency org="org.junit" name="com.springsource.org.junit" rev="${junit.version}" conf="test->runtime"/>
+		<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
+		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration"
+                    conf="test->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp" rev="2.1.0"
+                    conf="test->compile"/>
+		<dependency org="javax.servlet" name="com.springsource.javax.servlet.jsp.jstl" rev="1.1.2"
+                    conf="test->compile"/>
+	</dependencies>
+
+</ivy-module>