raise ooxml schema/security version

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1715718 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index 043e31d45ffc39c332494058c5069ea4db66c04b..ffe64cfceb6b7eb6f6e06997bd348546824e3891 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -22,8 +22,8 @@
        <classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
        <classpathentry kind="lib" path="lib/junit-4.12.jar"/>
        <classpathentry kind="lib" path="ooxml-lib/curvesapi-1.03.jar"/>
-       <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.2.jar" sourcepath="ooxml-lib/ooxml-schemas-1.2-sources.jar"/>
-       <classpathentry kind="lib" path="ooxml-lib/ooxml-security-1.0.jar" sourcepath="ooxml-lib/ooxml-security-1.0-sources.jar"/>
+       <classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.3.jar" sourcepath="ooxml-lib/ooxml-schemas-1.3-sources.jar"/>
+       <classpathentry kind="lib" path="ooxml-lib/ooxml-security-1.1.jar" sourcepath="ooxml-lib/ooxml-security-1.1-sources.jar"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.12.jar"/>
        <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.53.jar"/>

diff --git a/build.xml b/build.xml
index b8cab63d73ccb72110e0cc45bf31079ae10cb85c..609574224264ae58a4f22659bafc386270c86adb 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -222,14 +222,14 @@ under the License.
     <property name="ooxml.xsds.url.2"
               value="http://www.ecma-international.org/publications/files/ECMA-ST/Office%20Open%20XML%201st%20edition%20Part%202%20(PDF).zip"/>
     <property name="ooxml.security.src.dir" location="build/ooxml-security-src"/>
-    <property name="ooxml.security.src.jar" location="${ooxml.lib}/ooxml-security-1.0-sources.jar"/>
-    <property name="ooxml.security.jar" location="${ooxml.lib}/ooxml-security-1.0.jar"/>
+    <property name="ooxml.security.src.jar" location="${ooxml.lib}/ooxml-security-1.1-sources.jar"/>
+    <property name="ooxml.security.jar" location="${ooxml.lib}/ooxml-security-1.1.jar"/>
     <property name="ooxml.security.xsd.dir" location="src/ooxml/resources/org/apache/poi/poifs/crypt"/>
     <property name="ooxml.visio.xsd.dir" location="src/ooxml/resources/org/apache/poi/xdgf"/>
     <property name="ooxml.schema.xsdconfig.dir" location="src/ooxml/resources/org/apache/poi/schemas"/>
 
 
-    <property name="maven.ooxml.xsds.version.id" value="1.0"/>
+    <property name="maven.ooxml.xsds.version.id" value="1.3"/>
     <property name="maven.ooxml.xsds.jar" value="ooxml-schemas-${maven.ooxml.xsds.version.id}.jar"/>
 
     <!-- Coverage -->
@@ -472,11 +472,13 @@ under the License.
                <include name="forbiddenapis-1.*.jar"/>
             </fileset>
                <fileset dir="${ooxml.lib}">
-                       <include name="ooxml-schemas-1.1-sources.jar"/>
                        <include name="ooxml-schemas-src-1.1.jar"/>
+                       <include name="ooxml-schemas-1.1-sources.jar"/>
                        <include name="ooxml-schemas-1.1.jar"/>
                        <include name="ooxml-schemas-1.2-sources.jar"/>
                        <include name="ooxml-schemas-1.2.jar"/>
+                       <include name="ooxml-security-1.0-sources.jar"/>
+                       <include name="ooxml-security-1.0.jar"/>
                </fileset>
                <fileset dir="${compile.lib}">
                 <include name="xercesImpl-*.jar"/>