pom maintenance - sync with ivy.xml

update junit version in ivy.xml for org.sf.aspects

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1981 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.aspects/ivy.xml

@@ -28,7 +28,7 @@
 		<dependency org="org.springframework" name="org.springframework.test" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context" rev="latest.integration" conf="test->runtime"/>
 		<dependency org="org.springframework" name="org.springframework.context.support" rev="latest.integration" conf="test->runtime"/>
-		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.6.0" conf="test->compile"/>
+		<dependency org="org.junit" name="com.springsource.org.junit" rev="4.7.0" conf="test->compile"/>
 		<dependency org="javax.mail" name="com.springsource.javax.mail" rev="1.4.0" conf="test->compile"/>
 	</dependencies>
 

org.springframework.context.support/pom.xml

@@ -26,12 +26,6 @@
       <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.freemarker</groupId>
-      <artifactId>freemarker</artifactId>
-      <version>2.3.15</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>javax.activation</groupId>
       <artifactId>activation</artifactId>
@@ -47,7 +41,7 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      <version>1.3.0</version>
+      <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -81,9 +75,9 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
-      <artifactId>jfreechart</artifactId>
-      <version>1.0.9</version>
+      <groupId>org.freemarker</groupId>
+      <artifactId>freemarker</artifactId>
+      <version>2.3.15</version>
       <optional>true</optional>
     </dependency>
     <dependency>

org.springframework.jdbc/pom.xml

@@ -92,12 +92,6 @@
       <artifactId>easymock</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-      <version>3.2</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

org.springframework.test/pom.xml

@@ -50,14 +50,10 @@
       <scope>provided</scope>
     </dependency> 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.apache.geronimo.specs</groupId>
+      <artifactId>geronimo-jta_1.1_spec</artifactId>
+      <version>1.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -77,10 +73,37 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.testng</groupId>
-      <artifactId>testng</artifactId>
-      <version>5.10</version>
-      <classifier>jdk15</classifier>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
+      <optional>true</optional>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-cglib-repack</artifactId>
+      <version>2.1_3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>1.8.0.7</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>aspectjweaver</artifactId>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -144,23 +167,13 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <version>1.8.0.7</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>3.3.1.GA</version>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
+      <version>5.10</version>
+      <classifier>jdk15</classifier>
       <optional>true</optional>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-cglib-repack</artifactId>
-      <version>2.2</version>
-      <scope>test</scope>
     </dependency>
+
   </dependencies>
+
 </project>

org.springframework.web.servlet/pom.xml

@@ -120,10 +120,16 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>rhino</groupId>
-      <artifactId>js</artifactId>
-      <version>1.7R1</version>
-      <scope>test</scope>
+      <groupId>org.apache.tiles</groupId>
+      <artifactId>tiles-servlet</artifactId>
+      <version>2.1.2</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>apache-taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>velocity</groupId>
@@ -137,6 +143,12 @@
       <version>1.4</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.codehaus.jackson</groupId>
+      <artifactId>jackson-mapper-asl</artifactId>
+      <version>1.0.1</version>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-asm</artifactId>
@@ -245,6 +257,12 @@
       <version>2.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>rhino</groupId>
+      <artifactId>js</artifactId>
+      <version>1.7R1</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-core</artifactId>
@@ -260,17 +278,21 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>jfree</groupId>
-      <artifactId>jfreechart</artifactId>
-      <version>1.0.7</version>
-      <scope>runtime</scope>
-      <optional>true</optional>
+      <groupId>javax.validation</groupId>
+      <artifactId>com.springsource.javax.validation</artifactId>
+      <version>1.0.0.CR3</version>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.0.1</version>
-      <optional>true</optional>
+      <groupId>org.hibernate</groupId>
+      <artifactId>hibernate-validator</artifactId>
+      <version>4.0.0.Beta2</version>
+      <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jcl</artifactId>
+      <version>1.5.3</version>
+      <scope>test</scope>
+    </dependency> 
   </dependencies>
 </project>

org.springframework.web/pom.xml

@@ -19,12 +19,15 @@
       <version>3.2.1</version>
       <optional>true</optional>
     </dependency>
+    <!-- can't find hessian 3.2.1 in a public repo -->
+    <!--
     <dependency>
       <groupId>com.caucho</groupId>
       <artifactId>hessian</artifactId>
       <version>3.1.5</version>
       <optional>true</optional>
     </dependency>
+    -->
     <dependency>
       <groupId>javax.el</groupId>
       <artifactId>el-api</artifactId>