diff --git a/.github/workflows/ci-pull.yml b/.github/workflows/ci-pull.yml index 4341cc4b..dad4f3ed 100644 --- a/.github/workflows/ci-pull.yml +++ b/.github/workflows/ci-pull.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - java-version: [ '17', '21' ] + java-version: [ '17', '21', '24' ] runs-on: ubuntu-latest @@ -28,4 +28,11 @@ jobs: distribution: 'temurin' cache: maven - name: Build API - run: mvn -B install --file pom.xml + run: | + EXTRA_ARGS="" + if [[ "${{ matrix.java }}" -lt 21 ]]; then + # for JDKs < 21 we should skip extra checks as those won't pass: + EXTRA_ARGS="-Pskip-checks" + fi + + ./mvnw -B install --file pom.xml $EXTRA_ARGS diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 00000000..7967f30d Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..91f89b4f --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,20 @@ +# 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. +wrapperVersion=3.3.2 +distributionType=bin +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar diff --git a/README.md b/README.md index 5ddc1e99..118d4d4d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ You can learn more about it here: ## System requirements -JDK 8. +JDK 21. ## Licensing @@ -21,9 +21,9 @@ Refer to [license.txt](https://github.com/jakartaee/validation/blob/master/licen ## Build from Source You can build the Jakarta Validation API from source by cloning the git repository https://github.com/jakartaee/validation -You will also need a JDK 8 and Maven 3 (>= 3.0.3). With these prerequisites in place you can compile the source via: +You will also need a JDK 21 and Maven 3 (>= 3.9.10). With these prerequisites in place you can compile the source via: - mvn clean install + ./mvnw clean install ## Contribute diff --git a/mvnw b/mvnw new file mode 100755 index 00000000..5e9618ca --- /dev/null +++ b/mvnw @@ -0,0 +1,332 @@ +#!/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.3.2 +# +# 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." >&2 + 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." >&2 +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" >&2 + 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.3.2/maven-wrapper-3.3.2.jar" + else + wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.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." >&2 + echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties." >&2 + 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 --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..4136715f --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,206 @@ +@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.3.2 +@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. >&2 +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. >&2 +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. >&2 +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. >&2 +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.3.2/maven-wrapper-3.3.2.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.3.2/maven-wrapper-3.3.2.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 "&{"^ + "Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash;"^ + "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^ + "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^ + " Write-Error 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^ + " Write-Error 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^ + " Write-Error '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 --git a/pom.xml b/pom.xml index 730d6a30..0c4f1b64 100644 --- a/pom.xml +++ b/pom.xml @@ -85,14 +85,32 @@ UTF-8 - 2025-06-06T07:23:21Z + 2025-06-06T00:00:00Z + + 17 + + 21 + 3.9.10 + + 3.3.2 + 3.13.0 + 3.5.2 + 3.1.3 + 3.1.1 + 3.1.1 + 3.0 + 3.5.0 + + 7.11.0 + + false org.testng testng - 7.11.0 + ${version.testng} test @@ -103,18 +121,70 @@ src/main/xsd + + + + org.apache.maven.plugins + maven-wrapper-plugin + ${version.maven-wrapper-plugin} + + ${version.min.maven} + bin + + + + org.apache.felix + maven-bundle-plugin + 5.1.9 + + + org.apache.maven.plugins + maven-compiler-plugin + ${version.maven-compiler-plugin} + + + org.apache.maven.plugins + maven-surefire-plugin + ${version.maven-surefire-plugin} + + + org.apache.maven.plugins + maven-install-plugin + ${version.maven-install-plugin} + + + org.apache.maven.plugins + maven-release-plugin + ${version.maven-release-plugin} + + + org.apache.maven.plugins + maven-deploy-plugin + ${version.maven-deploy-plugin} + + + com.mycila + license-maven-plugin + ${version.license-maven-plugin} + + + org.apache.maven.plugins + maven-enforcer-plugin + ${version.enforcer.plugin} + + + org.apache.felix maven-bundle-plugin - 5.1.9 jakarta.validation.*;version="${project.version}", - - + + @@ -127,16 +197,12 @@ - org.apache.maven.plugins maven-compiler-plugin - 3.13.0 - 9 + ${version.java.release} + ${version.java.release} -Xlint:all @@ -144,18 +210,6 @@ true - - base-compile - - compile - - - 8 - - module-info.java - - - default-testCompile @@ -167,7 +221,6 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.2 1 true @@ -210,14 +263,14 @@ - 8 + ${version.java.release} false Jakarta Validation API Packages Jakarta Validation API ${project.version} Jakarta Validation API ${project.version} bean-validation-dev@eclipse.org.
-Copyright © 2019,2023 Eclipse Foundation.
+Copyright © 2019-{currentYear} Eclipse Foundation.
Use is subject to EFSL; this spec is based on material that is licensed under the Apache License, version 2.0.]]>
@@ -225,12 +278,10 @@ Use is subject to org.apache.maven.plugins maven-install-plugin - 3.1.3 org.apache.maven.plugins maven-release-plugin - 3.1.1 true true @@ -238,13 +289,12 @@ Use is subject to
+ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 com.mycila license-maven-plugin - 3.0
${project.basedir}/license/license.header
true @@ -272,6 +322,29 @@ Use is subject to
+ + org.apache.maven.plugins + maven-enforcer-plugin + + + enforce-java + + enforce + + + ${enforcer.skip} + + + [${version.min.java},) + + + ${version.min.maven} + + + + + +
@@ -282,6 +355,12 @@ Use is subject to true + + skip-checks + + true + + diff --git a/src/main/java/jakarta/validation/ConstraintDeclarationException.java b/src/main/java/jakarta/validation/ConstraintDeclarationException.java index 38a55963..2b75f9ce 100644 --- a/src/main/java/jakarta/validation/ConstraintDeclarationException.java +++ b/src/main/java/jakarta/validation/ConstraintDeclarationException.java @@ -6,6 +6,8 @@ */ package jakarta.validation; +import java.io.Serial; + /** * Exception raised if a constraint declaration is not legal. * @@ -13,6 +15,9 @@ */ public class ConstraintDeclarationException extends ValidationException { + @Serial + private static final long serialVersionUID = 1535558847569422150L; + public ConstraintDeclarationException(String message) { super( message ); } diff --git a/src/main/java/jakarta/validation/ConstraintDefinitionException.java b/src/main/java/jakarta/validation/ConstraintDefinitionException.java index b68a42ee..b2015125 100644 --- a/src/main/java/jakarta/validation/ConstraintDefinitionException.java +++ b/src/main/java/jakarta/validation/ConstraintDefinitionException.java @@ -6,6 +6,8 @@ */ package jakarta.validation; +import java.io.Serial; + /** * Exception raised if a constraint definition is not legal. * @@ -13,6 +15,9 @@ */ public class ConstraintDefinitionException extends ValidationException { + @Serial + private static final long serialVersionUID = 7844159745017246719L; + public ConstraintDefinitionException(String message) { super( message ); } diff --git a/src/main/java/jakarta/validation/ConstraintViolationException.java b/src/main/java/jakarta/validation/ConstraintViolationException.java index dc118e32..5013f7da 100644 --- a/src/main/java/jakarta/validation/ConstraintViolationException.java +++ b/src/main/java/jakarta/validation/ConstraintViolationException.java @@ -6,6 +6,7 @@ */ package jakarta.validation; +import java.io.Serial; import java.util.HashSet; import java.util.Set; import java.util.stream.Collectors; @@ -19,7 +20,10 @@ */ public class ConstraintViolationException extends ValidationException { - private final Set> constraintViolations; + @Serial + private static final long serialVersionUID = -5165623621635468818L; + + private final HashSet> constraintViolations; /** * Creates a constraint violation report. @@ -62,7 +66,7 @@ public Set> getConstraintViolations() { private static String toString(Set> constraintViolations) { return constraintViolations.stream() - .map( cv -> cv == null ? "null" : cv.getPropertyPath() + ": " + cv.getMessage() ) - .collect( Collectors.joining( ", " ) ); + .map( cv -> cv == null ? "null" : cv.getPropertyPath() + ": " + cv.getMessage() ) + .collect( Collectors.joining( ", " ) ); } } diff --git a/src/main/java/jakarta/validation/GroupDefinitionException.java b/src/main/java/jakarta/validation/GroupDefinitionException.java index 79f4aaa1..35833783 100644 --- a/src/main/java/jakarta/validation/GroupDefinitionException.java +++ b/src/main/java/jakarta/validation/GroupDefinitionException.java @@ -6,12 +6,18 @@ */ package jakarta.validation; +import java.io.Serial; + /** * Exception raised if a group definition is not legal. * * @author Emmanuel Bernard */ public class GroupDefinitionException extends ValidationException { + + @Serial + private static final long serialVersionUID = -5030363007840624015L; + public GroupDefinitionException(String message) { super( message ); } diff --git a/src/main/java/jakarta/validation/NoProviderFoundException.java b/src/main/java/jakarta/validation/NoProviderFoundException.java index df400ed3..7efb5e90 100644 --- a/src/main/java/jakarta/validation/NoProviderFoundException.java +++ b/src/main/java/jakarta/validation/NoProviderFoundException.java @@ -6,6 +6,8 @@ */ package jakarta.validation; +import java.io.Serial; + /** * Exception raised if no Jakarta Validation provider could be found. * @@ -15,6 +17,9 @@ */ public class NoProviderFoundException extends ValidationException { + @Serial + private static final long serialVersionUID = -2200340693485056605L; + public NoProviderFoundException() { super(); } diff --git a/src/main/java/jakarta/validation/UnexpectedTypeException.java b/src/main/java/jakarta/validation/UnexpectedTypeException.java index 0d2d1157..bb12f97e 100644 --- a/src/main/java/jakarta/validation/UnexpectedTypeException.java +++ b/src/main/java/jakarta/validation/UnexpectedTypeException.java @@ -6,6 +6,8 @@ */ package jakarta.validation; +import java.io.Serial; + /** * Exception raised in the case that the constraint validator resolution * cannot determine a suitable validator for a given type. @@ -13,6 +15,10 @@ * @author Hardy Ferentschik */ public class UnexpectedTypeException extends ConstraintDeclarationException { + + @Serial + private static final long serialVersionUID = 9142309406302395818L; + public UnexpectedTypeException(String message) { super( message ); } diff --git a/src/main/java/jakarta/validation/Validation.java b/src/main/java/jakarta/validation/Validation.java index 8b92a4d9..9823aa91 100755 --- a/src/main/java/jakarta/validation/Validation.java +++ b/src/main/java/jakarta/validation/Validation.java @@ -7,6 +7,7 @@ package jakarta.validation; import java.lang.ref.SoftReference; +import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -79,7 +80,10 @@ * @author Emmanuel Bernard * @author Hardy Ferentschik */ -public class Validation { +public final class Validation { + + private Validation() { + } /** * Builds and returns a {@link ValidatorFactory} instance based on the @@ -210,10 +214,10 @@ public T configure() { if ( resolver == null ) { try { - U provider = validationProviderClass.newInstance(); + U provider = validationProviderClass.getDeclaredConstructor().newInstance(); return provider.createSpecializedConfiguration( state ); } - catch (InstantiationException | IllegalAccessException | RuntimeException e) { + catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException | RuntimeException e) { throw new ValidationException( "Cannot instantiate provider type: " + validationProviderClass, e ); } } @@ -355,6 +359,7 @@ public List> getValidationProviders() { return validationProviderList; } + @SuppressWarnings("rawtypes") private List> loadProviders(ClassLoader classloader) { ServiceLoader loader = ServiceLoader.load( ValidationProvider.class, classloader ); Iterator providerIterator = loader.iterator(); diff --git a/src/main/java/jakarta/validation/ValidationException.java b/src/main/java/jakarta/validation/ValidationException.java index 7b49c485..8a8ab453 100755 --- a/src/main/java/jakarta/validation/ValidationException.java +++ b/src/main/java/jakarta/validation/ValidationException.java @@ -6,12 +6,18 @@ */ package jakarta.validation; +import java.io.Serial; + /** - * Base exception of all Jakarta Validation "unexpected" problems. + * Base exception for all Jakarta Validation "unexpected" problems. * * @author Emmanuel Bernard */ public class ValidationException extends RuntimeException { + + @Serial + private static final long serialVersionUID = 5969686610069774201L; + public ValidationException(String message) { super( message ); } diff --git a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java index c00c3cbe..ad5fd34c 100644 --- a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java +++ b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDeclarationException.java @@ -6,6 +6,8 @@ */ package jakarta.validation.valueextraction; +import java.io.Serial; + import jakarta.validation.ValidationException; /** @@ -19,6 +21,9 @@ */ public class ValueExtractorDeclarationException extends ValidationException { + @Serial + private static final long serialVersionUID = -5924252723850532703L; + public ValueExtractorDeclarationException() { super(); } diff --git a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java index 41643357..39f72f1b 100644 --- a/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java +++ b/src/main/java/jakarta/validation/valueextraction/ValueExtractorDefinitionException.java @@ -6,6 +6,8 @@ */ package jakarta.validation.valueextraction; +import java.io.Serial; + import jakarta.validation.ValidationException; /** @@ -18,6 +20,9 @@ */ public class ValueExtractorDefinitionException extends ValidationException { + @Serial + private static final long serialVersionUID = -9204048017454183194L; + public ValueExtractorDefinitionException() { super(); }