From 64624490bf56b377a4dab014326261f8d9034c6b Mon Sep 17 00:00:00 2001
From: David Syer <dsyer@vmware.com>
Date: Thu, 12 Aug 2010 11:58:01 +0000
Subject: [PATCH] Push Java 5 dependencies into a profile

---
 spring-integration-ws/.classpath | 20 ++++++++--------
 spring-integration-ws/pom.xml    | 40 +++++++++++++++++++++++++-------
 spring-integration-xml/pom.xml   | 26 ++++++++++-----------
 3 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/spring-integration-ws/.classpath b/spring-integration-ws/.classpath
index ddc9103c5c..c6c41618dd 100644
--- a/spring-integration-ws/.classpath
+++ b/spring-integration-ws/.classpath
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/spring-integration-ws/pom.xml b/spring-integration-ws/pom.xml
index 88a5e9f54b..dac246510c 100644
--- a/spring-integration-ws/pom.xml
+++ b/spring-integration-ws/pom.xml
@@ -12,18 +12,47 @@
 	<artifactId>spring-integration-ws</artifactId>
 	<packaging>jar</packaging>
 	<name>Spring Integration Web Services Support</name>
+	<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>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<!--  spring source repository has 2.1.7 -->
+					<version>2.1</version>
+					<optional>true</optional>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.xml.bind</groupId>
+					<artifactId>jaxb-impl</artifactId>
+					<version>2.1.13</version>
+					<optional>true</optional>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
 	<dependencies>
 		<dependency>
 			<groupId>com.sun.xml.messaging.saaj</groupId>
 			<artifactId>saaj-impl</artifactId>
 			<version>1.3</version>
-			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.soap</groupId>
 			<artifactId>saaj-api</artifactId>
 			<version>1.3</version>
-			<scope>provided</scope>
+			<optional>true</optional>
 			<exclusions>
 				<exclusion><!--
 					exclude dependency on javax.activation due to sun binary license restrictions
@@ -38,12 +67,7 @@
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-activation_1.1_spec</artifactId>
 			<version>1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax</artifactId>
-			<version>1.2.0</version>
-			<scope>provided</scope>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.integration</groupId>
diff --git a/spring-integration-xml/pom.xml b/spring-integration-xml/pom.xml
index 773d111fd1..7585afd1fe 100644
--- a/spring-integration-xml/pom.xml
+++ b/spring-integration-xml/pom.xml
@@ -25,6 +25,19 @@
 					<version>1.2.0</version>
 					<optional>true</optional>
 				</dependency>
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<!--  spring source repository has 2.1.7 -->
+					<version>2.1</version>
+					<optional>true</optional>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.xml.bind</groupId>
+					<artifactId>jaxb-impl</artifactId>
+					<version>2.1.13</version>
+					<optional>true</optional>
+				</dependency>
 			</dependencies>
 		</profile>
 	</profiles>
@@ -35,19 +48,6 @@
 			<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>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.1.13</version>
-			<scope>provided</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>