Skip to content

Commit 1202f67

Browse files
author
David Syer
committed
SPR-5327: tweak the ivy.xml so that commons-logging is a separate configuration. It already comes out as optional in the generated poms (including core), which isn't great, but I can't see what is causing that
1 parent 12892ee commit 1202f67

File tree

18 files changed

+76
-102
lines changed

18 files changed

+76
-102
lines changed

‎org.springframework.aop/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1415
<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
1516
<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
1617
<conf name="jamon" extends="runtime" description="JARs needed to run with JamonAPI"/>
@@ -26,7 +27,7 @@
2627
<dependency org="com.jamonapi" name="com.springsource.com.jamonapi" rev="2.4.0" conf="optional, jamon->compile"/>
2728
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
2829
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
29-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
30+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
3031
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.4.0" conf="optional, pooling->compile"/>
3132
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
3233
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>

‎org.springframework.aspects/ivy.xml

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,39 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
3-
<ivy-module
4-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
6-
version="1.3">
7-
8-
<info organisation="org.springframework" module="${ant.project.name}">
9-
<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
10-
</info>
11-
12-
<configurations>
13-
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14-
<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
15-
<conf name="tx" extends="runtime" description="JARs needed to run transactional aspects"/>
16-
<conf name="orm" extends="runtime" description="JARs needed to compile JPA aspects"/>
17-
</configurations>
18-
19-
<publications>
20-
<artifact name="${ant.project.name}"/>
21-
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
22-
</publications>
23-
24-
<dependencies>
25-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
26-
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
27-
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
28-
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
29-
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional,orm->compile"/>
30-
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
31-
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
32-
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
33-
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
34-
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, compile->compile"/>
35-
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
36-
</dependencies>
37-
38-
</ivy-module>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<?xml-stylesheet type="text/xsl" href="http://ivyrep.jayasoft.org/ivy-doc.xsl"?>
3+
<ivy-module
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="http://incubator.apache.org/ivy/schemas/ivy.xsd"
6+
version="1.3">
7+
8+
<info organisation="org.springframework" module="${ant.project.name}">
9+
<license name="Apache 2.0" url="http://www.apache.org/licenses/LICENSE-2.0"/>
10+
</info>
11+
12+
<configurations>
13+
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
15+
<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
16+
<conf name="tx" extends="runtime" description="JARs needed to run transactional aspects"/>
17+
<conf name="orm" extends="runtime" description="JARs needed to compile JPA aspects"/>
18+
</configurations>
19+
20+
<publications>
21+
<artifact name="${ant.project.name}"/>
22+
<artifact name="${ant.project.name}-sources" type="src" ext="jar"/>
23+
</publications>
24+
25+
<dependencies>
26+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
27+
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
28+
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="test->compile"/>
29+
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="optional, tx->compile"/>
30+
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" conf="optional,orm->compile"/>
31+
<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
32+
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
33+
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
34+
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
35+
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="provided, compile->compile"/>
36+
<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
37+
</dependencies>
38+
39+
</ivy-module>

‎org.springframework.beans/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1415
<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
1516
</configurations>
1617

@@ -23,7 +24,7 @@
2324
<dependency org="javax.el" name="com.springsource.javax.el" rev="1.0.0" conf="provided->compile"/>
2425
<dependency org="javax.inject" name="com.springsource.javax.inject" rev="1.0.0" conf="provided->compile"/>
2526
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
26-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
27+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
2728
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
2829
<!-- test dependencies -->
2930
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>

‎org.springframework.context.support/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
1414
<conf name="commonj" extends="runtime" description="JARs to compile against CommonJ"/>
1515
<conf name="commons-collections" extends="runtime" description="JARs needed to run with Commons Collections"/>
16+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1617
<conf name="ehcache" extends="runtime" description="JARs needed to run with EHCache"/>
1718
<conf name="freemarker" extends="runtime" description="JARs needed to create beans for Freemarker"/>
1819
<conf name="jasper-reports" extends="runtime" description="JARs needed to create beans for Jasper Reports"/>
@@ -35,7 +36,7 @@
3536
<dependency org="net.sourceforge.ehcache" name="com.springsource.net.sf.ehcache" rev="1.6.2" conf="optional, ehcache->compile"/>
3637
<dependency org="net.sourceforge.jasperreports" name="com.springsource.net.sf.jasperreports" rev="2.0.5" conf="optional, jasper-reports->compile"/>
3738
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="optional, commons-collections->compile"/>
38-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
39+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
3940
<dependency org="org.apache.velocity" name="com.springsource.org.apache.velocity" rev="1.5.0" conf="optional, velocity->compile"/>
4041
<dependency org="org.freemarker" name="com.springsource.freemarker" rev="2.3.15" conf="optional, freemarker->compile"/>
4142
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>

