From 267d70569ade0505d90564648979351ced3f24c6 Mon Sep 17 00:00:00 2001 From: Dominik Stadler 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 @@ - + - + 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. - + + value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/> @@ -1413,7 +1413,7 @@ under the License. - + 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 @@ org.apache.xmlbeans xmlbeans - 2.3.0 + 2.6.0 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 @@ org.apache.xmlbeans xmlbeans - 2.3.0 + 2.6.0 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 @@ org.apache.xmlbeans xmlbeans - 2.3.0 + 2.6.0 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 @@ org.apache.xmlbeans xmlbeans - 2.3.0 + 2.6.0 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 @@ org.apache.xmlbeans xmlbeans - 2.3.0 + 2.6.0 -- 2.39.5