From: Andreas Beeker Date: Sun, 24 Jun 2018 18:53:14 +0000 (+0000) Subject: #59268 - adapt xml schema changes to maven build and add apache staging repository... X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f509d1deae86866ed531f10f2eba7db17e098473;p=poi.git #59268 - adapt xml schema changes to maven build and add apache staging repository temporarily git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1834257 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/sonar/pom.xml b/sonar/pom.xml index ed76764c6d..017bb9f6ce 100644 --- a/sonar/pom.xml +++ b/sonar/pom.xml @@ -1,301 +1,338 @@ - - 4.0.0 - org.apache.poi - poi-parent - pom - 4.0.0-SNAPSHOT - Apache POI - the Java API for Microsoft Documents - Maven build of Apache POI for Sonar checks - http://poi.apache.org/ - - - - POI Users List - user-subscribe@poi.apache.org - user-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-user/ - - - POI Developer List - dev-subscribe@poi.apache.org - dev-unsubscribe@poi.apache.org - http://mail-archives.apache.org/mod_mbox/poi-dev/ - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - Apache Software Foundation - http://www.apache.org/ - - - - Bugzilla - https://bz.apache.org/bugzilla/ - - - - scm:svn:http://svn.apache.org/repos/asf/poi/trunk - scm:svn:https://svn.apache.org/repos/asf/poi/trunk - http://svn.apache.org/viewvc/poi - - - - - xmlbeans-snapshot-repo - xmlbeans snapshot repo - https://repository.apache.org/content/repositories/staging - - + + 4.0.0 + org.apache.poi + poi-parent + pom + 4.0.0-SNAPSHOT + Apache POI - the Java API for Microsoft Documents + Maven build of Apache POI for Sonar checks + http://poi.apache.org/ - - main - ooxml-schema - ooxml-schema-encryption - ooxml-schema-security - ooxml - scratchpad - excelant - examples - - - - UTF-8 - - true + + + POI Users List + user-subscribe@poi.apache.org + user-unsubscribe@poi.apache.org + http://mail-archives.apache.org/mod_mbox/poi-user/ + + + POI Developer List + dev-subscribe@poi.apache.org + dev-unsubscribe@poi.apache.org + http://mail-archives.apache.org/mod_mbox/poi-dev/ + + - - 3.0.0 - 4.12 - 2.5.1 - 2.13.0 - 3.0.1 - 3.0.1 - 3.0.0 - 1.1.0 - 1.8 - 2.19.1 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.8 - 1.8 - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven.plugin.surefire.version} - - - org.apache.maven.surefire - surefire-junit47 - ${maven.plugin.surefire.version} - - - - - ../../test-data - true - org.apache.poi.util.NullLogger - - - @{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=target/tmp - - **/All*Tests.java - **/TestUnfixedBugs.java - **/TestcaseRecordInputStream.java - **/POITestCase.java - - **/TestWordToConverterSuite*.java - **/TestExcelConverterSuite*.java - - - - - - - org.jacoco - jacoco-maven-plugin - 0.7.8 - - - - - - - junit - junit - ${junit.version} - test - - - org.xmlunit - xmlunit-core - ${xmlunit.version} - test - - - org.mockito - mockito-core - ${mockito.version} - test - - + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + - - - - + + Apache Software Foundation + http://www.apache.org/ + + + + Bugzilla + https://bz.apache.org/bugzilla/ + + + + scm:svn:http://svn.apache.org/repos/asf/poi/trunk + scm:svn:https://svn.apache.org/repos/asf/poi/trunk + http://svn.apache.org/viewvc/poi + + + + + xmlbeans-snapshot-repo + xmlbeans snapshot repo + https://repository.apache.org/content/repositories/staging + + + + + main + ooxml-schema + ooxml-schema-encryption + ooxml-schema-security + ooxml + scratchpad + excelant + examples + + + + UTF-8 + + true + + + 3.0.0 + 4.12 + 2.5.1 + 2.13.0 + 3.0.1 + 3.0.1 + 3.0.0 + 1.1.0 + 1.8 + 2.19.1 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + ${maven.plugin.surefire.version} + + + org.apache.maven.surefire + surefire-junit47 + ${maven.plugin.surefire.version} + + + + + ../../test-data + true + org.apache.poi.util.NullLogger + + + @{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=target/tmp + + + **/All*Tests.java + **/TestUnfixedBugs.java + **/TestcaseRecordInputStream.java + **/POITestCase.java + + **/TestWordToConverterSuite*.java + **/TestExcelConverterSuite*.java + + + + + + + org.jacoco + jacoco-maven-plugin + 0.7.8 + + + + + + + junit + junit + ${junit.version} + test + + + org.xmlunit + xmlunit-core + ${xmlunit.version} + test + + + org.mockito + mockito-core + ${mockito.version} + test + + + + + + + - - 32bitstuff - - - sun.arch.data.model - 32 - - - - 512m + + 32bitstuff + + + sun.arch.data.model + 32 + + + + 512m -Xmx768m - - - - - 64bitstuff - - - sun.arch.data.model - 64 - - - - 768m + + + + + 64bitstuff + + + sun.arch.data.model + 64 + + + + 768m -Xmx1024m - - + + - - xmlbean - - xmlbeans.marker - - - - - org.codehaus.mojo - xmlbeans-maven-plugin - 2.3.3 - - - process-sources - - xmlbeans - - - ${basedir}/target/schemas - 1.5 - true - ${xmlbeans.noUpa} - ${xmlbeans.noPvr} - - ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig - ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig - ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig - ${basedir}/../../src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig - - - - - + + xmlbean + + + xmlbeans.marker + + + + + + org.codehaus.mojo + xmlbeans-maven-plugin + 2.3.3 + + + process-sources + + xmlbeans + + + ${basedir}/target/schemas + 1.5 + true + ${xmlbeans.noUpa} + ${xmlbeans.noPvr} + + + ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionCertificate.xsdconfig + + + ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionInfo.xsdconfig + + + ${basedir}/../../src/ooxml/resources/org/apache/poi/poifs/crypt/encryptionPassword.xsdconfig + + + ${basedir}/../../src/ooxml/resources/org/apache/poi/schemas/ooxmlSchemas.xsdconfig + + + + + + - - maven-antrun-plugin - ${maven.plugin.antrun.version} - - - copy-xmltype-and-xsdconfig - generate-sources - run - - - - - - - - - - - - - - - - - - - - - - - - - replace-xmltypeloader - process-sources - run - - - - org.apache.xmlbeans.XmlBeans.getContextTypeLoader() - org.apache.poi.ooxml.POIXMLTypeLoader - - - - - - remove-xmltypeloader-from-schema-jar - prepare-package - run - - - - - - - - - - - - - - org.apache.xmlbeans - xmlbeans - ${xmlbeans.version} - - - - + + maven-antrun-plugin + ${maven.plugin.antrun.version} + + + copy-xmltype-and-xsdconfig + generate-sources + + run + + + + + + + + + + + replace-xmltypeloader + process-sources + + run + + + + + + typeLoader; + + private static synchronized org.apache.xmlbeans.SchemaTypeLoader getTypeLoader() { + org.apache.xmlbeans.SchemaTypeLoader stl = (typeLoader == null) ? null : typeLoader.get(); + if (stl == null) { + stl = org.apache.xmlbeans.XmlBeans.typeLoaderForClassLoader(\2.class.getClassLoader()); + typeLoader = new java.lang.ref.SoftReference(stl); + } + return stl; + } + + public static \2 newInstance\(\) \{]]> + + + + + + + org.apache.xmlbeans.XmlBeans.getContextTypeLoader + + getTypeLoader + + + + + + + + + + + remove-xmltypeloader-from-schema-jar + prepare-package + + run + + + + + + + + + + + + + + + + org.apache.xmlbeans + xmlbeans + ${xmlbeans.version} + + + +