From 267d70569ade0505d90564648979351ced3f24c6 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Wed, 11 Jun 2014 20:32:52 +0000
Subject: [PATCH] Update XMLBeans to version 2.6.0

Conflicts:

	.classpath

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1602006 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath                            | 4 ++--
 build.xml                             | 6 +++---
 maven/ooxml-schemas.pom               | 2 +-
 maven/poi-ooxml-schemas.pom           | 2 +-
 sonar/ooxml-schema-encryption/pom.xml | 2 +-
 sonar/ooxml-schema/pom.xml            | 2 +-
 sonar/ooxml/pom.xml                   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index 4c67b866a3..286f8badad 100644
--- a/.classpath
+++ b/.classpath
@@ -14,13 +14,13 @@
 	<classpathentry kind="src" path="src/excelant/java"/>
 	<classpathentry kind="src" path="src/excelant/testcases"/>
 	<classpathentry kind="src" path="src/excelant/resources"/>
-	<classpathentry kind="lib" path="lib/ant-1.9.4.jar" sourcepath="/home/dstadler/.m2/repository/org/apache/ant/ant/1.8.3/ant-1.8.3-sources.jar"/>
+	<classpathentry kind="lib" path="lib/ant-1.9.4.jar"/>
 	<classpathentry kind="lib" path="lib/ant-launcher-1.9.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.9.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
 	<classpathentry kind="lib" path="ooxml-lib/dom4j-1.6.1.jar"/>
-	<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.3.0.jar"/>
+	<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
 	<classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/>
diff --git a/build.xml b/build.xml
index c0a4540259..1c0f6e5bfe 100644
--- a/build.xml
+++ b/build.xml
@@ -148,9 +148,9 @@ under the License.
     <!-- jars in the lib-ooxml directory, see the fetch-ooxml-jars target-->
     <property name="ooxml.dom4j.jar" location="${ooxml.lib}/dom4j-1.6.1.jar"/>
     <property name="ooxml.dom4j.url" value="${repository.m2}/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
-    <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
+    <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-2.6.0.jar"/>
     <property name="ooxml.xmlbeans.url"
-              value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
+              value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/>
 
     <!-- coverage libs -->
     <property name="jacoco.zip" location="${main.lib}/jacoco-0.6.5.201403032054.zip"/>
@@ -1413,7 +1413,7 @@ under the License.
 			</fileset>
 			<auxClasspath path="ooxml-lib/ooxml-schemas-1.1.jar" />
 			<auxClasspath path="ooxml-lib/ooxml-encryption-1.1.jar" />
-			<auxClasspath path="ooxml-lib/xmlbeans-2.3.0.jar" />
+			<auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" />
 			<auxClasspath path="ooxml-lib/dom4j-1.6.1.jar" />
 			<auxClasspath path="lib/commons-codec-1.9.jar" />
 			<auxClasspath path="lib/commons-logging-1.1.3.jar" />
diff --git a/maven/ooxml-schemas.pom b/maven/ooxml-schemas.pom
index da49544ae1..dd92b6593c 100644
--- a/maven/ooxml-schemas.pom
+++ b/maven/ooxml-schemas.pom
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/maven/poi-ooxml-schemas.pom b/maven/poi-ooxml-schemas.pom
index 361fe64f3f..baf531d542 100644
--- a/maven/poi-ooxml-schemas.pom
+++ b/maven/poi-ooxml-schemas.pom
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.3.0</version>
+      <version>2.6.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index 56d2976775..20f281134f 100644
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -101,7 +101,7 @@
 		<dependency>
 		  <groupId>org.apache.xmlbeans</groupId>
 		  <artifactId>xmlbeans</artifactId>
-		  <version>2.3.0</version>
+		  <version>2.6.0</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index 453b53fa57..5b08332736 100644
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -98,7 +98,7 @@
 		<dependency>
 		  <groupId>org.apache.xmlbeans</groupId>
 		  <artifactId>xmlbeans</artifactId>
-		  <version>2.3.0</version>
+		  <version>2.6.0</version>
 		</dependency>
     </dependencies>
 </project>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index bc1feabb4d..10737710e6 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -113,7 +113,7 @@
 		<dependency>
 		  <groupId>org.apache.xmlbeans</groupId>
 		  <artifactId>xmlbeans</artifactId>
-		  <version>2.3.0</version>
+		  <version>2.6.0</version>
 		</dependency>        
 		
 		<dependency>
-- 
2.39.5