root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

SPR-6538: context-support is no longer marked as an optional dependency within aspects and webmvc POMs

This commit is contained in:
Chris Beams 2010-03-23 08:15:57 +00:00
parent 26470cc23a
commit ec577f8e24
3 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
org.springframework.aspects/pom.xml
View File

@ -32,22 +32,22 @@
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<optional>true</optional> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId> <artifactId>spring-test</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>

6
org.springframework.web.servlet/ivy.xml
View File

@ -69,7 +69,7 @@
<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" <dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
conf="compile->compile"/> conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" <dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration"
conf="optional, velocity, freemarker, jasper-reports->compile"/> conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.core" rev="latest.integration" <dependency org="org.springframework" name="org.springframework.core" rev="latest.integration"
conf="compile->compile"/> conf="compile->compile"/>
<dependency org="org.springframework" name="org.springframework.expression" rev="latest.integration" <dependency org="org.springframework" name="org.springframework.expression" rev="latest.integration"
@ -79,7 +79,7 @@
<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" <dependency org="org.springframework" name="org.springframework.web" rev="latest.integration"
conf="compile->compile"/> conf="compile->compile"/>
<!-- test dependencies --> <!-- test dependencies -->
<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/> <dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->runtime"/>
<dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/> <dependency org="org.easymock" name="com.springsource.org.easymock" rev="2.5.1" conf="test->compile"/>
<dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0" <dependency org="org.apache.commons" name="com.springsource.org.apache.commons.fileupload" rev="1.2.0"
conf="test->compile"/> conf="test->compile"/>
@ -97,7 +97,7 @@
<dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration" <dependency org="org.springframework" name="org.springframework.orm" rev="latest.integration"
conf="test->compile"/> conf="test->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA" <dependency org="org.hibernate" name="com.springsource.org.hibernate" rev="3.3.1.GA"
conf="test->compile"/> conf="test->compile"/>
<dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/> <dependency org="javax.transaction" name="com.springsource.javax.transaction" rev="1.1.0" conf="provided->runtime"/>
<dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/> <dependency org="javax.validation" name="com.springsource.javax.validation" rev="1.0.0.GA" conf="test->compile"/>
<dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/> <dependency org="org.hibernate" name="com.springsource.org.hibernate.validator" rev="4.0.2.GA" conf="test->runtime"/>

9
org.springframework.web.servlet/pom.xml
View File

@ -128,11 +128,6 @@
<version>1.1.2</version> <version>1.1.2</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!--
dependency> <groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId> <version>1.6.2</version>
<optional>true</optional> </dependency
-->
<dependency> <dependency>
<groupId>velocity</groupId> <groupId>velocity</groupId>
<artifactId>velocity</artifactId> <artifactId>velocity</artifactId>
@ -173,7 +168,7 @@
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId> <artifactId>spring-context-support</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<optional>true</optional> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
@ -186,7 +181,7 @@
<artifactId>spring-expression</artifactId> <artifactId>spring-expression</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId> <artifactId>spring-oxm</artifactId>