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

org.springframework.aspects/pom.xml

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

org.springframework.web.servlet/ivy.xml

@@ -69,7 +69,7 @@
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration"
                     conf="compile->compile"/>
 		<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"
                     conf="compile->compile"/>
 		<dependency org="org.springframework" name="org.springframework.expression" rev="latest.integration"

org.springframework.web.servlet/pom.xml

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