From 473c3937487e484a6e2286d6eb1c5f094a49c94a Mon Sep 17 00:00:00 2001
From: Joram Barrez <joram.barrez@gmail.com>
Date: Thu, 7 Mar 2013 14:12:24 +0100
Subject: [PATCH] Fix for running Explorer 5.12 on JDK 6

---
 modules/activiti-modeler/pom.xml          | 19 ++++++++++++++++++
 modules/activiti-webapp-explorer2/pom.xml | 24 ++++++++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/modules/activiti-modeler/pom.xml b/modules/activiti-modeler/pom.xml
index eeaa44f413..e89d2ea0a5 100644
--- a/modules/activiti-modeler/pom.xml
+++ b/modules/activiti-modeler/pom.xml
@@ -84,10 +84,29 @@
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>batik-transcoder</artifactId>
+       <!-- Need to exclude this old version of xml-apis, as it causes exceptions on older JDK versions -->
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+        <exclusion>
+        	<artifactId>xalan</artifactId>
+        	<groupId>xalan</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
       <artifactId>batik-bridge</artifactId>
+      <!-- Need to exclude this old version of xalan, as it causes exceptions on older JDK versions -->
+
+      <exclusions>
+      	<exclusion>
+      		<artifactId>xalan</artifactId>
+      		<groupId>xalan</groupId>
+      	</exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.xmlgraphics</groupId>
diff --git a/modules/activiti-webapp-explorer2/pom.xml b/modules/activiti-webapp-explorer2/pom.xml
index a01a33143a..9beb7eaf90 100644
--- a/modules/activiti-webapp-explorer2/pom.xml
+++ b/modules/activiti-webapp-explorer2/pom.xml
@@ -175,6 +175,12 @@
 		<dependency>
 			<groupId>org.activiti</groupId>
 			<artifactId>activiti-modeler</artifactId>
+			<exclusions>
+			 <exclusion>
+			     <groupId>xalan</groupId>
+			     <artifactId>xalan</artifactId>
+			 </exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.activiti</groupId>
@@ -207,19 +213,19 @@
 			<artifactId>junit</artifactId>
 			<scope>test</scope>
 		</dependency>
-    
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-servlet</artifactId>
-    </dependency>
+		
+        <dependency>
+            <groupId>com.google.gwt</groupId>
+            <artifactId>gwt-servlet</artifactId>
+        </dependency>
 		
 		<!-- Vaadin addons -->
 		<!-- Must be defined both in activiti-explorer and activiti-webapp-explorer, as otherwise the gwt compiler won't find it -->
  		<dependency>
-      <groupId>org.vaadin.addons</groupId>
-      <artifactId>dcharts-widget</artifactId>
-      <version>0.10.0</version>
-    </dependency>
+            <groupId>org.vaadin.addons</groupId>
+            <artifactId>dcharts-widget</artifactId>
+            <version>0.10.0</version>
+        </dependency>
 
 	</dependencies>
 
-- 
GitLab