‎org.springframework.context/ivy.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
1414
<conf name="aspectj" extends="runtime" description="JARs need to run with AspectJ"/>
15+
<conf name="aop" extends="runtime" description="JARs need to run with AOP"/>
16+
<conf name="commons-logging" extends="runtime" description="JARs need to run with Commons Logging"/>
1517
<conf name="backport-util-concurrent" extends="runtime" description="JARs needed to run with Backport Util Concurrent"/>
1618
<conf name="beanshell" extends="runtime" description="JARs needed to develop BeanShell beans"/>
1719
<conf name="bytecode-proxy" extends="runtime" description="JARs needed to run with CGLIB bytecode proxies"/>
@@ -39,8 +41,8 @@
3941
<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="provided->compile"/>
4042
<dependency org="javax.xml.ws" name="com.springsource.javax.xml.ws" rev="2.1.1" conf="provided, ws->compile"/>
4143
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.2.0" conf="optional, bytecode-proxy->compile"/>
42-
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
43-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
44+
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile, aop->compile"/>
45+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
4446
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
4547
<dependency org="org.beanshell" name="com.springsource.bsh" rev="2.0.0.b4" conf="optional, beanshell->compile"/>
4648
<dependency org="org.codehaus.groovy" name="com.springsource.org.codehaus.groovy" rev="1.6.5" conf="optional, groovy->compile"/>

‎org.springframework.core/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1415
<conf name="aspectj" extends="runtime" description="JARs needed to run with AspectJ"/>
1516
<conf name="commons-collections" extends="runtime" description="JARs needed to run with Commons Collections"/>
1617
<conf name="log4j" extends="runtime" description="JARs needed to use Log4J"/>
@@ -22,7 +23,7 @@
2223
</publications>
2324

2425
<dependencies>
25-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
26+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
2627
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="optional, log4j->compile"/>
2728
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.5.RELEASE" conf="optional, aspectj->compile"/>
2829
<dependency org="org.jboss.vfs" name="com.springsource.org.jboss.virtual" rev="2.1.0.GA" conf="optional->compile"/>

‎org.springframework.expression/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1415
</configurations>
1516

1617
<publications>
@@ -20,7 +21,7 @@
2021

2122
<dependencies>
2223
<!-- compile dependencies -->
23-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->runtime" />
24+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->runtime" />
2425
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->runtime" />
2526
<!-- test dependencies -->
2627
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="test->runtime"/>

‎org.springframework.jdbc/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1415
<conf name="c3p0" extends="runtime" description="JARs needed to run with c3p0"/>
1516
<conf name="jndi" extends="runtime" description="JARs needed to use JNDI"/>
1617
<conf name="pooling" extends="runtime" description="JARs needed to run with an XA pool"/>
@@ -25,7 +26,7 @@
2526
<dependencies>
2627
<dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
2728
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
28-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
29+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
2930
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
3031
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
3132
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>

‎org.springframework.jms/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<configurations>
1111
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
12+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1213
<conf name="commons-pool" extends="runtime" description="JARs needed to run with Commons Pool"/>
1314
<conf name="jca" extends="runtime" description="JARs needed to develop JCA beans"/>
1415
<conf name="oxm" extends="runtime" description="JARs needed to use the MarshallingMessageConverter"/>
@@ -27,7 +28,7 @@
2728
conf="provided->compile"/>
2829
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
2930
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1"
30-
conf="compile->compile"/>
31+
conf="compile, commons-logging->compile"/>
3132
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.pool" rev="1.3.0"
3233
conf="optional, commons-pool->compile"/>
3334
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>

‎org.springframework.orm/ivy.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<configurations>
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
14+
<conf name="commons-logging" extends="runtime" description="JARs needed to run with Commons Logging"/>
1415
<conf name="aop" extends="runtime" description="JARs needed to use AOP"/>
1516
<conf name="eclipselink" extends="jpa" description="JARs needed to use EclipseLink JPA"/>
1617
<conf name="hibernate" extends="runtime" description="JARs needed to use Hibernate"/>
@@ -32,7 +33,7 @@
3233
<dependencies>
3334
<dependency org="com.oracle.toplink.essentials" name="com.springsource.oracle.toplink.essentials" rev="2.0.0.b41-beta2" conf="optional, toplink->compile"/>
3435
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="optional, aop->compile"/>
35-
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
36+
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile, commons-logging->compile"/>
3637
<dependency org="org.apache.ibatis" name="com.springsource.com.ibatis" rev="2.3.4.726" conf="optional, ibatis->compile"/>
3738
<dependency org="org.apache.openjpa" name="com.springsource.org.apache.openjpa" rev="1.1.0" conf="optional, openjpa->compile"/>
3839
<dependency org="org.eclipse.persistence" name="com.springsource.org.eclipse.persistence" rev="1.0.1" conf="test->compile"/>

0 commit comments

Comments
 (0)