GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated ivy and template.mf dependency metadata; added src/main/resources to quiet a spurious build error. 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@725 50f2f4bb-b051-0410-bef5-90022cba6387
pull/1/head
Chris Beams 17 years ago
parent
6e7cf91dab
commit
ce5dfd80a9
2 changed files with 11 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      org.springframework.config.java/ivy.xml
  2. 23
      org.springframework.config.java/template.mf

18
org.springframework.config.java/ivy.xml
Unescape View File

@ -23,28 +23,16 @@ @@ -23,28 +23,16 @@
<!-- global dependencies -->
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.logging" rev="1.1.1" conf="compile->compile"/>
<dependency org="org.apache.log4j" name="com.springsource.org.apache.log4j" rev="1.2.15" conf="compile->compile"/>
<dependency org="javax.servlet" name="com.springsource.javax.servlet" rev="2.5.0" conf="provided->compile"/>
<dependency org="net.sourceforge.cglib" name="com.springsource.net.sf.cglib" rev="2.1.3" conf="compile->compile"/>
<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm" rev="2.2.3" conf="compile->compile"/>
<dependency org="org.objectweb.asm" name="com.springsource.org.objectweb.asm.commons" rev="2.2.3" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.beans" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context" rev="2.5.6" conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.test" rev="2.5.6" conf="compile->compile" />
<!-- build time only dependencies -->
<dependency org="org.springframework" name="org.springframework.context.support" rev="2.5.6" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.aop" rev="2.5.6" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.jdbc" rev="2.5.6" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.orm" rev="2.5.6" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.transaction" rev="2.5.6" conf="optional->compile"/>
<dependency org="org.springframework" name="org.springframework.web" rev="2.5.6" conf="optional->compile"/>
<dependency org="org.aspectj" name="com.springsource.org.aspectj.weaver" rev="1.6.2.RELEASE" conf="optional->compile"/>
<!-- test-time only dependencies -->
<dependency org="javax.annotation" name="com.springsource.javax.annotation" rev="1.0.0" conf="test->runtime" />
<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->runtime" />
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.4.0" conf="test->runtime" />
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.3.0" conf="test->runtime" />
<dependency org="org.mortbay.jetty" name="com.springsource.org.mortbay.jetty.server" rev="6.1.9" conf="test->runtime" />
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.lang" rev="2.4.0" conf="test->runtime" />
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.5.0" conf="test->runtime" />
</dependencies>
</ivy-module>

23
org.springframework.config.java/template.mf
Unescape View File

@ -3,22 +3,15 @@ Bundle-Name: Spring JavaConfig @@ -3,22 +3,15 @@ Bundle-Name: Spring JavaConfig
Bundle-Vendor: SpringSource
Bundle-ManifestVersion: 2
Import-Template:
org.springframework.core.*;version="[2.5.4.A, 3.0.0)",
org.springframework.beans.*;version="[2.5.4.A, 3.0.0)",
org.springframework.context.*;version="[2.5.4.A, 3.0.0)",
org.springframework.transaction.interceptor.*;version="[2.5.4.A, 3.0.0)",
org.springframework.asm.*;version="[2.5.4.A, 3.0.0)",
org.springframework.aop.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.stereotype.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.util.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.test.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.web.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.jmx.export.annotation.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.jmx.support.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.springframework.jndi.*;version="[2.5.4.A, 3.0.0)";resolution:=optional,
org.aspectj.*;version="[1.6.2, 2.0.0)";resolution:=optional,
org.springframework.core.*;version="[2.5.6, 3.0.0]",
org.springframework.beans.*;version="[2.5.6, 3.0.0]",
org.springframework.context.*;version="[2.5.6, 3.0.0]",
org.objectweb.asm.*;version="[2.2.3, 3.0.0)",
org.objectweb.asm.commons;version="[2.2.3, 3.0.0)",
org.springframework.aop.*;version="[2.5.6, 3.0.0]";resolution:=optional,
org.springframework.stereotype.*;version="[2.5.6, 3.0.0]";resolution:=optional,
org.springframework.util.*;version="[2.5.6, 3.0.0]";resolution:=optional,
org.apache.commons.logging;version="[1.1.1, 2.0.0)",
org.aopalliance.*;version="[1.0.0,2.0.0)",
net.sf.cglib.*;version="[2.1.3, 3.0.0)"
Exclude-Exports:
org.springframework.config.java.internal.*

Write Preview
Loading…
Cancel
Save