From 212b8c0a5ac03bccdbbbbb43646b20600eb6f210 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lubo.rintel@gooddata.com>
Date: Thu, 16 Aug 2012 16:18:55 +0200
Subject: [PATCH 1/2] Avoid using proprietary Sun API

[ERROR] SoapExecutor.java:[26,48] OutputFormat is internal proprietary API and may be removed in a future release
[ERROR] SoapExecutor.java:[27,48] XMLSerializer is internal proprietary API and may be removed in a future release
---
 .../gooddata/integration/soap/SoapExecutor.java    |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/gooddata/integration/soap/SoapExecutor.java b/backend/src/main/java/com/gooddata/integration/soap/SoapExecutor.java
index ff07da9..eb2aab8 100644
--- a/backend/src/main/java/com/gooddata/integration/soap/SoapExecutor.java
+++ b/backend/src/main/java/com/gooddata/integration/soap/SoapExecutor.java
@@ -23,8 +23,8 @@
 
 package com.gooddata.integration.soap;
 
-import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
+import org.apache.xml.serialize.OutputFormat;
+import org.apache.xml.serialize.XMLSerializer;
 import org.jaxen.JaxenException;
 import org.jaxen.SimpleNamespaceContext;
 import org.jaxen.XPath;
-- 
1.7.1
diff --git a/connector/pom.xml b/connector/pom.xml
index 8431e4a..ec37afb 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -78,6 +78,11 @@
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
         </dependency>
+            <dependency>
+                <groupId>org.apache.axis</groupId>
+                <artifactId>axis-jaxrpc</artifactId>
+                <version>1.4</version>
+            </dependency>
         <dependency>
             <groupId>javassist</groupId>
             <artifactId>javassist</artifactId>
diff --git a/pom.xml b/pom.xml
index 9341bf4..f377184 100755
--- a/pom.xml
+++ b/pom.xml
@@ -330,26 +330,15 @@
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
-                <exclusions>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xmlParserAPIs</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xalan</groupId>
-                        <artifactId>xalan</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                </exclusions>
                 <version>1.1.1</version>
             </dependency>
+
+            <dependency>
+		<groupId>org.apache.axis</groupId>
+		<artifactId>axis-jaxrpc</artifactId>
+		<version>1.4</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>log4j-over-slf4j</artifactId>