From f8adb82ab33a25fe42be2479cc17f255e0b511e6 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@vmware.com>
Date: Fri, 27 Mar 2009 21:28:51 +0000
Subject: [PATCH] POM maintenance

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@861 50f2f4bb-b051-0410-bef5-90022cba6387
---
 build-spring-framework/generate-pom.xml | 10 ++++-
 build-spring-framework/pom.xml          | 34 ++++++++++-------
 org.springframework.aop/pom.xml         | 14 ++-----
 org.springframework.asm/pom.xml         | 27 --------------
 org.springframework.context/pom.xml     | 14 ++-----
 org.springframework.core/pom.xml        | 18 +++------
 org.springframework.orm/pom.xml         | 49 ++++++++++++++++++-------
 org.springframework.test/pom.xml        |  6 +++
 8 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/build-spring-framework/generate-pom.xml b/build-spring-framework/generate-pom.xml
index 31e1948b4da..eb970cad219 100644
--- a/build-spring-framework/generate-pom.xml
+++ b/build-spring-framework/generate-pom.xml
@@ -34,6 +34,14 @@
 -->
   </path>
 
+<!--
+ <target name="create-poms" depends="clean,clean-integration,test"
+   description="Create a Maven pom for each module (use -Dbuild.stamp=m3-SNAPSHOT etc. to get the version number right).">
+  <all-bundles target="create-pom">
+   <property name="pom.output.file" value="pom.xml"/>
+  </all-bundles>
+ </target>
+-->
   <condition property="maven.extension" value=".bat" else="">
     <os family="windows"/>
   </condition>
@@ -57,7 +65,7 @@
 
 
     <delete file="pom.xml" quiet="true"/>
-    <delete file="pom-central.xml" quiet="true"/>
+    <delete file="central-pom.xml" quiet="true"/>
 
     <ivy:makepom ivyfile="ivy.xml" pomfile="pom.xml">
      <mapping conf="compile" scope="compile"/>
diff --git a/build-spring-framework/pom.xml b/build-spring-framework/pom.xml
index e2516733d9b..7ba3f25f5f7 100644
--- a/build-spring-framework/pom.xml
+++ b/build-spring-framework/pom.xml
@@ -27,7 +27,7 @@
       <url>http://mirror.cc.vt.edu/pub/eclipse/rt/eclipselink/maven.repo/</url>
       </repository>    
     -->
-    <!-- for use with jexcelapi 2.6.8, portlet 2.0-->
+    <!-- for use with jexcelapi 2.6.8, portlet 2.0, hibernate 3.3.1-->
     <repository>
       <id>jboss</id>
       <name>JBoss Repository</name>
@@ -186,25 +186,31 @@
   </build>
   
   <modules>
-    <module>../org.springframework.aop</module>
-    <module>../org.springframework.aspects</module>
-    <module>../org.springframework.beans</module>
-    <module>../org.springframework.context</module>
-    <module>../org.springframework.context.support</module>
-    <module>../org.springframework.core</module>
-    <module>../org.springframework.expression</module>
     <module>../org.springframework.instrument</module>
     <module>../org.springframework.instrument.classloading</module>
-    <module>../org.springframework.integration-tests</module>
-    <module>../org.springframework.jdbc</module>
-    <module>../org.springframework.jms</module>
-    <module>../org.springframework.orm</module>
-    <module>../org.springframework.oxm</module>
-    <module>../org.springframework.test</module>
+    <module>../org.springframework.asm</module>
+    <module>../org.springframework.core</module>
+    <module>../org.springframework.expression</module>
+    <module>../org.springframework.core</module>
+    <module>../org.springframework.beans</module>
+    <module>../org.springframework.aop</module>
+    <module>../org.springframework.context</module>
     <module>../org.springframework.transaction</module>
+    <module>../org.springframework.oxm</module>
+    <module>../org.springframework.jms</module>
+    <module>../org.springframework.aspects</module>
+    <module>../org.springframework.jdbc</module>
     <module>../org.springframework.web</module>
