From fa7d80aaaeda11d5d8b1b947941ba50920e48439 Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Mon, 1 Mar 2010 15:03:20 +0000
Subject: [PATCH] INT-999: fix POMs

---
 org.springframework.integration.file/pom.xml |   6 +
 org.springframework.integration.http/pom.xml |   6 +
 org.springframework.integration.ip/pom.xml   |   8 +-
 org.springframework.integration.jdbc/pom.xml |  11 ++
 org.springframework.integration.jms/pom.xml  |   6 +
 org.springframework.integration.test/pom.xml |   4 +-
 org.springframework.integration.xml/pom.xml  | 169 ++++++++++---------
 pom.xml                                      |   6 +-
 8 files changed, 128 insertions(+), 88 deletions(-)

diff --git a/org.springframework.integration.file/pom.xml b/org.springframework.integration.file/pom.xml
index 2948350a44..c09343387b 100644
--- a/org.springframework.integration.file/pom.xml
+++ b/org.springframework.integration.file/pom.xml
@@ -54,6 +54,12 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
diff --git a/org.springframework.integration.http/pom.xml b/org.springframework.integration.http/pom.xml
index 88e61976c9..a067c2b480 100644
--- a/org.springframework.integration.http/pom.xml
+++ b/org.springframework.integration.http/pom.xml
@@ -66,5 +66,11 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.integration</groupId>
+      <artifactId>spring-integration-test</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/org.springframework.integration.ip/pom.xml b/org.springframework.integration.ip/pom.xml
index 5ddcf85619..b913ac4888 100644
--- a/org.springframework.integration.ip/pom.xml
+++ b/org.springframework.integration.ip/pom.xml
@@ -55,17 +55,11 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.springframework.integration.adapter</groupId>
+      <groupId>org.springframework.integration</groupId>
       <artifactId>spring-integration-adapter</artifactId>
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.integration.message</groupId>
-      <artifactId>spring-integration-message</artifactId>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
diff --git a/org.springframework.integration.jdbc/pom.xml b/org.springframework.integration.jdbc/pom.xml
index 646677afc5..158b79cbf4 100644
--- a/org.springframework.integration.jdbc/pom.xml
+++ b/org.springframework.integration.jdbc/pom.xml
@@ -44,6 +44,17 @@
 			<scope>test</scope>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+      		<groupId>org.apache.derby</groupId>
+      		<artifactId>derby</artifactId>
+      		<version>10.5.3.0_1</version>
+      		<scope>test</scope>
+    	</dependency>
+		<dependency>
+			<groupId>org.springframework.integration</groupId>
+			<artifactId>spring-integration-core</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aop</artifactId>
diff --git a/org.springframework.integration.jms/pom.xml b/org.springframework.integration.jms/pom.xml
index 27b7b2a990..88b9119212 100644
--- a/org.springframework.integration.jms/pom.xml
+++ b/org.springframework.integration.jms/pom.xml
@@ -60,5 +60,11 @@
       <version>${project.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+      <version>5.3.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/org.springframework.integration.test/pom.xml b/org.springframework.integration.test/pom.xml
index a5aec09191..49882fb243 100644
--- a/org.springframework.integration.test/pom.xml
+++ b/org.springframework.integration.test/pom.xml
@@ -16,7 +16,7 @@
        <groupId>org.mockito</groupId>
        <artifactId>mockito-all</artifactId>
        <version>1.8.0</version>
-       <scope>test</scope>
+      <scope>compile</scope>
 	</dependency>
 	<dependency>
 		<groupId>org.hamcrest</groupId>
@@ -33,7 +33,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>
-      <scope>test</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
diff --git a/org.springframework.integration.xml/pom.xml b/org.springframework.integration.xml/pom.xml
index e2bd55da42..15de80bd8b 100644
--- a/org.springframework.integration.xml/pom.xml
+++ b/org.springframework.integration.xml/pom.xml
@@ -1,79 +1,94 @@
 <?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-xml</artifactId>
-  <packaging>jar</packaging>
-  <name>Spring Integration XML Support</name>
-  <parent>
-    <groupId>org.springframework.integration</groupId>
-    <artifactId>spring-integration-parent</artifactId>
-    <version>2.0.0.BUILD-SNAPSHOT</version>
-    <relativePath>../spring-integration-parent</relativePath>
-  </parent>
-  <dependencies>
-    <!--
-    <dependency>
-      <groupId>com.sun.xml</groupId>
-      <artifactId>com.sun.xml.bind</artifactId>
-      <version>2.1.7</version>
-      <scope>test</scope>
-    </dependency>
-    -->
-    <dependency>
-      <groupId>javax.activation</groupId>
-      <artifactId>activation</artifactId>
-      <version>1.1.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <!--  spring source repository has 2.1.7 -->
-      <version>2.1</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>stax</groupId>
-      <artifactId>stax</artifactId>
-      <version>1.2.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <version>1.2</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <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>
-      <version>${project.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-oxm</artifactId>
-      <version>${spring.version}</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
+<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-xml</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Integration XML Support</name>
+	<parent>
+		<groupId>org.springframework.integration</groupId>
+		<artifactId>spring-integration-parent</artifactId>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<relativePath>../spring-integration-parent</relativePath>
+	</parent>
+	<profiles>
+		<profile>
+			<id>tiger</id>
+			<activation>
+				<jdk>1.5</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>stax</groupId>
+					<artifactId>stax</artifactId>
+					<version>1.2.0</version>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+	<dependencies>
+		<!--
+			<dependency> <groupId>com.sun.xml</groupId>
+			<artifactId>com.sun.xml.bind</artifactId> <version>2.1.7</version>
+			<scope>test</scope> </dependency>
+		-->
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+			<version>1.1.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<!--  spring source repository has 2.1.7 -->
+			<version>2.1</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xmlunit</groupId>
+			<artifactId>xmlunit</artifactId>
+			<version>1.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<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>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-oxm</artifactId>
+			<version>${spring.version}</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.ws</groupId>
+			<artifactId>spring-xml</artifactId>
+			<version>1.5.9</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 9f2c70c1b0..87e1cd0958 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,18 +11,20 @@
 		<module>spring-integration-parent</module>
 		<module>org.springframework.integration</module>
 		<module>org.springframework.integration.adapter</module>
+		<module>org.springframework.integration.test</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.ip</module>
+		<module>org.springframework.integration.jdbc</module>
 		<module>org.springframework.integration.jms</module>
+		<module>org.springframework.integration.jmx</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.ip</module>
 		<module>org.springframework.integration.ws</module>
 		<module>org.springframework.integration.xml</module>
-		<module>org.springframework.integration.test</module>
 	</modules>
 </project>