From a9da77eb005b49d70aea5b0f7a8713abff485108 Mon Sep 17 00:00:00 2001
From: Simon Massey <simbo1905@60hertz.com>
Date: Fri, 23 Dec 2011 09:39:53 +0000
Subject: [PATCH] mark dom4j as provided in openshift builds for JBossAS702

---
 pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pom.xml b/pom.xml
index 8e33ece..d04a6ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
 		<jetty.version>7.4.5.v20110725</jetty.version>
 		<postgresql.version>8.4-702.jdbc3</postgresql.version>
 		<commons-logging.version>1.0.4</commons-logging.version>
+		<dom4j.version>1.6.1</dom4j.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -294,8 +295,19 @@
 					<groupId>javax.transaction</groupId>
 					<artifactId>jta</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>dom4j</artifactId>
+					<groupId>dom4j</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
+		<!--  manage dom4j explicity for JBossAS702 -->
+		<dependency>
+			<artifactId>dom4j</artifactId>
+			<groupId>dom4j</groupId>
+			<scope>runtime</scope>
+			<version>${dom4j.version}</version>
+		</dependency>
 		<!-- below are optional runtime database pool and drivers -->
 		<dependency>
 			<groupId>hsqldb</groupId>
@@ -386,6 +398,15 @@
 					</plugin>
 				</plugins>
 			</build>
+			<dependencies>
+				<!-- classloader issues on JBossAS702 to mark dom4j as provided -->
+				<dependency>
+					<artifactId>dom4j</artifactId>
+					<groupId>dom4j</groupId>
+					<scope>provided</scope>
+					<version>${dom4j.version}</version>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
 </project>