+    <module>../org.springframework.orm</module>
+    <module>../org.springframework.context.support</module>
     <module>../org.springframework.web.portlet</module>
     <module>../org.springframework.web.servlet</module>
+    <module>../org.springframework.test</module>
+    <!--
+    <module>../org.springframework.integration-tests</module>
+    -->
+
+
   </modules>
 
   <url>http://static.springframework.org/docs</url>
diff --git a/org.springframework.aop/pom.xml b/org.springframework.aop/pom.xml
index a91637da7ef..148d08dc480 100644
--- a/org.springframework.aop/pom.xml
+++ b/org.springframework.aop/pom.xml
@@ -80,16 +80,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-      <scope>test</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>3.0.0.M3</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/org.springframework.asm/pom.xml b/org.springframework.asm/pom.xml
index 5d29c97e6a3..762e54b0022 100644
--- a/org.springframework.asm/pom.xml
+++ b/org.springframework.asm/pom.xml
@@ -12,31 +12,4 @@
     <version>3.0.0.M3</version>
   </parent>
 
-  <dependencies>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
 </project>
diff --git a/org.springframework.context/pom.xml b/org.springframework.context/pom.xml
index b63c67685a4..cceb925abef 100644
--- a/org.springframework.context/pom.xml
+++ b/org.springframework.context/pom.xml
@@ -182,16 +182,10 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.3</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-      <scope>test</scope>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>3.0.0.M3</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
   <build>
diff --git a/org.springframework.core/pom.xml b/org.springframework.core/pom.xml
index 6d52be0f6e2..3eac7656ef3 100644
--- a/org.springframework.core/pom.xml
+++ b/org.springframework.core/pom.xml
@@ -19,6 +19,12 @@
       <version>3.2</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-asm</artifactId>
+      <version>3.0.0.M3</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -37,18 +43,6 @@
       <version>1.6.2</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>2.2.3</version>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
diff --git a/org.springframework.orm/pom.xml b/org.springframework.orm/pom.xml
index 7c92f6b5f65..5f2d87164b5 100644
--- a/org.springframework.orm/pom.xml
+++ b/org.springframework.orm/pom.xml
@@ -59,10 +59,23 @@
     -->
     <dependency>
       <groupId>org.hibernate</groupId>
-      <artifactId>hibernate</artifactId>
-      <version>3.2.6.ga</version>
+      <artifactId>hibernate-core</artifactId>
+      <version>3.3.1.GA</version>
       <optional>true</optional>
     </dependency>
+
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>1.5.2</version>
+    </dependency>
+
     <dependency>
       <groupId>org.hibernate</groupId>
       <artifactId>hibernate-annotations</artifactId>
@@ -185,16 +198,26 @@
     </dependency>
   </dependencies>
   <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <junitArtifactName>junit:junit</junitArtifactName>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
+    <testResources>
+      <testResource>
+        <directory>src/test/java</directory>
+        <includes>
+          <include>**/*.xml</include>
+        </includes>
+      </testResource>
+      <testResource>
+        <directory>src/main/java</directory>
+        <includes>
+          <include>**/*.xsd</include>
+        </includes>
+      </testResource>
+
+      <testResource>
+        <directory>../org.springframework.integration/src/main/java</directory>
+        <includes>
+          <include>**/*.xsd</include>
+        </includes>
+      </testResource>
+    </testResources>
   </build>
 </project>
diff --git a/org.springframework.test/pom.xml b/org.springframework.test/pom.xml
index cb9776a2abf..44ffeafea07 100644
--- a/org.springframework.test/pom.xml
+++ b/org.springframework.test/pom.xml
@@ -152,6 +152,12 @@
       <version>1.8.0.7</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib-nodep</artifactId>
+      <version>2.1_3</version>
+      <optional>true</optional>
+    </dependency>
   </dependencies>
   <build>
     <pluginManagement>