From 3be8f7b46d22258029c7b39856ac7f5ee8d7b8d0 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 21 Aug 2009 16:46:03 +0000
Subject: [PATCH] pom updates

---
 .../pom.xml                                   | 25 +----------
 org.springframework.integration.event/pom.xml | 25 +----------
 org.springframework.integration.file/pom.xml  | 25 +----------
 org.springframework.integration.http/pom.xml  | 25 +----------
 .../pom.xml                                   | 25 +----------
 org.springframework.integration.jms/pom.xml   | 31 ++++----------
 org.springframework.integration.mail/pom.xml  | 25 +----------
 org.springframework.integration.rmi/pom.xml   | 25 +----------
 .../pom.xml                                   | 25 +----------
 .../pom.xml                                   | 25 +----------
 org.springframework.integration.test/pom.xml  | 42 ++++++++-----------
 org.springframework.integration.ws/pom.xml    | 36 +++++-----------
 org.springframework.integration.xml/pom.xml   | 27 +-----------
 org.springframework.integration/pom.xml       | 16 ++++++-
 pom.xml                                       | 27 ++++++++++++
 spring-integration-parent/pom.xml             | 33 +++++++++++++--
 16 files changed, 116 insertions(+), 321 deletions(-)
 create mode 100644 pom.xml

diff --git a/org.springframework.integration.adapter/pom.xml b/org.springframework.integration.adapter/pom.xml
index f64fb901e9..553a80f8af 100644
--- a/org.springframework.integration.adapter/pom.xml
+++ b/org.springframework.integration.adapter/pom.xml
@@ -31,28 +31,5 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.event/pom.xml b/org.springframework.integration.event/pom.xml
index 45aa15e84c..cf55b34e74 100644
--- a/org.springframework.integration.event/pom.xml
+++ b/org.springframework.integration.event/pom.xml
@@ -31,27 +31,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.file/pom.xml b/org.springframework.integration.file/pom.xml
index 0e653f88f5..0287857014 100644
--- a/org.springframework.integration.file/pom.xml
+++ b/org.springframework.integration.file/pom.xml
@@ -61,27 +61,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.http/pom.xml b/org.springframework.integration.http/pom.xml
index 124bdd5ae3..6f5c597708 100644
--- a/org.springframework.integration.http/pom.xml
+++ b/org.springframework.integration.http/pom.xml
@@ -67,27 +67,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.httpinvoker/pom.xml b/org.springframework.integration.httpinvoker/pom.xml
index 16c65f56eb..6625eec75d 100644
--- a/org.springframework.integration.httpinvoker/pom.xml
+++ b/org.springframework.integration.httpinvoker/pom.xml
@@ -55,27 +55,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.jms/pom.xml b/org.springframework.integration.jms/pom.xml
index 7ff3cc13ed..27b7b2a990 100644
--- a/org.springframework.integration.jms/pom.xml
+++ b/org.springframework.integration.jms/pom.xml
@@ -42,6 +42,12 @@
       <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-core</artifactId>
@@ -55,27 +61,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.mail/pom.xml b/org.springframework.integration.mail/pom.xml
index 0eb6b902d6..71953bfe11 100644
--- a/org.springframework.integration.mail/pom.xml
+++ b/org.springframework.integration.mail/pom.xml
@@ -73,27 +73,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.rmi/pom.xml b/org.springframework.integration.rmi/pom.xml
index f6d0615f63..c25bcae2ee 100644
--- a/org.springframework.integration.rmi/pom.xml
+++ b/org.springframework.integration.rmi/pom.xml
@@ -49,27 +49,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.security/pom.xml b/org.springframework.integration.security/pom.xml
index 08dc314b99..1092b86a14 100644
--- a/org.springframework.integration.security/pom.xml
+++ b/org.springframework.integration.security/pom.xml
@@ -55,27 +55,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.stream/pom.xml b/org.springframework.integration.stream/pom.xml
index 8f5529d2c9..8a0a0325c6 100644
--- a/org.springframework.integration.stream/pom.xml
+++ b/org.springframework.integration.stream/pom.xml
@@ -37,27 +37,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.test/pom.xml b/org.springframework.integration.test/pom.xml
index b9c1513371..25bedaec6b 100644
--- a/org.springframework.integration.test/pom.xml
+++ b/org.springframework.integration.test/pom.xml
@@ -12,6 +12,23 @@
     <relativePath>../spring-integration-parent</relativePath>
   </parent>
   <dependencies>
