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

View File

@ -41,7 +41,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>

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"

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>