You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2021/12/30 21:15:14 UTC
svn commit: r1896545 - in /xmlbeans/branches/gradle-build: ./ STATUS build.xml src/main/java/org/apache/xmlbeans/XmlBeans.java src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java xkit/doap_XMLBeans.rdf
Author: kiwiwings
Date: Thu Dec 30 21:15:14 2021
New Revision: 1896545
URL: http://svn.apache.org/viewvc?rev=1896545&view=rev
Log:
import trunk changes
Modified:
xmlbeans/branches/gradle-build/ (props changed)
xmlbeans/branches/gradle-build/STATUS
xmlbeans/branches/gradle-build/build.xml
xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlBeans.java
xmlbeans/branches/gradle-build/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf
Propchange: xmlbeans/branches/gradle-build/
------------------------------------------------------------------------------
Merged /xmlbeans/trunk:r1896456-1896544
Modified: xmlbeans/branches/gradle-build/STATUS
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/STATUS?rev=1896545&r1=1896544&r2=1896545&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/STATUS (original)
+++ xmlbeans/branches/gradle-build/STATUS Thu Dec 30 21:15:14 2021
@@ -5,13 +5,15 @@ http://xmlbeans.apache.org/
Active committers:
+Apache POI team
+
+Emeritus:
+
Cezar Andrei cezar at apache dot org
Radu Preotiuc-Pietro radu.preotiuc-pietro at oracle dot com
Jacob Danner jacob dot danner at gmail.com
Wing Yew Poon wing.yew.poon at oracle dot com
-Apache POI team
-
FAQ:
http://wiki.apache.org/xmlbeans/XmlBeansFaq
Modified: xmlbeans/branches/gradle-build/build.xml
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/build.xml?rev=1896545&r1=1896544&r2=1896545&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/build.xml (original)
+++ xmlbeans/branches/gradle-build/build.xml Thu Dec 30 21:15:14 2021
@@ -21,7 +21,7 @@
<property name="jdk.version.class" value="1.8" description="JDK version of generated class files"/>
<property name="compile.debug" value="true"/>
- <property name="version.base" value="5.0.3"/>
+ <property name="version.base" value="5.0.4-SNAPSHOT"/>
<property name="version.rc" value=""/>
<property name="cases.location" location="src/test/resources"/>
@@ -120,7 +120,7 @@
<!-- dependencies -->
<dependency prefix="xml-apis" artifact="xml-apis:xml-apis:1.4.01" usage="java8"/>
- <dependency prefix="log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.0" usage="main"/>
+ <dependency prefix="log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.1" usage="main"/>
<dependency prefix="saxon" artifact="net.sf.saxon:Saxon-HE:10.6" usage="main"/>
<dependency prefix="ant" artifact="org.apache.ant:ant:1.10.12" usage="main"/>
<dependency prefix="javaparser.core" artifact="com.github.javaparser:javaparser-core:3.23.1" usage="main"/>
@@ -139,7 +139,7 @@
<!-- test dependencies -->
<dependency prefix="junit" artifact="junit:junit:4.13.2" usage="tests"/>
- <dependency prefix="log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.0" usage="tests"/>
+ <dependency prefix="log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.1" usage="tests"/>
<dependency prefix="ant-junit" artifact="org.apache.ant:ant-junit:1.10.12" usage="tests"/>
<dependency prefix="ant-junit4" artifact="org.apache.ant:ant-junit4:1.10.12" usage="tests"/>
<dependency prefix="hamcrest" artifact="org.hamcrest:hamcrest:2.2" usage="tests"/>
@@ -917,9 +917,9 @@
<dependency prefix="spotbugs.commons-text" artifact="org.apache.commons:commons-text:1.9" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.jcip-annotations" artifact="net.jcip:jcip-annotations:1.0" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.icu4j" artifact="com.ibm.icu:icu4j:68.2" usage="${spotbugs.lib}" target="icu4j-63.1.jar"/>
- <dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.0" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.0" usage="${spotbugs.lib}"/>
- <dependency prefix="spotbugs.log4j-slf4j18-impl" artifact="org.apache.logging.log4j:log4j-slf4j18-impl:2.17.0" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-api" artifact="org.apache.logging.log4j:log4j-api:2.17.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-core" artifact="org.apache.logging.log4j:log4j-core:2.17.1" usage="${spotbugs.lib}"/>
+ <dependency prefix="spotbugs.log4j-slf4j18-impl" artifact="org.apache.logging.log4j:log4j-slf4j18-impl:2.17.1" usage="${spotbugs.lib}"/>
<dependency prefix="spotbugs.saxon" artifact="net.sf.saxon:Saxon-HE:9.9.1-8" usage="${spotbugs.lib}"/>
<mkdir dir="${basedir}${spotbugs.lib}/config"/>
Modified: xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlBeans.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlBeans.java?rev=1896545&r1=1896544&r2=1896545&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlBeans.java (original)
+++ xmlbeans/branches/gradle-build/src/main/java/org/apache/xmlbeans/XmlBeans.java Thu Dec 30 21:15:14 2021
@@ -38,7 +38,7 @@ public final class XmlBeans {
private static final String TYPE_SYSTEM_FIELD = "typeSystem";
private static String XMLBEANS_TITLE = "org.apache.xmlbeans";
- private static String XMLBEANS_VERSION = "5.0.2";
+ private static String XMLBEANS_VERSION = "5.0.3";
private static String XMLBEANS_VENDOR = "Apache Software Foundation";
static {
Modified: xmlbeans/branches/gradle-build/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java?rev=1896545&r1=1896544&r2=1896545&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java (original)
+++ xmlbeans/branches/gradle-build/src/test/java/xmlcursor/xpath/complex/detailed/TypesTest.java Thu Dec 30 21:15:14 2021
@@ -18,6 +18,7 @@ import org.apache.xmlbeans.*;
import org.junit.Before;
import org.junit.Test;
+import java.time.OffsetDateTime;
import java.util.Calendar;
import static org.junit.Assert.assertEquals;
@@ -35,13 +36,36 @@ public class TypesTest {
@Test
public void testDate() {
+ boolean negativeOffset = OffsetDateTime.now().getOffset().getTotalSeconds() < 0;
res = o.selectPath("xs:date(\"2000-01-01\")");
assertEquals(1, res.length);
Calendar d = ((XmlDate) res[0]).getCalendarValue();
- assertEquals(2000, d.get(Calendar.YEAR));
-// assertEquals(
-// "<xml-fragment>Fri Dec 31 16:00:00 PST 1999</xml-fragment>",
-// d.xmlText());
+ if (negativeOffset) {
+ assertEquals(1999, d.get(Calendar.YEAR));
+ assertEquals(11, d.get(Calendar.MONTH));
+ assertEquals(31, d.get(Calendar.DAY_OF_MONTH));
+ } else {
+ assertEquals(2000, d.get(Calendar.YEAR));
+ assertEquals(0, d.get(Calendar.MONTH));
+ assertEquals(1, d.get(Calendar.DAY_OF_MONTH));
+ }
+ }
+
+ @Test
+ public void testZDate() {
+ boolean negativeOffset = OffsetDateTime.now().getOffset().getTotalSeconds() < 0;
+ res = o.selectPath("xs:date(\"2000-01-01Z\")");
+ assertEquals(1, res.length);
+ Calendar d = ((XmlDate) res[0]).getCalendarValue();
+ if (negativeOffset) {
+ assertEquals(1999, d.get(Calendar.YEAR));
+ assertEquals(11, d.get(Calendar.MONTH));
+ assertEquals(31, d.get(Calendar.DAY_OF_MONTH));
+ } else {
+ assertEquals(2000, d.get(Calendar.YEAR));
+ assertEquals(0, d.get(Calendar.MONTH));
+ assertEquals(1, d.get(Calendar.DAY_OF_MONTH));
+ }
}
@Test
Modified: xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf
URL: http://svn.apache.org/viewvc/xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf?rev=1896545&r1=1896544&r2=1896545&view=diff
==============================================================================
--- xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf (original)
+++ xmlbeans/branches/gradle-build/xkit/doap_XMLBeans.rdf Thu Dec 30 21:15:14 2021
@@ -96,6 +96,13 @@ limitations under the License.
<category rdf:resource="http://projects.apache.org/category/xml"/>
<release>
<Version>
+ <name>XMLBeans v5.0.3</name>
+ <created>2021-12-29</created>
+ <revision>5.0.3</revision>
+ </Version>
+ </release>
+ <release>
+ <Version>
<name>XMLBeans v5.0.2</name>
<created>2021-10-20</created>
<revision>5.0.2</revision>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org