From ad3fa505f33d3533f226ad32ddb833b757343400 Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Fri, 4 Dec 2009 18:26:25 +0000
Subject: [PATCH] SPR-5327: tweak the build.xml for core to try and make
 commons-logging optional in generated poms

---
 org.springframework.core/build.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/org.springframework.core/build.xml b/org.springframework.core/build.xml
index 22b6afaa73..dd79022c7d 100644
--- a/org.springframework.core/build.xml
+++ b/org.springframework.core/build.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="org.springframework.core">
+<project name="org.springframework.core" xmlns:ivy="antlib:org.apache.ivy.ant">
 	<property file="${basedir}/../build.properties"/>
 	<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
 	<import file="${basedir}/../spring-build/standard/default.xml"/>
+	<target name="create.pom" depends="ivy.init, resolve">
+		<delete quiet="true" file="${pom.output.file}"/>
+		<mkdir dir="${pom.output.dir}"/>
+		<!-- 
+			 This overrides the default so that commons-logging can be made mandatory in one place: SPR-5327.
+			 Actually it's not working: commons-logging comes out as optional whatever you do here or in ivy.xml.
+			 Oh well.
+		  -->
+		<ivy:makepom ivyfile="${ivy.output.file}" pomfile="${pom.output.file}">
+			<mapping conf="compile" scope="compile"/>
+			<mapping conf="commons-logging" scope="compile"/>
+			<mapping conf="provided" scope="provided"/>
+			<mapping conf="dm-server-provided" scope="provided"/>
+			<mapping conf="runtime" scope="runtime"/>
+			<mapping conf="test" scope="test"/>
+		</ivy:makepom>
+	</target>
 </project>