Skip to content

Commit a449472

Browse files
jhoellerjhoeller
committed
1 parent f744808 commit a449472

File tree

6 files changed

+6
-13
lines changed

6 files changed

+6
-13
lines changed

‎org.springframework.jdbc/.classpath

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.transaction"/>
1414
<classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
1515
<classpathentry kind="var" path="IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-0.9.1.2.jar" sourcepath="/IVY_CACHE/com.mchange.c3p0/com.springsource.com.mchange.v2.c3p0/0.9.1.2/com.springsource.com.mchange.v2.c3p0-sources-0.9.1.2.jar"/>
16-
<classpathentry kind="var" path="IVY_CACHE/com.experlog.xapool/com.springsource.org.enhydra.jdbc/1.5.0/com.springsource.org.enhydra.jdbc-1.5.0.jar" sourcepath="/IVY_CACHE/com.experlog.xapool/com.springsource.org.enhydra.jdbc/1.5.0/com.springsource.org.enhydra.jdbc-sources-1.5.0.jar"/>
17-
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
16+
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
1817
<classpathentry kind="var" path="IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-2.3.0.jar" sourcepath="/IVY_CACHE/org.easymock/com.springsource.org.easymock/2.3.0/com.springsource.org.easymock-sources-2.3.0.jar"/>
1918
<classpathentry kind="output" path="target/classes"/>
2019
</classpath>

‎org.springframework.jdbc/ivy.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424

2525
<dependencies>
2626
<dependency org="com.mchange.c3p0" name="com.springsource.com.mchange.v2.c3p0" rev="0.9.1.2" conf="optional, c3p0->compile"/>
27-
<dependency org="com.experlog.xapool" name="com.springsource.org.enhydra.jdbc" rev="1.5.0" conf="optional, pooling->compile"/>
2827
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
2928
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
3029
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
3130
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="optional, jndi->compile"/>
3231
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
3332
<dependency org="org.springframework" name="org.springframework.transaction" rev="latest.integration" conf="compile->compile"/>
3433
<!-- test dependencies -->
35-
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
34+
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime" />
3635
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->compile"/>
3736
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.collections" rev="3.2.0" conf="test->runtime"/>
3837
</dependencies>

‎org.springframework.jdbc/template.mf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Import-Template:
1414
javax.sql.rowset.*;version="[1.0.1, 2.0.0)";resolution:=optional,
1515
javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
1616
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
17-
org.enhydra.jdbc.*;version="[1.5.0, 2.0.0)";resolution:=optional,
1817
org.springframework.beans.*;version="[3.0.0, 3.0.1)",
1918
org.springframework.core.*;version="[3.0.0, 3.0.1)",
2019
org.springframework.dao.*;version="[3.0.0, 3.0.1)",

‎org.springframework.transaction/.classpath

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-1.1.1.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.logging/1.1.1/com.springsource.org.apache.commons.logging-sources-1.1.1.jar"/>
1313
<classpathentry kind="var" path="IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-1.1.0.jar" sourcepath="/IVY_CACHE/javax.transaction/com.springsource.javax.transaction/1.1.0/com.springsource.javax.transaction-sources-1.1.0.jar"/>
1414
<classpathentry kind="var" path="IVY_CACHE/com.ibm.websphere/com.springsource.com.ibm.websphere.uow/6.0.2.17/com.springsource.com.ibm.websphere.uow-6.0.2.17.jar"/>
15-
<classpathentry kind="var" path="IVY_CACHE/org.objectweb.jotm/com.springsource.org.objectweb.jotm/2.0.10/com.springsource.org.objectweb.jotm-2.0.10.jar" sourcepath="/IVY_CACHE/org.objectweb.jotm/com.springsource.org.objectweb.jotm/2.0.10/com.springsource.org.objectweb.jotm-sources-2.0.10.jar"/>
1615
<classpathentry kind="var" path="IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-3.0.0.jar" sourcepath="/IVY_CACHE/javax.ejb/com.springsource.javax.ejb/3.0.0/com.springsource.javax.ejb-sources-3.0.0.jar"/>
1716
<classpathentry kind="var" path="IVY_CACHE/javax.resource/com.springsource.javax.resource/1.5.0/com.springsource.javax.resource-1.5.0.jar" sourcepath="/IVY_CACHE/javax.resource/com.springsource.javax.resource/1.5.0/com.springsource.javax.resource-sources-1.5.0.jar"/>
18-
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-4.4.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
17+
<classpathentry kind="var" path="IVY_CACHE/org.junit/com.springsource.org.junit/4.5.0/com.springsource.org.junit-4.5.0.jar" sourcepath="/IVY_CACHE/org.junit/com.springsource.org.junit/4.4.0/com.springsource.org.junit-sources-4.4.0.jar"/>
1918
<classpathentry kind="var" path="IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-1.0.0.jar" sourcepath="/IVY_CACHE/org.aopalliance/com.springsource.org.aopalliance/1.0.0/com.springsource.org.aopalliance-sources-1.0.0.jar"/>
2019
<classpathentry kind="output" path="target/classes"/>
2120
</classpath>

‎org.springframework.transaction/ivy.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
<include file="${spring.build.dir}/common/default-ivy-configurations.xml"/>
1414
<conf name="ejb" extends="runtime" description="JARs needed to develop EJB3 beans"/>
1515
<conf name="jca" extends="runtime" description="JARs needed to develop JCA beans"/>
16-
<conf name="jotm" extends="runtime" description="JARs needed to use JOTM"/>
17-
<conf name="websphere" extends="runtime" description="JARs needed to develop against websphere"/>
16+
<conf name="websphere" extends="runtime" description="JARs needed to develop against WebSphere"/>
1817
</configurations>
1918

2019
<publications>
@@ -29,14 +28,13 @@
2928
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->compile"/>
3029
<dependency org="org.aopalliance" name="com.springsource.org.aopalliance" rev="1.0.0" conf="compile->compile"/>
3130
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
32-
<dependency org="org.objectweb.jotm" name="com.springsource.org.objectweb.jotm" rev="2.0.10" conf="optional, jotm->compile"/>
3331
<dependency org="org.springframework" name="org.springframework.aop" rev="latest.integration" conf="compile->compile"/>
3432
<dependency org="org.springframework" name="org.springframework.beans" rev="latest.integration" conf="compile->compile"/>
3533
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="compile->compile"/>
3634
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" conf="compile->compile"/>
3735
<!-- test dependencies -->
38-
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
39-
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.5.4" conf="test->compile"/>
36+
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime" />
37+
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="test->compile"/>
4038
<dependency org="javax.persistence" name="com.springsource.javax.persistence" rev="1.0.0" conf="test->compile"/>
4139
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="test->compile"/>
4240
</dependencies>

‎org.springframework.transaction/template.mf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ Import-Template:
1414
javax.transaction.*;version="[1.0.1, 2.0.0)";resolution:=optional,
1515
org.aopalliance.*;version="[1.0.0, 2.0.0)",
1616
org.apache.commons.logging.*;version="[1.1.1, 2.0.0)",
17-
org.objectweb.jotm.*;version="[2.0.10, 3.0.0)";resolution:=optional,
1817
org.springframework.aop.*;version="[3.0.0, 3.0.1)",
1918
org.springframework.beans.*;version="[3.0.0, 3.0.1)",
2019
org.springframework.context.*;version="[3.0.0, 3.0.1)",

0 commit comments

Comments
 (0)