+	<dependency>
+       <groupId>org.mockito</groupId>
+       <artifactId>mockito-all</artifactId>
+       <version>1.6</version>
+       <scope>test</scope>
+	</dependency>
+	<dependency>
+       <groupId>org.mockito</groupId>
+       <artifactId>mockito-all</artifactId>
+       <version>1.6</version>
+       <scope>test</scope>
+	</dependency>
+	<dependency>
+		<groupId>org.hamcrest</groupId>
+		<artifactId>hamcrest-all</artifactId>
+		<version>1.1</version>
+	</dependency>
     <dependency>
       <groupId>org.easymock</groupId>
       <artifactId>easymock</artifactId>
@@ -37,27 +54,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.ws/pom.xml b/org.springframework.integration.ws/pom.xml
index 769a4db772..21a24a4f4c 100644
--- a/org.springframework.integration.ws/pom.xml
+++ b/org.springframework.integration.ws/pom.xml
@@ -37,9 +37,9 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.ws</groupId>
+      <groupId>org.springframework</groupId>
       <artifactId>spring-oxm</artifactId>
-      <version>1.5.5</version>
+      <version>${spring.version}</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -54,6 +54,13 @@
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-expression</artifactId>
+      <version>${spring.version}</version>
+      <scope>runtime</scope>
+	  <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-test</artifactId>
@@ -73,27 +80,4 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <build>
-    <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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration.xml/pom.xml b/org.springframework.integration.xml/pom.xml
index 0feb3057f1..f12443ada1 100644
--- a/org.springframework.integration.xml/pom.xml
+++ b/org.springframework.integration.xml/pom.xml
@@ -82,29 +82,4 @@
       <scope>compile</scope>
     </dependency>
   </dependencies>
-  <build>
-    <testResources>
-      <testResource>
-        <directory>src/test/java</directory>
-        <includes>
-          <include>**/*.xml</include>
-          <include>**/*.xsl</include>
-          <include>**/*.xsd</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>
\ No newline at end of file
+</project>
diff --git a/org.springframework.integration/pom.xml b/org.springframework.integration/pom.xml
index 0a095addb4..84d7519f7c 100644
--- a/org.springframework.integration/pom.xml
+++ b/org.springframework.integration/pom.xml
@@ -30,6 +30,20 @@
 			<version>2.3</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjrt</artifactId>
+			<version>1.6.5</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>1.6.5</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
@@ -58,4 +72,4 @@
 		       <scope>test</scope>
 		</dependency>
 	</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000000..3d1980825a
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.springframework.integration</groupId>
+	<artifactId>spring-integration</artifactId>
+	<name>Spring Integration</name>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<modules>
+		<module>spring-integration-parent</module>
+		<module>org.springframework.integration</module>
+		<module>org.springframework.integration.adapter</module>
+		<module>org.springframework.integration.event</module>
+		<module>org.springframework.integration.file</module>
+		<module>org.springframework.integration.http</module>
+		<module>org.springframework.integration.httpinvoker</module>
+		<module>org.springframework.integration.jms</module>
+		<module>org.springframework.integration.mail</module>
+		<module>org.springframework.integration.rmi</module>
+		<module>org.springframework.integration.security</module>
+		<module>org.springframework.integration.stream</module>
+		<module>org.springframework.integration.ws</module>
+		<module>org.springframework.integration.xml</module>
+		<module>org.springframework.integration.test</module>
+	</modules>
+</project>
diff --git a/spring-integration-parent/pom.xml b/spring-integration-parent/pom.xml
index 1c5b54c3a1..8f81d3aed4 100644
--- a/spring-integration-parent/pom.xml
+++ b/spring-integration-parent/pom.xml
@@ -14,6 +14,7 @@
     <org.eclipse.jdt.core.version>3.4.2.v_883_R34x</org.eclipse.jdt.core.version>
     <junit.version>4.6</junit.version>
     <spring.version>3.0.0.M4</spring.version>
+	<maven.test.failure.ignore>true</maven.test.failure.ignore>
   </properties>
   <profiles>
     <profile>
@@ -66,23 +67,47 @@
     </profile>
   </profiles>
   <build>
+	<resources>
+		<resource>
+			<directory>${project.basedir}/src/main/java
+			</directory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+			<excludes>
+				<exclude>**/*.java</exclude>
+			</excludes>
+		</resource>
+		<resource>
+			<directory>${project.basedir}/src/main/resources
+			</directory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</resource>
+	</resources>
     <testResources>
       <testResource>
         <directory>src/test/java</directory>
         <includes>
-          <include>**/*.xml</include>
+          <include>**/*</include>
         </includes>
+		<excludes>
+			<exclude>**/*.java</exclude>
+		</excludes>
       </testResource>
       <testResource>
         <directory>src/main/java</directory>
         <includes>
-          <include>**/*.xsd</include>
+          <include>**/*</include>
         </includes>
+		<excludes>
+			<exclude>**/*.java</exclude>
+		</excludes>
       </testResource>
     </testResources>
     <plugins>
-      
-      
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId> 
         <artifactId>maven-compiler-plugin</artifactId>