Skip to content

Commit ad3fa50

Browse files
author
David Syer
committed
SPR-5327: tweak the build.xml for core to try and make commons-logging optional in generated poms
1 parent 1202f67 commit ad3fa50

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

org.springframework.core/build.xml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project name="org.springframework.core">
2+
<project name="org.springframework.core" xmlns:ivy="antlib:org.apache.ivy.ant">
33
<property file="${basedir}/../build.properties"/>
44
<import file="${basedir}/../build-spring-framework/package-bundle.xml"/>
55
<import file="${basedir}/../spring-build/standard/default.xml"/>
6+
<target name="create.pom" depends="ivy.init, resolve">
7+
<delete quiet="true" file="${pom.output.file}"/>
8+
<mkdir dir="${pom.output.dir}"/>
9+
<!--
10+
This overrides the default so that commons-logging can be made mandatory in one place: SPR-5327.
11+
Actually it's not working: commons-logging comes out as optional whatever you do here or in ivy.xml.
12+
Oh well.
13+
-->
14+
<ivy:makepom ivyfile="${ivy.output.file}" pomfile="${pom.output.file}">
15+
<mapping conf="compile" scope="compile"/>
16+
<mapping conf="commons-logging" scope="compile"/>
17+
<mapping conf="provided" scope="provided"/>
18+
<mapping conf="dm-server-provided" scope="provided"/>
19+
<mapping conf="runtime" scope="runtime"/>
20+
<mapping conf="test" scope="test"/>
21+
</ivy:makepom>
22+
</target>
623
</project>

0 commit comments

Comments
 (0)