From 3189e6d8e9791836c13a6870f9d5cff9508850eb Mon Sep 17 00:00:00 2001 From: Joe Schafer Date: Fri, 6 Jul 2018 23:00:01 -0700 Subject: [PATCH 01/10] Add fall through comment to appease ErrorProne Compiling with error prone (the default with Bazel) complains because one of the case doesn't have "fall-through". ``` StringBase64Decoder.java:152: error: [FallThrough] Execution may fall through from the previous case; add a `// fall through` comment before this line if it was deliberate case STATE_OUTPUT_3: ^ (see http://errorprone.info/bugpattern/FallThrough) ``` --- .../java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java b/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java index 8db2651..1064645 100644 --- a/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java +++ b/src/main/java/org/codehaus/stax2/ri/typed/StringBase64Decoder.java @@ -147,7 +147,7 @@ public int decode(byte[] resultBuffer, int resultOffset, int maxLength) // otherwise, our triple is now complete _decodedData = (_decodedData << 6) | bits; } - // still along fast path + // fall through, still along fast path case STATE_OUTPUT_3: if (resultOffset >= resultBufferEnd) { // no room From d9fb214a66b8d52156b14f16a5ccaf90ba6cea6a Mon Sep 17 00:00:00 2001 From: Klaus Lopez Boeing Date: Mon, 9 Jul 2018 14:39:14 -0300 Subject: [PATCH 02/10] fix to write when standaloneSet --- src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java b/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java index 90f1c7b..d1f37a1 100644 --- a/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java +++ b/src/main/java/org/codehaus/stax2/ri/Stax2EventWriterImpl.java @@ -82,6 +82,8 @@ public void add(XMLEvent event) StartDocument sd = (StartDocument) event; if (!sd.encodingSet()) { // encoding defined? mWriter.writeStartDocument(sd.getVersion()); + } else if (sd.standaloneSet()) { + mWriter.writeStartDocument(sd.getVersion(), sd.getCharacterEncodingScheme(), sd.isStandalone()); } else { mWriter.writeStartDocument(sd.getCharacterEncodingScheme(), sd.getVersion()); From 365a7125a30508c38df29b5b9427e98facf25b29 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Tue, 12 Mar 2019 21:03:03 -0700 Subject: [PATCH 03/10] [maven-release-plugin] prepare for next development iteration --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index d838340..20a2589 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.codehaus.woodstox stax2-api Stax2 API - 4.2 + 4.3-SNAPSHOT bundle tax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API. @@ -36,7 +36,7 @@ scm:git:git@github.com:FasterXML/stax2-api.git scm:git:git@github.com:FasterXML/stax2-api.git http://github.com/FasterXML/stax2-api - stax2-api-4.2 + HEAD From 79392c5e0722af88bc28a661b98f19d34c26d54d Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 20 Mar 2019 20:26:16 -0700 Subject: [PATCH 04/10] update travis settings --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c50679..edc0b4a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: java +# 20-Mar-2019, tatu: While targets JDK 6, build now requires JDK 8 jdk: - - openjdk7 - openjdk8 + - openjdk11 From 1cfd09a3f6348c8460b2630d0771e0244983678d Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Mon, 15 Apr 2019 20:48:23 -0700 Subject: [PATCH 05/10] Update release notes wrt #12 --- release-notes/VERSION | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/release-notes/VERSION b/release-notes/VERSION index c482b6c..203d42a 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -4,6 +4,11 @@ Project: Stax2 API = Releases ------------------------------------------------------------------------ +4.2.1 (not released yet) + +#12: Fix to XML declaration write when `standaloneSet` is specified + (suggested by Klaus B) + 4.2 (13-Mar-2019) #15: Add Java 9+ module info using Moditect From f335a2ea1113b6274f99c2a00b06bf855c9e96b5 Mon Sep 17 00:00:00 2001 From: "Jeremiah C. Foster" Date: Tue, 28 Apr 2020 19:52:20 -0400 Subject: [PATCH 06/10] License and copyright proposal in README I've made a proposal in this PR which is considered the "best practice" by legal folks. Adjust as you see fit but it should protect your rights and the rights of users effectively. --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 07b3d33..9e82ce8 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,6 @@ Stax2 API is implemented natively by following Stax XML implementations: In addition, Stax2 API contains wrapper implementations that can be used to support most of API on regular Stax implementations like Sun SJSXP (default Stax implementation bundled with JDK 1.6 and 1.7). -## License - -API is licensed under standard BSD license, which is compatible with all Free and Open Software (OSS) licenses. - ## Java package API classes are in package `org.codehaus.stax2`. @@ -41,3 +37,9 @@ Maven dependency is defined as: Jars can be found from [Central Maven repo](http://repo1.maven.org/maven2/org/codehaus/woodstox/stax2-api/). + +## License and Copyright + +Copyright (c) 2018 FasterXML LLC + +This source code is licensed under standard BSD license, which is compatible with all Free and Open Software (OSS) licenses. From 0da359c70c9dfb0d3629864726745042104905ed Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Tue, 28 Apr 2020 17:06:34 -0700 Subject: [PATCH 07/10] Update copyright start year, latest API version in example. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9e82ce8..e78d1c4 100644 --- a/README.md +++ b/README.md @@ -33,13 +33,13 @@ Maven dependency is defined as: org.codehaus.woodstox stax2-api - 3.1.4 + 4.2 Jars can be found from [Central Maven repo](http://repo1.maven.org/maven2/org/codehaus/woodstox/stax2-api/). ## License and Copyright -Copyright (c) 2018 FasterXML LLC +Copyright (c) 2008 FasterXML LLC This source code is licensed under standard BSD license, which is compatible with all Free and Open Software (OSS) licenses. From adbaf2b39998a7740a01779d458787130256cf03 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 13 May 2020 21:13:14 -0700 Subject: [PATCH 08/10] Prepare for 4.2.1 release --- release-notes/VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release-notes/VERSION b/release-notes/VERSION index 203d42a..f4c400a 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -4,7 +4,7 @@ Project: Stax2 API = Releases ------------------------------------------------------------------------ -4.2.1 (not released yet) +4.2.1 (14-May-2020) #12: Fix to XML declaration write when `standaloneSet` is specified (suggested by Klaus B) From f3e78196b19d4082e1cacb51d1ee28216e8e0f0f Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 13 May 2020 21:14:03 -0700 Subject: [PATCH 09/10] ... --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 20a2589..df02b44 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ com.fasterxml oss-parent - 35 + 38 org.codehaus.woodstox stax2-api Stax2 API - 4.3-SNAPSHOT + 4.2.1-SNAPSHOT bundle tax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API. From 8f10bb50124cb70048a3ec8dd2dca4421a04733c Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 13 May 2020 21:14:43 -0700 Subject: [PATCH 10/10] [maven-release-plugin] prepare release stax2-api-4.2.1 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index df02b44..c96e0b9 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.codehaus.woodstox stax2-api Stax2 API - 4.2.1-SNAPSHOT + 4.2.1 bundle tax2 API is an extension to basic Stax 1.0 API that adds significant new functionality, such as full-featured bi-direction validation interface and high-performance Typed Access API. @@ -36,7 +36,7 @@ scm:git:git@github.com:FasterXML/stax2-api.git scm:git:git@github.com:FasterXML/stax2-api.git http://github.com/FasterXML/stax2-api - HEAD + stax2-api-4.2.1