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

diff --git a/.classpath b/.classpath
index 4c67b866a360765caee1ea3520365bac7468abc6..286f8badade5d29a08e115ab18514cf4d3930da3 100644 (file)
--- 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 c0a4540259c10d569a789f72f5ecb38976c25205..1c0f6e5bfe5807d03e32bad3d410b4521986538b 100644 (file)
--- 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 da49544ae127d55bc44dbfced7d0916d2bf8bf5c..dd92b6593cbab5b92eac5c0826c47e0740c5f271 100644 (file)
--- 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 361fe64f3f72573e7e07ec1da98c5eaabf2a07eb..baf531d542c401dd05f9609c988b12b2b79aa1b0 100644 (file)
--- 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 56d297677592a1ef8282686a0455c149064965ee..20f281134f9cf668b762f386ed46ec4b940fc0f5 100644 (file)
--- 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 453b53fa5709ccbb2e6ef10e0363261dbe0eeb41..5b083327362b6065e2d8c8ab8618d63e665cfb82 100644 (file)
--- 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 bc1feabb4dfd2ce90b46cfc35a490a4204136f24..10737710e6712d0c3d78a6a6aecb3f9d69c62df8 100644 (file)
--- 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>