Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package stax2-api for openSUSE:Factory checked in at 2026-07-08 17:48:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/stax2-api (Old) and /work/SRC/openSUSE:Factory/.stax2-api.new.1982 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "stax2-api" Wed Jul 8 17:48:06 2026 rev:7 rq:1364540 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/stax2-api/stax2-api.changes 2025-03-31 11:39:33.935174099 +0200 +++ /work/SRC/openSUSE:Factory/.stax2-api.new.1982/stax2-api.changes 2026-07-08 17:48:08.949674756 +0200 @@ -1,0 +2,20 @@ +Wed Jul 8 09:51:39 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to 4.3.0 + * Changes of version 4.2.2 + + #23: Update 'pom.xml' with more accurate LICENSE definition + + Update parent (oss-parent) 38->55 + * Changes of version 4.3.0 + + #25: Use 'StringBuilder' instead of 'StringBuffer' + + #27: Remove redundant casts + + #28: Use newer 'BigDecimal' api to avoid extra 'String' + allocation + + #29: Cleanup: reorder modifiers to comply with JLS; remove + redundant casts + + #33: 'ArrayDecoders' can run into + 'ArrayIndexOutOfBoundsException' when start != 0 + + #34: Change JDK baseline to 8 (from JDK 6) + + Use Maven wrapper for builds + + Update parent (oss-parent) 55->68 + +------------------------------------------------------------------- Old: ---- stax2-api-4.2.1.tar.gz New: ---- _scmsync.obsinfo build.specials.obscpio stax2-api-4.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ stax2-api.spec ++++++ --- /var/tmp/diff_new_pack.v02W1O/_old 2026-07-08 17:48:10.477727720 +0200 +++ /var/tmp/diff_new_pack.v02W1O/_new 2026-07-08 17:48:10.477727720 +0200 @@ -1,7 +1,7 @@ # # spec file for package stax2-api # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: stax2-api -Version: 4.2.1 +Version: 4.3.0 Release: 0 Summary: Experimental API extending basic StAX implementation License: BSD-2-Clause ++++++ _scmsync.obsinfo ++++++ mtime: 1783508700 commit: 5985221ad60ab936e3c889c84850355f04daabf5fa4a67a5dbb4a169ab528854 url: https://src.opensuse.org/java-packages/stax2-api revision: 5985221ad60ab936e3c889c84850355f04daabf5fa4a67a5dbb4a169ab528854 projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj ++++++ build.specials.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/.gitignore new/.gitignore --- old/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/.gitignore 2026-07-08 13:05:00.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ stax2-api-4.2.1.tar.gz -> stax2-api-4.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/.github/dependabot.yml new/stax2-api-stax2-api-4.3.0/.github/dependabot.yml --- old/stax2-api-stax2-api-4.2.1/.github/dependabot.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/stax2-api-stax2-api-4.3.0/.github/dependabot.yml 2026-03-31 22:23:15.000000000 +0200 @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" + groups: + github-actions: + patterns: + - "*" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/.github/workflows/main.yml new/stax2-api-stax2-api-4.3.0/.github/workflows/main.yml --- old/stax2-api-stax2-api-4.2.1/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/stax2-api-stax2-api-4.3.0/.github/workflows/main.yml 2026-03-31 22:23:15.000000000 +0200 @@ -0,0 +1,45 @@ +name: Build +on: + push: + branches: + - master + paths-ignore: + - "README.md" + - "release-notes/*" + pull_request: + branches: + - master +permissions: + contents: read +jobs: + build: + runs-on: 'ubuntu-latest' + strategy: + fail-fast: false + # 07-Nov-2025, tatu: If Java 6 baseline, cannot build on post-Java-8 + # 31-Mar-2026, tatu: Hence now Java 8 baseline + matrix: + java_version: ['8', '17', '21'] + steps: + - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 + - name: Set up JDK + uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0 + with: + distribution: "temurin" + java-version: ${{ matrix.java_version }} + cache: 'maven' + server-id: central-snapshots + server-username: CI_DEPLOY_USERNAME + server-password: CI_DEPLOY_PASSWORD + - name: Build + run: ./mvnw -B -q -ff -ntp verify + - name: Generate code coverage + if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }} + run: ./mvnw -B -q -ff -ntp test + - name: Publish code coverage + if: ${{ github.event_name != 'pull_request' && matrix.java_version == '8' }} + uses: codecov/codecov-action@3f20e214133d0983f9a10f3d63b0faf9241a3daa # v6.0.0 + with: + token: ${{ secrets.CODECOV_TOKEN }} + files: ./target/site/jacoco/jacoco.xml + flags: unittests diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/.gitignore new/stax2-api-stax2-api-4.3.0/.gitignore --- old/stax2-api-stax2-api-4.2.1/.gitignore 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/.gitignore 2026-03-31 22:23:15.000000000 +0200 @@ -9,6 +9,7 @@ # building target +.mvn/wrapper/maven-wrapper.jar # Eclipse .classpath diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/.mvn/wrapper/maven-wrapper.properties new/stax2-api-stax2-api-4.3.0/.mvn/wrapper/maven-wrapper.properties --- old/stax2-api-stax2-api-4.2.1/.mvn/wrapper/maven-wrapper.properties 1970-01-01 01:00:00.000000000 +0100 +++ new/stax2-api-stax2-api-4.3.0/.mvn/wrapper/maven-wrapper.properties 2026-03-31 22:23:15.000000000 +0200 @@ -0,0 +1,3 @@ +wrapperVersion=3.3.4 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/.travis.yml new/stax2-api-stax2-api-4.3.0/.travis.yml --- old/stax2-api-stax2-api-4.2.1/.travis.yml 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/.travis.yml 2026-03-31 22:23:15.000000000 +0200 @@ -1,5 +1,9 @@ language: java +arch: + - AMD64 + - ppc64le + # 20-Mar-2019, tatu: While targets JDK 6, build now requires JDK 8 jdk: - openjdk8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/LICENSE new/stax2-api-stax2-api-4.3.0/LICENSE --- old/stax2-api-stax2-api-4.2.1/LICENSE 1970-01-01 01:00:00.000000000 +0100 +++ new/stax2-api-stax2-api-4.3.0/LICENSE 2026-03-31 22:23:15.000000000 +0200 @@ -0,0 +1,25 @@ +BSD 2-Clause License + +Copyright (c) 2008+, FasterXML, LLC +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +* Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/README.md new/stax2-api-stax2-api-4.3.0/README.md --- old/stax2-api-stax2-api-4.2.1/README.md 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/README.md 2026-03-31 22:23:15.000000000 +0200 @@ -1,6 +1,6 @@ # Overview -Stax2 API is an extension to standard [Stax](http://en.wikipedia.org/wiki/StAX) API ("STandard Api for Xml procesing"), +Stax2 API is an extension to standard [Stax](http://en.wikipedia.org/wiki/StAX) API ("the STandard Api for Xml processing"), pull-parser API of JDK, added in JDK 6. ## Status @@ -15,7 +15,7 @@ * [Aalto](../../../aalto-xml) (performance-oriented, also non-blocking/async) * [Woodstox](../../../woodstox) (full-featured, most compliant XML package on Java platform) -In addition, Stax2 API contains wrapper implementations that can be used to support most of API on +In addition, Stax2 API contains wrapper implementations that can be used to support most of the API on regular Stax implementations like Sun SJSXP (default Stax implementation bundled with JDK 1.6 and 1.7). ## Java package @@ -23,7 +23,7 @@ API classes are in package `org.codehaus.stax2`. Stax2 API also contains partial Reference Implementation of many of API classes, under -`org.codehaus.stax2.ri`: intention is to make it as painless as possible for Java Stax parser +`org.codehaus.stax2.ri`: intention is to make it as painless as possible for Java Stax parsers to implement full Stax2 support. ## Usage @@ -33,7 +33,7 @@ <dependency> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> - <version>4.2</version> + <version>4.2.2</version> </dependency> Jars can be found from [Central Maven repo](http://repo1.maven.org/maven2/org/codehaus/woodstox/stax2-api/). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/mvnw new/stax2-api-stax2-api-4.3.0/mvnw --- old/stax2-api-stax2-api-4.2.1/mvnw 1970-01-01 01:00:00.000000000 +0100 +++ new/stax2-api-stax2-api-4.3.0/mvnw 2026-03-31 22:23:15.000000000 +0200 @@ -0,0 +1,308 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.2.0 +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "$(uname)" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME + else + JAVA_HOME="/Library/Java/Home"; export JAVA_HOME + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=$(java-config --jre-home) + fi +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --unix "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --unix "$CLASSPATH") +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] && + JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="$(which javac)" + if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=$(which readlink) + if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then + if $darwin ; then + javaHome="$(dirname "\"$javaExecutable\"")" + javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac" + else + javaExecutable="$(readlink -f "\"$javaExecutable\"")" + fi + javaHome="$(dirname "\"$javaExecutable\"")" + javaHome=$(expr "$javaHome" : '\(.*\)/bin') + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=$(cd "$wdir/.." || exit 1; pwd) + fi + # end of workaround + done + printf '%s' "$(cd "$basedir" || exit 1; pwd)" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + # Remove \r in case we run on Windows within Git Bash + # and check out the repository with auto CRLF management + # enabled. Otherwise, we may read lines that are delimited with + # \r\n and produce $'-Xarg\r' rather than -Xarg due to word + # splitting rules. + tr -s '\r\n' ' ' < "$1" + fi +} + +log() { + if [ "$MVNW_VERBOSE" = true ]; then + printf '%s\n' "$1" + fi +} + +BASE_DIR=$(find_maven_basedir "$(dirname "$0")") +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR +log "$MAVEN_PROJECTBASEDIR" + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" +if [ -r "$wrapperJarPath" ]; then + log "Found $wrapperJarPath" +else + log "Couldn't find $wrapperJarPath, downloading it ..." + + if [ -n "$MVNW_REPOURL" ]; then + wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"; + fi + while IFS="=" read -r key value; do + # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' ) + safeValue=$(echo "$value" | tr -d '\r') + case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;; + esac + done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" + log "Downloading from: $wrapperUrl" + + if $cygwin; then + wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath") + fi + + if command -v wget > /dev/null; then + log "Found wget ... using wget" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + log "Found curl ... using curl" + [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent" + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + else + curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath" + fi + else + log "Falling back to using Java to download" + javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java" + javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaSource=$(cygpath --path --windows "$javaSource") + javaClass=$(cygpath --path --windows "$javaClass") + fi + if [ -e "$javaSource" ]; then + if [ ! -e "$javaClass" ]; then + log " - Compiling MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/javac" "$javaSource") + fi + if [ -e "$javaClass" ]; then + log " - Running MavenWrapperDownloader.java ..." + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath" + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +# If specified, validate the SHA-256 sum of the Maven wrapper jar file +wrapperSha256Sum="" +while IFS="=" read -r key value; do + case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;; + esac +done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties" +if [ -n "$wrapperSha256Sum" ]; then + wrapperSha256Result=false + if command -v sha256sum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + elif command -v shasum > /dev/null; then + if echo "$wrapperSha256Sum $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then + wrapperSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." + exit 1 + fi + if [ $wrapperSha256Result = false ]; then + echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2 + echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2 + echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2 + exit 1 + fi +fi + +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$JAVA_HOME" ] && + JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME") + [ -n "$CLASSPATH" ] && + CLASSPATH=$(cygpath --path --windows "$CLASSPATH") + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR") +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $*" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +# shellcheck disable=SC2086 # safe args +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/mvnw.cmd new/stax2-api-stax2-api-4.3.0/mvnw.cmd --- old/stax2-api-stax2-api-4.2.1/mvnw.cmd 1970-01-01 01:00:00.000000000 +0100 +++ new/stax2-api-stax2-api-4.3.0/mvnw.cmd 2026-03-31 22:23:15.000000000 +0200 @@ -0,0 +1,205 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.2.0 +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"; + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %WRAPPER_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file +SET WRAPPER_SHA_256_SUM="" +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B +) +IF NOT %WRAPPER_SHA_256_SUM%=="" ( + powershell -Command "&{"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^ + " exit 1;"^ + "}"^ + "}" + if ERRORLEVEL 1 goto error +) + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/pom.xml new/stax2-api-stax2-api-4.3.0/pom.xml --- old/stax2-api-stax2-api-4.2.1/pom.xml 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/pom.xml 2026-03-31 22:23:15.000000000 +0200 @@ -4,14 +4,14 @@ <parent> <groupId>com.fasterxml</groupId> <artifactId>oss-parent</artifactId> - <version>38</version> + <version>68</version> </parent> <groupId>org.codehaus.woodstox</groupId> <artifactId>stax2-api</artifactId> <name>Stax2 API</name> - <version>4.2.1</version> + <version>4.3.0</version> <packaging>bundle</packaging> - <description>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. + <description>Stax2 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. </description> <url>http://github.com/FasterXML/stax2-api</url> <organization> @@ -27,7 +27,7 @@ </developers> <licenses> <license> - <name>The BSD License</name> + <name>The BSD 2-Clause License</name> <url>http://www.opensource.org/licenses/bsd-license.php</url> <distribution>repo</distribution> </license> @@ -36,13 +36,14 @@ <connection>scm:git:[email protected]:FasterXML/stax2-api.git</connection> <developerConnection>scm:git:[email protected]:FasterXML/stax2-api.git</developerConnection> <url>http://github.com/FasterXML/stax2-api</url> - <tag>stax2-api-4.2.1</tag> + <tag>stax2-api-4.3.0</tag> </scm> <properties> <!-- 1.6 baseline for 4.0 (earlier only required 1.5) --> - <javac.src.version>1.6</javac.src.version> - <javac.target.version>1.6</javac.target.version> + <!-- 4.3 finally increases to Java 8 --> + <javac.src.version>8</javac.src.version> + <javac.target.version>8</javac.target.version> <!-- 4.1 adds "Automatic-Module-Name" for JDK 9 --> <jdk.module.name>org.codehaus.stax2</jdk.module.name> @@ -61,8 +62,8 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <configuration> - <source>1.6</source> - <target>1.6</target> + <source>8</source> + <target>8</target> <encoding>UTF-8</encoding> <links> <link>https://docs.oracle.com/javase/8/docs/api/</link> @@ -142,51 +143,4 @@ </plugin> </plugins> </build> - - <profiles> - <profile> - <id>moditect</id> - <properties> - <!-- Not only do we need JDK 9+, must target later JDK too --> - <java.version>1.9</java.version> - <javac.src.version>1.9</javac.src.version> - <javac.target.version>1.9</javac.target.version> - <version.plugin.bundle>4.1.0</version.plugin.bundle> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.moditect</groupId> - <artifactId>moditect-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-module-info</id> - <phase>generate-sources</phase> - <goals> - <goal>generate-module-info</goal> - </goals> - <configuration> - <modules> - <module> - <artifact> - <groupId>${project.groupId}</groupId> - <artifactId>${project.artifactId}</artifactId> - <!-- 08-Mar-2019, tatu: Alas, due to JDK bug - https://bugs.openjdk.java.net/browse/JDK-8207162 - this won't work... - - <version>5.2.0</version> - --> - <version>${project.version}</version> - </artifact> - </module> - </modules> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/release-notes/VERSION new/stax2-api-stax2-api-4.3.0/release-notes/VERSION --- old/stax2-api-stax2-api-4.2.1/release-notes/VERSION 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/release-notes/VERSION 2026-03-31 22:23:15.000000000 +0200 @@ -4,6 +4,27 @@ = Releases ------------------------------------------------------------------------ +4.3.0 (not yet released) + +#25: Use `StringBuilder` instead of `StringBuffer` + (suggested by @hduelme) +#27: Remove redundant casts + (suggested by @hduelme) +#28: Use newer `BigDecimal` api to avoid extra `String` allocation + (contributed by @winfriedgerlach) +#29: Cleanup: reorder modifiers to comply with JLS; remove redundant casts + (contributed by @winfriedgerlach) +#33: `ArrayDecoders` can run into `ArrayIndexOutOfBoundsException` when start != 0 + (contributed by @winfriedgerlach) +#34: Change JDK baseline to 8 (from JDK 6) +- Use Maven wrapper for builds +- Update parent (oss-parent) 55->68 + +4.2.2 (10-Oct-2023) + +#23: Update `pom.xml` with more accurate LICENSE definition +- Update parent (oss-parent) 38->55 + 4.2.1 (14-May-2020) #12: Fix to XML declaration write when `standaloneSet` is specified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2EventReaderImpl.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2EventReaderImpl.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2EventReaderImpl.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2EventReaderImpl.java 2026-03-31 22:23:15.000000000 +0200 @@ -195,7 +195,7 @@ // ??? do we need to update mPrePeekEvent now String str = null; - StringBuffer sb = null; + StringBuilder sb = null; /* Ok, fine, then just need to loop through and get all the * text... @@ -217,7 +217,7 @@ str = curr; } else { if (sb == null) { - sb = new StringBuffer(str.length() + curr.length()); + sb = new StringBuilder(str.length() + curr.length()); sb.append(str); } sb.append(curr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2ReaderAdapter.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2ReaderAdapter.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2ReaderAdapter.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2ReaderAdapter.java 2026-03-31 22:23:15.000000000 +0200 @@ -837,7 +837,7 @@ if (prefix == null || prefix.length() == 0) { return ln; } - StringBuffer sb = new StringBuffer(ln.length() + 1 + prefix.length()); + StringBuilder sb = new StringBuilder(ln.length() + 1 + prefix.length()); sb.append(prefix); sb.append(':'); sb.append(ln); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2ReaderImpl.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2ReaderImpl.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2ReaderImpl.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2ReaderImpl.java 2026-03-31 22:23:15.000000000 +0200 @@ -196,7 +196,7 @@ if (prefix == null) { return ln; } - StringBuffer sb = new StringBuffer(ln.length() + 1 + prefix.length()); + StringBuilder sb = new StringBuilder(ln.length() + 1 + prefix.length()); sb.append(prefix); sb.append(':'); sb.append(ln); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2WriterAdapter.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2WriterAdapter.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2WriterAdapter.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2WriterAdapter.java 2026-03-31 22:23:15.000000000 +0200 @@ -333,7 +333,7 @@ /* This may or may not work... depending on how well underlying * implementation follows stax 1.0 spec (it should work) */ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("<!DOCTYPE"); sb.append(rootName); if (systemId != null) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2WriterImpl.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2WriterImpl.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/Stax2WriterImpl.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/Stax2WriterImpl.java 2026-03-31 22:23:15.000000000 +0200 @@ -77,7 +77,7 @@ /* This may or may not work... depending on how well underlying * implementation follows stax 1.0 spec (it should work) */ - StringBuffer sb = new StringBuffer(); + StringBuilder sb = new StringBuilder(); sb.append("<!DOCTYPE"); sb.append(rootName); if (systemId != null) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/dom/DOMWrappingReader.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/dom/DOMWrappingReader.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/dom/DOMWrappingReader.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/dom/DOMWrappingReader.java 2026-03-31 22:23:15.000000000 +0200 @@ -657,7 +657,7 @@ handleIllegalNsIndex(index); } // Note: _nsDeclList entries have been appropriately intern()ed if need be - return (String) _nsDeclList.get(index + index); + return _nsDeclList.get(index + index); } @Override @@ -683,7 +683,7 @@ handleIllegalNsIndex(index); } // Note: _nsDeclList entries have been appropriately intern()ed if need be - return (String) _nsDeclList.get(index + index + 1); + return _nsDeclList.get(index + index + 1); } // Note: implemented as part of NamespaceContext @@ -1978,7 +1978,7 @@ if (prefix == null) { return _internName(ln); } - StringBuffer sb = new StringBuffer(ln.length() + 1 + prefix.length()); + StringBuilder sb = new StringBuilder(ln.length() + 1 + prefix.length()); sb.append(prefix); sb.append(':'); sb.append(ln); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/evt/EndElementEventImpl.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/evt/EndElementEventImpl.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/evt/EndElementEventImpl.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/evt/EndElementEventImpl.java 2026-03-31 22:23:15.000000000 +0200 @@ -61,7 +61,7 @@ * not strictly required, but helps in preventing later * problems */ - l.add((Namespace) namespaces.next()); + l.add(namespaces.next()); } mNamespaces = l; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/evt/StartElementEventImpl.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/evt/StartElementEventImpl.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/evt/StartElementEventImpl.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/evt/StartElementEventImpl.java 2026-03-31 22:23:15.000000000 +0200 @@ -124,14 +124,14 @@ if (_nsDecls != null) { for (int i = 0, len = _nsDecls.size(); i < len; ++i) { w.write(' '); - ((Namespace) _nsDecls.get(i)).writeAsEncodedUnicode(w); + _nsDecls.get(i).writeAsEncodedUnicode(w); } } // How about attrs? if (_attrs != null) { for (int i = 0, len = _attrs.size(); i < len; ++i) { - Attribute attr = (Attribute) _attrs.get(i); + Attribute attr = _attrs.get(i); // No point in adding default attributes? if (attr.isSpecified()) { w.write(' '); @@ -156,7 +156,7 @@ // Any namespaces? if (_nsDecls != null) { for (int i = 0, len = _nsDecls.size(); i < len; ++i) { - Namespace ns = (Namespace) _nsDecls.get(i); + Namespace ns = _nsDecls.get(i); String prefix = ns.getPrefix(); String uri = ns.getNamespaceURI(); if (prefix == null || prefix.length() == 0) { @@ -170,7 +170,7 @@ // How about attrs? if (_attrs != null) { for (int i = 0, len = _attrs.size(); i < len; ++i) { - Attribute attr = (Attribute) _attrs.get(i); + Attribute attr = _attrs.get(i); // No point in adding default attributes? if (attr.isSpecified()) { QName name = attr.getName(); @@ -221,7 +221,7 @@ prefix = ""; } for (int i = 0, len = _nsDecls.size(); i < len; ++i) { - Namespace ns = (Namespace) _nsDecls.get(i); + Namespace ns = _nsDecls.get(i); String thisPrefix = ns.getPrefix(); if (thisPrefix == null) { thisPrefix = ""; @@ -248,7 +248,7 @@ boolean notInNs = (uri == null || uri.length() == 0); for (int i = 0; i < len; ++i) { - Attribute attr = (Attribute) _attrs.get(i); + Attribute attr = _attrs.get(i); QName name = attr.getName(); if (name.getLocalPart().equals(ln)) { String thisUri = name.getNamespaceURI(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/typed/CharArrayBase64Decoder.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/typed/CharArrayBase64Decoder.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/typed/CharArrayBase64Decoder.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/typed/CharArrayBase64Decoder.java 2026-03-31 22:23:15.000000000 +0200 @@ -256,7 +256,7 @@ private boolean nextSegment() { if (_nextSegmentIndex < _nextSegments.size()) { - _currSegment = (char[]) _nextSegments.get(_nextSegmentIndex++); + _currSegment = _nextSegments.get(_nextSegmentIndex++); // last segment may have non-zero ptr, slack at end if (_nextSegmentIndex == _nextSegments.size()) { _currSegmentPtr = _lastSegmentOffset; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/typed/SimpleValueEncoder.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/typed/SimpleValueEncoder.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/typed/SimpleValueEncoder.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/typed/SimpleValueEncoder.java 2026-03-31 22:23:15.000000000 +0200 @@ -61,8 +61,7 @@ if (enc.isCompleted()) { // fitted in completely? return new String(mBuffer, 0, last); } - // !!! TODO: with Java 5, use StringBuilder instead - StringBuffer sb = new StringBuffer(mBuffer.length << 1); + StringBuilder sb = new StringBuilder(mBuffer.length << 1); sb.append(mBuffer, 0, last); do { last = enc.encodeMore(mBuffer, 0, mBuffer.length); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/typed/ValueDecoderFactory.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/typed/ValueDecoderFactory.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/ri/typed/ValueDecoderFactory.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/ri/typed/ValueDecoderFactory.java 2026-03-31 22:23:15.000000000 +0200 @@ -178,14 +178,14 @@ public abstract static class DecoderBase extends TypedValueDecoder { - final static long L_BILLION = 1000000000; + static final long L_BILLION = 1000000000; - final static long L_MAX_INT = (long) Integer.MAX_VALUE; + static final long L_MAX_INT = Integer.MAX_VALUE; - final static long L_MIN_INT = (long) Integer.MIN_VALUE; + static final long L_MIN_INT = Integer.MIN_VALUE; - final static BigInteger BD_MIN_LONG = BigInteger.valueOf(Long.MIN_VALUE); - final static BigInteger BD_MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE); + static final BigInteger BD_MIN_LONG = BigInteger.valueOf(Long.MIN_VALUE); + static final BigInteger BD_MAX_LONG = BigInteger.valueOf(Long.MAX_VALUE); /** * Pointer to the next character to check, within lexical value @@ -319,7 +319,7 @@ * * @return Parsed integer value */ - protected final static int parseInt(char[] digitChars, int start, int end) + protected static final int parseInt(char[] digitChars, int start, int end) { /* This looks ugly, but appears to be the fastest way * (based on perf testing, profiling) @@ -352,7 +352,7 @@ return num; } - protected final static int parseInt(int num, char[] digitChars, int start, int end) + protected static final int parseInt(int num, char[] digitChars, int start, int end) { num = (num * 10) + (digitChars[start] - '0'); if (++start < end) { @@ -379,7 +379,7 @@ return num; } - protected final static int parseInt(String digitChars, int start, int end) + protected static final int parseInt(String digitChars, int start, int end) { int num = digitChars.charAt(start) - '0'; if (++start < end) { @@ -409,7 +409,7 @@ return num; } - protected final static int parseInt(int num, String digitChars, int start, int end) + protected static final int parseInt(int num, String digitChars, int start, int end) { num = (num * 10) + (digitChars.charAt(start) - '0'); if (++start < end) { @@ -428,7 +428,7 @@ num = (num * 10) + (digitChars.charAt(start) - '0'); } } - } + } } } } @@ -436,20 +436,20 @@ return num; } - protected final static long parseLong(char[] digitChars, int start, int end) + protected static final long parseLong(char[] digitChars, int start, int end) { // Note: caller must ensure length is [10, 18] int start2 = end-9; long val = parseInt(digitChars, start, start2) * L_BILLION; - return val + (long) parseInt(digitChars, start2, end); + return val + parseInt(digitChars, start2, end); } - protected final static long parseLong(String digitChars, int start, int end) + protected static final long parseLong(String digitChars, int start, int end) { // Note: caller must ensure length is [10, 18] int start2 = end-9; long val = parseInt(digitChars, start, start2) * L_BILLION; - return val + (long) parseInt(digitChars, start2, end); + return val + parseInt(digitChars, start2, end); } /* @@ -492,7 +492,7 @@ ///////////////////////////////////////////////////// */ - public final static class BooleanDecoder + public static final class BooleanDecoder extends DecoderBase { protected boolean mValue; @@ -579,7 +579,7 @@ } } - public final static class IntDecoder + public static final class IntDecoder extends DecoderBase { protected int mValue; @@ -627,7 +627,7 @@ base += L_BILLION; } int i = parseInt(lexical, ptr, ptr+charsLeft); - long l = base + (long) i; + long l = base + i; if (neg) { l = -l; if (l >= L_MIN_INT) { @@ -682,7 +682,7 @@ base += L_BILLION; } int i = parseInt(lexical, ptr, ptr+charsLeft); - long l = base + (long) i; + long l = base + i; if (neg) { l = -l; if (l >= L_MIN_INT) { @@ -700,7 +700,7 @@ } } - public final static class LongDecoder + public static final class LongDecoder extends DecoderBase { protected long mValue; @@ -731,7 +731,7 @@ // Quick check for short (single-digit) values: int charsLeft = end-ptr; if (charsLeft == 0) { - mValue = (long) (neg ? -nr : nr); + mValue = (neg ? -nr : nr); return; } verifyDigits(lexical, ptr, end); @@ -739,7 +739,7 @@ // Can parse more cheaply, if it's really just an int... if (charsLeft <= 8) { // no overflow int i = parseInt(nr, lexical, ptr, ptr+charsLeft); - mValue = (long) (neg ? -i : i); + mValue = (neg ? -i : i); return; } // At this point, let's just push back the first digit... simpler @@ -777,7 +777,7 @@ // Quick check for short (single-digit) values: int charsLeft = end-ptr; if (charsLeft == 0) { - mValue = (long) (neg ? -nr : nr); + mValue = (neg ? -nr : nr); return; } verifyDigits(lexical, start, end, ptr); @@ -823,7 +823,7 @@ } } - public final static class FloatDecoder + public static final class FloatDecoder extends DecoderBase { protected float mValue; @@ -915,7 +915,7 @@ } } - public final static class DoubleDecoder + public static final class DoubleDecoder extends DecoderBase { protected double mValue; @@ -1013,7 +1013,7 @@ ///////////////////////////////////////////////////// */ - public final static class IntegerDecoder + public static final class IntegerDecoder extends DecoderBase { protected BigInteger mValue; @@ -1047,7 +1047,7 @@ } } - public final static class DecimalDecoder + public static final class DecimalDecoder extends DecoderBase { protected BigDecimal mValue; @@ -1074,19 +1074,14 @@ { int len = end-start; try { - /* !!! 21-Nov-2008, TSa: This constructor was added in JDK1.5 - * so can't yet be used (As of Woodstox 4.x). - * Need to use the older constructor for now - */ - //mValue = new BigDecimal(lexical, start, len); - mValue = new BigDecimal(new String(lexical, start, len)); + mValue = new BigDecimal(lexical, start, len); } catch (NumberFormatException nex) { throw constructInvalidValue(new String(lexical, start, len)); } } } - public final static class QNameDecoder + public static final class QNameDecoder extends DecoderBase { final NamespaceContext mNsCtxt; @@ -1141,7 +1136,7 @@ protected QName resolveQName(String prefix, String localName) throws IllegalArgumentException { - if (prefix.length() == 0 || localName.length() == 0) { + if (prefix.isEmpty() || localName.isEmpty()) { // either prefix or local name is empty String, illegal throw constructInvalidValue(prefix+":"+localName); } @@ -1150,7 +1145,7 @@ * namespace' has empty URI) */ String uri = mNsCtxt.getNamespaceURI(prefix); - if (uri == null || uri.length() == 0) { + if (uri == null || uri.isEmpty()) { throw new IllegalArgumentException("Value \""+lexicalDesc(prefix+":"+localName)+"\" not a valid QName: prefix '"+prefix+"' not bound to a namespace"); } return new QName(uri, localName, prefix); @@ -1177,13 +1172,13 @@ * Let's use some modest array size for allocating initial * result buffer */ - protected final static int INITIAL_RESULT_BUFFER_SIZE = 40; + protected static final int INITIAL_RESULT_BUFFER_SIZE = 40; /** * When expanding 'small' result buffers, we will expand * size by bigger factor than for larger ones. */ - protected final static int SMALL_RESULT_BUFFER_SIZE = 4000; + protected static final int SMALL_RESULT_BUFFER_SIZE = 4000; protected int mStart; @@ -1223,7 +1218,7 @@ } } - public final static class IntArrayDecoder + public static final class IntArrayDecoder extends BaseArrayDecoder { int[] mResult; @@ -1260,7 +1255,7 @@ int oldLen = old.length; int newSize = calcNewSize(oldLen); mResult = new int[newSize]; - System.arraycopy(old, mStart, mResult, 0, oldLen); + System.arraycopy(old, mStart, mResult, 0, mCount); mStart = 0; mEnd = newSize; } @@ -1291,7 +1286,7 @@ } - public final static class LongArrayDecoder + public static final class LongArrayDecoder extends BaseArrayDecoder { long[] mResult; @@ -1320,7 +1315,7 @@ int oldLen = old.length; int newSize = calcNewSize(oldLen); mResult = new long[newSize]; - System.arraycopy(old, mStart, mResult, 0, oldLen); + System.arraycopy(old, mStart, mResult, 0, mCount); mStart = 0; mEnd = newSize; } @@ -1349,7 +1344,7 @@ } } - public final static class FloatArrayDecoder + public static final class FloatArrayDecoder extends BaseArrayDecoder { float[] mResult; @@ -1378,7 +1373,7 @@ int oldLen = old.length; int newSize = calcNewSize(oldLen); mResult = new float[newSize]; - System.arraycopy(old, mStart, mResult, 0, oldLen); + System.arraycopy(old, mStart, mResult, 0, mCount); mStart = 0; mEnd = newSize; } @@ -1407,7 +1402,7 @@ } } - public final static class DoubleArrayDecoder + public static final class DoubleArrayDecoder extends BaseArrayDecoder { double[] mResult; @@ -1436,7 +1431,7 @@ int oldLen = old.length; int newSize = calcNewSize(oldLen); mResult = new double[newSize]; - System.arraycopy(old, mStart, mResult, 0, oldLen); + System.arraycopy(old, mStart, mResult, 0, mCount); mStart = 0; mEnd = newSize; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/typed/Base64Variants.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/typed/Base64Variants.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/typed/Base64Variants.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/typed/Base64Variants.java 2026-03-31 22:23:15.000000000 +0200 @@ -66,7 +66,7 @@ */ public final static Base64Variant MODIFIED_FOR_URL; static { - StringBuffer sb = new StringBuffer(STD_BASE64_ALPHABET); + StringBuilder sb = new StringBuilder(STD_BASE64_ALPHABET); // Replace plus with hyphen, slash with underscore (and no padding) sb.setCharAt(sb.indexOf("+"), '-'); sb.setCharAt(sb.indexOf("/"), '_'); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/validation/XMLValidationSchemaFactory.java new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/validation/XMLValidationSchemaFactory.java --- old/stax2-api-stax2-api-4.2.1/src/main/java/org/codehaus/stax2/validation/XMLValidationSchemaFactory.java 2020-05-14 06:14:43.000000000 +0200 +++ new/stax2-api-stax2-api-4.3.0/src/main/java/org/codehaus/stax2/validation/XMLValidationSchemaFactory.java 2026-03-31 22:23:15.000000000 +0200 @@ -120,10 +120,8 @@ public static XMLValidationSchemaFactory newInstance(String schemaType, ClassLoader classLoader) throws FactoryConfigurationError { - /* First, let's check and map schema type to the shorter internal - * id: - */ - String internalId = (String) sSchemaIds.get(schemaType); + // Let's check and map schema type to the shorter internal id: + String internalId = sSchemaIds.get(schemaType); if (internalId == null) { throw new FactoryConfigurationError("Unrecognized schema type (id '"+schemaType+"')"); } @@ -131,9 +129,7 @@ String propertyId = SYSTEM_PROPERTY_FOR_IMPL + internalId; SecurityException secEx = null; - /* First, let's see if there's a system property (overrides other - * settings) - */ + // First, let's see if there's a system property (overrides other settings) try { String clsName = System.getProperty(propertyId); if (clsName != null && clsName.length() > 0) { @@ -156,9 +152,18 @@ f = new File(f, "lib"); f = new File(f, JAXP_PROP_FILENAME); if (f.exists()) { + Properties props = new Properties(); try { - Properties props = new Properties(); - props.load(new FileInputStream(f)); + FileInputStream in = new FileInputStream(f); + // TODO: 15-Jan-2020, tatu -- when upgrading baseline to Java 7+, + // use try-with-resource instead + try { + props.load(in); + } finally { + try { + in.close(); + } catch (IOException e) { } + } String clsName = props.getProperty(propertyId); if (clsName != null && clsName.length() > 0) { return createNewInstance(classLoader, clsName); ++++++ stax2-api-build.xml ++++++ --- /var/tmp/diff_new_pack.v02W1O/_old 2026-07-08 17:48:10.861741030 +0200 +++ /var/tmp/diff_new_pack.v02W1O/_new 2026-07-08 17:48:10.881741723 +0200 @@ -8,7 +8,7 @@ <property name="project.groupId" value="org.codehaus.woodstox"/> <property name="project.artifactId" value="stax2-api"/> - <property name="project.version" value="4.2.1"/> + <property name="project.version" value="4.3.0"/> <property name="compiler.release" value="8"/> <property name="compiler.source" value="1.${compiler.release}"/> @@ -18,6 +18,7 @@ <property name="build.dir" value="target"/> <property name="build.outputDir" value="${build.dir}/classes"/> <property name="build.srcDir" value="src/main/java"/> + <property name="build.moditectDir" value="src/moditect"/> <property name="build.resourceDir" value="src/main/resources"/> <property name="reporting.outputDirectory" value="${build.dir}/site"/> @@ -51,6 +52,22 @@ <pathelement location="${build.srcDir}"/> </src> </javac> + <javac destdir="${build.outputDir}" + nowarn="true" + debug="true" + optimize="true" + encoding="utf-8" + deprecation="true" + release="9" + verbose="false" + fork="false"> + <src> + <pathelement location="${build.moditectDir}"/> + </src> + <modulepath> + <pathelement location="${build.outputDir}"/> + </modulepath> + </javac> <copy todir="${build.outputDir}"> <fileset dir="${build.resourceDir}"/> </copy> @@ -110,7 +127,7 @@ <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/> <attribute name="Implementation-Vendor" value="fasterxml.com"/> <attribute name="Implementation-Version" value="${project.version}"/> - <attribute name="Import-Package" value="javax.xml.namespace,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,org.codehaus.stax2,org.codehaus.stax2.evt,org.codehaus.stax2.ri,org.codehaus.stax2.ri.evt,org.codehaus.stax2.ri.typed,org.codehaus.stax2.typed,org.codehaus.stax2.util,org.codehaus.stax2.validation,org.w3c.dom"/> + <attribute name="Import-Package" value="javax.xml.namespace,javax.xml.stream,javax.xml.stream.events,javax.xml.stream.util,javax.xml.transform,javax.xml.transform.dom,org.w3c.dom"/> <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/> <attribute name="JavaPackages-GroupId" value="${project.groupId}"/> <attribute name="JavaPackages-Version" value="${project.version}"/>
