diff --git a/build.gradle b/build.gradle index df533c15..8580b77a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ plugins { - id "com.github.mxenabled.coppuccino" version "7.+" apply false - id "com.github.mxenabled.vogue" version "4.+" apply false + id "com.github.mxenabled.coppuccino" version "8.+" apply false + id "com.github.mxenabled.vogue" version "5.+" apply false id "idea" - id "io.freefair.lombok" version "8.+" apply false - id "io.github.gradle-nexus.publish-plugin" version "1.1.+" + id "io.freefair.lombok" version "9.5.0" apply false + id "io.github.gradle-nexus.publish-plugin" version "2.+" id "com.netflix.nebula.maven-resolved-dependencies" version "21.2.0" apply false } @@ -26,8 +26,8 @@ subprojects { version rootProject.version ext { - pathCoreVersion = "[7.0,8.0)" - springVersion = "3.5.14" + pathCoreVersion = "[8.0,9.0)" + springVersion = "4.1.0" } if (it.name != platformProject) { @@ -35,7 +35,10 @@ subprojects { apply plugin: "com.github.mxenabled.vogue" apply plugin: "groovy" apply plugin: "java-library" - apply plugin: "io.freefair.lombok" + //necessary to avoid collision with spring-boot-starter-parent + if (it.name != "mdx-web") { + apply plugin: "io.freefair.lombok" + } apply plugin: "com.netflix.nebula.maven-resolved-dependencies" java { @@ -66,6 +69,7 @@ subprojects { api platform("com.mx.path-core:platform:${project.ext.pathCoreVersion}") testImplementation "com.mx.path-core:testing" + testRuntimeOnly "org.junit.platform:junit-platform-launcher" } compileJava { options.compilerArgs << "-parameters" } @@ -170,6 +174,6 @@ tasks.named("dependencies") { } wrapper { - gradleVersion = "8.14.3" + gradleVersion = "9.5.1" distributionType = Wrapper.DistributionType.ALL } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55b..b1b8ef56 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7705927e..e74c8700 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-all.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 23d15a93..b9bb139f 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index 5eed7ee8..aa5f10b0 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,30 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/mdx-gateway-generator/gradle.lockfile b/mdx-gateway-generator/gradle.lockfile index 847f525c..99b84093 100644 --- a/mdx-gateway-generator/gradle.lockfile +++ b/mdx-gateway-generator/gradle.lockfile @@ -1,24 +1,17 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.auth0:java-jwt:4.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:7.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs:4.10.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,testAnnotationProcessor +com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs,testCompileClasspath +com.github.spotbugs:spotbugs:4.10.3=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -27,18 +20,16 @@ com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompi com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath -com.mx.path-core:common:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway-generator:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:7.0.1=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway-generator:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:javapoet:1.13.0=runtimeClasspath,testRuntimeClasspath com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.11.0=runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=runtimeClasspath,testRuntimeClasspath @@ -50,60 +41,67 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath net.bytebuddy:byte-buddy:1.18.3=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.9=spotbugs +net.sf.saxon:Saxon-HE:12.10=spotbugs org.apache.bcel:bcel:6.12.0=spotbugs org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.26.0=spotbugs -org.apache.logging.log4j:log4j-core:2.26.0=spotbugs +org.apache.logging.log4j:log4j-api:2.26.1=spotbugs +org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.7=testRuntimeClasspath org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath -org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt -org.jacoco:org.jacoco.core:0.8.13=jacocoAnt -org.jacoco:org.jacoco.report:0.8.13=jacocoAnt +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.0=spotbugs +org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor +org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs org.ow2.asm:asm-commons:9.10.1=spotbugs -org.ow2.asm:asm-commons:9.8=jacocoAnt +org.ow2.asm:asm-commons:9.9=jacocoAnt org.ow2.asm:asm-tree:9.10.1=spotbugs -org.ow2.asm:asm-tree:9.8=jacocoAnt +org.ow2.asm:asm-tree:9.9=jacocoAnt org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm:9.10.1=spotbugs -org.ow2.asm:asm:9.8=jacocoAnt -org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.ow2.asm:asm:9.9=jacocoAnt +org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-core:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.dataformat:jackson-dataformat-xml:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson:jackson-bom:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/mdx-gateways/gradle.lockfile b/mdx-gateways/gradle.lockfile index 4609254a..d6563591 100644 --- a/mdx-gateways/gradle.lockfile +++ b/mdx-gateways/gradle.lockfile @@ -1,55 +1,46 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.auth0:java-jwt:4.5.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.6.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-trace-api:1.38.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:7.1.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=annotationProcessor,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=annotationProcessor,runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=annotationProcessor,runtimeClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.2.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd com.github.rholder:guava-retrying:2.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs:4.10.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,testAnnotationProcessor +com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs,testCompileClasspath +com.github.spotbugs:spotbugs:4.10.3=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=pmd com.google.code.gson:gson:2.14.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.36.0=checkstyle com.google.errorprone:error_prone_annotations:2.41.0=pmd +com.google.errorprone:error_prone_annotations:2.47.0=checkstyle com.google.errorprone:error_prone_annotations:2.48.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.3=checkstyle com.google.guava:guava:32.1.3-jre=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.4.8-jre=checkstyle +com.google.guava:guava:33.6.0-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath -com.google.j2objc:j2objc-annotations:3.0.0=checkstyle -com.mx.path-core:common:7.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:7.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway-generator:7.0.1=annotationProcessor -com.mx.path-core:gateway:7.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:7.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:7.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:7.0.1=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:7.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +com.google.j2objc:j2objc-annotations:3.1=checkstyle +com.mx.path-core:common:8.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:8.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway-generator:8.0.0=annotationProcessor +com.mx.path-core:gateway:8.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:8.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:8.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:8.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.puppycrawl.tools:checkstyle:13.7.0=checkstyle com.squareup:javapoet:1.13.0=annotationProcessor com.sun.istack:istack-commons-runtime:4.1.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-core:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.11.0=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=checkstyle commons-codec:commons-codec:1.14=annotationProcessor,runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs commons-logging:commons-logging:1.3.5=annotationProcessor,runtimeClasspath,testRuntimeClasspath @@ -61,14 +52,14 @@ io.opentracing:opentracing-mock:0.33.0=testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath net.bytebuddy:byte-buddy:1.18.3=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle -net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs +net.sf.saxon:Saxon-HE:12.10=spotbugs +net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd net.sourceforge.pmd:pmd-ant:7.22.0=pmd net.sourceforge.pmd:pmd-core:7.22.0=pmd net.sourceforge.pmd:pmd-java:7.22.0=pmd @@ -79,15 +70,14 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle org.apache.commons:commons-lang3:3.20.0=annotationProcessor,compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.15.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.3=checkstyle -org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle +org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=checkstyle org.apache.httpcomponents:httpclient:4.5.14=annotationProcessor,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle org.apache.httpcomponents:httpcore:4.4.16=annotationProcessor,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.26.0=spotbugs -org.apache.logging.log4j:log4j-core:2.26.0=spotbugs +org.apache.logging.log4j:log4j-api:2.26.1=spotbugs +org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.maven.doxia:doxia-core:1.12.0=checkstyle org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle @@ -96,45 +86,45 @@ org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.7=testRuntimeClasspath org.checkerframework:checker-qual:3.37.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.49.3=checkstyle org.checkerframework:checker-qual:3.53.1=pmd -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle org.codehaus.plexus:plexus-utils:3.3.0=checkstyle -org.codehaus.woodstox:stax2-api:4.2.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.3.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.angus:angus-activation:2.0.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.6=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt -org.jacoco:org.jacoco.core:0.8.13=jacocoAnt -org.jacoco:org.jacoco.report:0.8.13=jacocoAnt +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javassist:javassist:3.28.0-GA=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=checkstyle -org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.0=spotbugs +org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor +org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs org.ow2.asm:asm-commons:9.10.1=spotbugs -org.ow2.asm:asm-commons:9.8=jacocoAnt +org.ow2.asm:asm-commons:9.9=jacocoAnt org.ow2.asm:asm-tree:9.10.1=spotbugs -org.ow2.asm:asm-tree:9.8=jacocoAnt +org.ow2.asm:asm-tree:9.9=jacocoAnt org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm:9.10.1=spotbugs -org.ow2.asm:asm:9.8=jacocoAnt +org.ow2.asm:asm:9.9=jacocoAnt org.ow2.asm:asm:9.9.1=pmd org.pcollections:pcollections:4.0.2=pmd -org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.36=pmd org.slf4j:slf4j-api:1.7.30=testCompileClasspath @@ -143,9 +133,13 @@ org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.2=checkstyle -org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs +org.slf4j:slf4j-simple:2.0.18=checkstyle +org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs org.yaml:snakeyaml:2.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-core:3.2.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.2.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.dataformat:jackson-dataformat-xml:3.2.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson:jackson-bom:3.2.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/mdx-models/build.gradle b/mdx-models/build.gradle index efc2401a..103a3418 100644 --- a/mdx-models/build.gradle +++ b/mdx-models/build.gradle @@ -6,8 +6,7 @@ coppuccino { dependencies { api "com.mx.path-core:gateway" - api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2" - api "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2" + api "tools.jackson.dataformat:jackson-dataformat-xml:[3.1.4,4.0.0)" implementation "commons-beanutils:commons-beanutils:1.11.0" } diff --git a/mdx-models/gradle.lockfile b/mdx-models/gradle.lockfile index fdabffcf..ad2cf3a0 100644 --- a/mdx-models/gradle.lockfile +++ b/mdx-models/gradle.lockfile @@ -1,53 +1,44 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.auth0:java-jwt:4.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:7.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs:4.10.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,testAnnotationProcessor +com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs,testCompileClasspath +com.github.spotbugs:spotbugs:4.10.3=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=pmd com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.36.0=checkstyle com.google.errorprone:error_prone_annotations:2.41.0=pmd +com.google.errorprone:error_prone_annotations:2.47.0=checkstyle com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.3=checkstyle com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.4.8-jre=checkstyle +com.google.guava:guava:33.6.0-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath -com.google.j2objc:j2objc-annotations:3.0.0=checkstyle -com.mx.path-core:common:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:7.0.1=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +com.google.j2objc:j2objc-annotations:3.1=checkstyle +com.mx.path-core:common:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.puppycrawl.tools:checkstyle:13.7.0=checkstyle com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.11.0=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=checkstyle commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs commons-logging:commons-logging:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -58,14 +49,14 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath net.bytebuddy:byte-buddy:1.18.3=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle -net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs +net.sf.saxon:Saxon-HE:12.10=spotbugs +net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd net.sourceforge.pmd:pmd-ant:7.22.0=pmd net.sourceforge.pmd:pmd-core:7.22.0=pmd net.sourceforge.pmd:pmd-java:7.22.0=pmd @@ -76,15 +67,14 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.3=checkstyle -org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle +org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=checkstyle org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle org.apache.httpcomponents:httpcore:4.4.16=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.26.0=spotbugs -org.apache.logging.log4j:log4j-core:2.26.0=spotbugs +org.apache.logging.log4j:log4j-api:2.26.1=spotbugs +org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.maven.doxia:doxia-core:1.12.0=checkstyle org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle @@ -93,54 +83,58 @@ org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.7=testRuntimeClasspath org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.49.3=checkstyle org.checkerframework:checker-qual:3.53.1=pmd -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle org.codehaus.plexus:plexus-utils:3.3.0=checkstyle -org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt -org.jacoco:org.jacoco.core:0.8.13=jacocoAnt -org.jacoco:org.jacoco.report:0.8.13=jacocoAnt +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=checkstyle -org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.0=spotbugs +org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor +org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs org.ow2.asm:asm-commons:9.10.1=spotbugs -org.ow2.asm:asm-commons:9.8=jacocoAnt +org.ow2.asm:asm-commons:9.9=jacocoAnt org.ow2.asm:asm-tree:9.10.1=spotbugs -org.ow2.asm:asm-tree:9.8=jacocoAnt +org.ow2.asm:asm-tree:9.9=jacocoAnt org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm:9.10.1=spotbugs -org.ow2.asm:asm:9.8=jacocoAnt +org.ow2.asm:asm:9.9=jacocoAnt org.ow2.asm:asm:9.9.1=pmd org.pcollections:pcollections:4.0.2=pmd -org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.36=pmd org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.2=checkstyle -org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs +org.slf4j:slf4j-simple:2.0.18=checkstyle +org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-core:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.dataformat:jackson-dataformat-xml:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson:jackson-bom:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/Resources.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/Resources.java index 2ddd5362..69902704 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/Resources.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/Resources.java @@ -2,7 +2,6 @@ import java.time.LocalDate; -import com.fasterxml.jackson.databind.module.SimpleModule; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.mx.path.model.mdx.model.account.Account; @@ -103,6 +102,8 @@ import com.mx.path.model.mdx.model.transfer.Transfer; import com.mx.path.model.mdx.model.transfer.TransferAmountOption; +import tools.jackson.databind.module.SimpleModule; + /** * Registration for all MDX resources *

diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializer.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializer.java index 00a890e8..78a528a5 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializer.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializer.java @@ -1,15 +1,15 @@ package com.mx.path.model.mdx.model.ondemand; -import java.io.IOException; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonPointer; -import com.fasterxml.jackson.core.TreeNode; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.ObjectMapper; import com.mx.path.core.common.model.ModelWrappable; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonParser; +import tools.jackson.core.JsonPointer; +import tools.jackson.core.TreeNode; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.ValueDeserializer; + /** * Custom deserializer for MDX OnDemand Resources *

@@ -17,7 +17,7 @@ * * @param */ -public class MdxOnDemandDeserializer> extends JsonDeserializer { +public class MdxOnDemandDeserializer> extends ValueDeserializer { private static final ObjectMapper MAPPER = new ObjectMapper(); private final String nodePath; @@ -32,7 +32,7 @@ public MdxOnDemandDeserializer(Class target, String nodePath) { @Override @SuppressWarnings("unchecked") - public final T deserialize(JsonParser p, DeserializationContext ctxt) throws IOException { + public final T deserialize(JsonParser p, DeserializationContext ctxt) throws JacksonException { TreeNode root = p.readValueAsTree(); TreeNode value = root.at(JsonPointer.compile(nodePath)); diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandLocalDateSerializer.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandLocalDateSerializer.java index a3e66800..fcbc9034 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandLocalDateSerializer.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandLocalDateSerializer.java @@ -1,12 +1,12 @@ package com.mx.path.model.mdx.model.ondemand; -import java.io.IOException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ser.std.StdSerializer; /** * Handles serialization of LocalDate for MDX OnDemand responses @@ -24,7 +24,7 @@ public MdxOnDemandLocalDateSerializer(Class t) { } @Override - public final void serialize(LocalDate value, JsonGenerator gen, SerializerProvider provider) throws IOException { + public final void serialize(LocalDate value, JsonGenerator gen, SerializationContext context) throws JacksonException { gen.writeString(FORMATTER.format(value)); } diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializer.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializer.java index 019dd16f..800356ef 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializer.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializer.java @@ -1,25 +1,28 @@ package com.mx.path.model.mdx.model.ondemand; -import java.io.IOException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.Arrays; import java.util.Objects; +import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.mx.path.model.mdx.model.MdxList; import com.mx.path.model.mdx.model.ondemand.mixins.MixinDefinition; import com.mx.path.model.mdx.model.ondemand.mixins.XmlSkipInternalAnnotationsIntrospector; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.PropertyNamingStrategies; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.SerializationFeature; +import tools.jackson.databind.ValueSerializer; +import tools.jackson.databind.ext.javatime.ser.LocalDateSerializer; +import tools.jackson.databind.module.SimpleModule; +import tools.jackson.dataformat.xml.XmlMapper; +import tools.jackson.dataformat.xml.ser.ToXmlGenerator; + /** * MdxList serializer for MDX OnDemand * @@ -27,7 +30,7 @@ * {@see https://github.com/FasterXML/jackson-docs/wiki/JacksonMixInAnnotations} */ @Deprecated -public class MdxOnDemandMdxListSerializer extends JsonSerializer { +public class MdxOnDemandMdxListSerializer extends ValueSerializer { private final ObjectMapper mapper; @@ -40,19 +43,16 @@ public class MdxOnDemandMdxListSerializer extends JsonSerializer public MdxOnDemandMdxListSerializer(MixinDefinition... mixinDefinitions) { super(); - this.mapper = new XmlMapper() + this.mapper = XmlMapper.builder() + .addMixIns( + Arrays.stream(mixinDefinitions) + .collect(Collectors.toMap(MixinDefinition::getTarget, MixinDefinition::getMixin))) + .addModule(new SimpleModule("CustomLocalDateModule").addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE))) + .annotationIntrospector(new XmlSkipInternalAnnotationsIntrospector()) + .changeDefaultPropertyInclusion(incl -> incl.withValueInclusion(JsonInclude.Include.NON_NULL)) .configure(SerializationFeature.WRAP_ROOT_VALUE, false) - .setAnnotationIntrospector(new XmlSkipInternalAnnotationsIntrospector()) - .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) - .enable(SerializationFeature.INDENT_OUTPUT) - .registerModule(new JavaTimeModule().addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE))) - .setSerializationInclusion(JsonInclude.Include.NON_NULL); - - for (MixinDefinition mixin : mixinDefinitions) { - if (mixin != null) { - mapper.addMixIn(mixin.getTarget(), mixin.getMixin()); - } - } + .propertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) + .build(); } /** @@ -62,11 +62,11 @@ public MdxOnDemandMdxListSerializer(MixinDefinition... mixinDefinitions) { * * @param value * @param gen - * @param serializers - * @throws IOException + * @param context + * @throws JacksonException */ @Override - public final void serialize(MdxListWrapper value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + public final void serialize(MdxListWrapper value, JsonGenerator gen, SerializationContext context) throws JacksonException { ToXmlGenerator generator = (ToXmlGenerator) gen; MdxList list = value.getList(); diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializer.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializer.java index 155f736a..d358d613 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializer.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializer.java @@ -1,31 +1,33 @@ package com.mx.path.model.mdx.model.ondemand; -import java.io.IOException; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.util.Arrays; +import java.util.stream.Collectors; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.PropertyNamingStrategies; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; -import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer; import com.mx.path.core.common.model.ModelWrappable; import com.mx.path.model.mdx.model.ondemand.mixins.MixinDefinition; import com.mx.path.model.mdx.model.ondemand.mixins.XmlSkipInternalAnnotationsIntrospector; +import tools.jackson.core.JacksonException; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.PropertyNamingStrategies; +import tools.jackson.databind.SerializationContext; +import tools.jackson.databind.ValueSerializer; +import tools.jackson.databind.ext.javatime.ser.LocalDateSerializer; +import tools.jackson.databind.module.SimpleModule; +import tools.jackson.dataformat.xml.XmlMapper; +import tools.jackson.dataformat.xml.ser.ToXmlGenerator; + /** * Object serializer for MDX OnDemand *

* Relies on Jackson Mix-ins to control details of serialization. For more information on Jackson Mix-ins see: * https://github.com/FasterXML/jackson-docs/wiki/JacksonMixInAnnotations */ -public class MdxOnDemandSerializer> extends JsonSerializer { +public class MdxOnDemandSerializer> extends ValueSerializer { private final ObjectMapper mapper; @@ -37,21 +39,19 @@ public class MdxOnDemandSerializer> extends JsonSeri @SuppressWarnings("unchecked") public MdxOnDemandSerializer(MixinDefinition... mixinDefinitions) { super(); - this.mapper = new XmlMapper() - .setAnnotationIntrospector(new XmlSkipInternalAnnotationsIntrospector()) - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) - .enable(SerializationFeature.INDENT_OUTPUT) - .registerModule(new JavaTimeModule().addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE))) - .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false); - for (MixinDefinition mixinDefinition : mixinDefinitions) { - this.mapper.addMixIn(mixinDefinition.getTarget(), mixinDefinition.getMixin()); - } + this.mapper = XmlMapper.builder() + .addMixIns(Arrays.stream(mixinDefinitions) + .collect(Collectors.toMap(MixinDefinition::getTarget, MixinDefinition::getMixin))) + .addModule(new SimpleModule("CustomLocalDateModule").addSerializer(LocalDate.class, new LocalDateSerializer(DateTimeFormatter.ISO_DATE))) + .annotationIntrospector(new XmlSkipInternalAnnotationsIntrospector()) + .changeDefaultPropertyInclusion(incl -> incl.withValueInclusion(JsonInclude.Include.NON_NULL)) + .propertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE) + .build(); } @Override - public final void serialize(T value, JsonGenerator gen, SerializerProvider serializers) throws IOException { + public final void serialize(T value, JsonGenerator gen, SerializationContext serializers) throws JacksonException { ToXmlGenerator generator = (ToXmlGenerator) gen; if (value.getWrapped()) { diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/AccountXmlMixin.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/AccountXmlMixin.java index 3629389f..7916e384 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/AccountXmlMixin.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/AccountXmlMixin.java @@ -4,9 +4,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonRootName; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.mx.path.model.mdx.model.ondemand.MdxOnDemandLocalDateSerializer; +import tools.jackson.databind.annotation.JsonSerialize; + @JsonRootName("account") public interface AccountXmlMixin { diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/OnDemandAccountsXmlMixin.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/OnDemandAccountsXmlMixin.java index 4d006d1b..7821d99b 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/OnDemandAccountsXmlMixin.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/OnDemandAccountsXmlMixin.java @@ -3,10 +3,11 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; import com.mx.path.model.mdx.model.MdxList; import com.mx.path.model.mdx.model.account.Account; +import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; + @JsonRootName("accounts") public interface OnDemandAccountsXmlMixin { @JacksonXmlElementWrapper(useWrapping = false) diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/TransactionsPageMixin.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/TransactionsPageMixin.java index 6a00797c..c8fa261c 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/TransactionsPageMixin.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/TransactionsPageMixin.java @@ -2,11 +2,12 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; -import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; import com.mx.path.model.mdx.model.MdxList; import com.mx.path.model.mdx.model.account.Transaction; +import tools.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import tools.jackson.dataformat.xml.annotation.JacksonXmlProperty; + public interface TransactionsPageMixin { @JacksonXmlProperty(isAttribute = true) diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/XmlSkipInternalAnnotationsIntrospector.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/XmlSkipInternalAnnotationsIntrospector.java index 5c40e949..408d3e22 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/XmlSkipInternalAnnotationsIntrospector.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/ondemand/mixins/XmlSkipInternalAnnotationsIntrospector.java @@ -1,15 +1,17 @@ package com.mx.path.model.mdx.model.ondemand.mixins; -import com.fasterxml.jackson.databind.introspect.AnnotatedMember; -import com.fasterxml.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector; import com.mx.path.core.common.model.Internal; +import tools.jackson.databind.cfg.MapperConfig; +import tools.jackson.databind.introspect.AnnotatedMember; +import tools.jackson.dataformat.xml.JacksonXmlAnnotationIntrospector; + /** * Skip rendering of Internal fields. */ public class XmlSkipInternalAnnotationsIntrospector extends JacksonXmlAnnotationIntrospector { @Override - public final boolean hasIgnoreMarker(AnnotatedMember m) { - return m.hasAnnotation(Internal.class) || super.hasIgnoreMarker(m); + public final boolean hasIgnoreMarker(MapperConfig config, AnnotatedMember m) { + return m.hasAnnotation(Internal.class) || super.hasIgnoreMarker(config, m); } } diff --git a/mdx-models/src/test/groovy/com/mx/path/extensions/StringStaticExtension.groovy b/mdx-models/src/test/groovy/com/mx/path/extensions/StringStaticExtension.groovy index 5f640c20..d7b63752 100644 --- a/mdx-models/src/test/groovy/com/mx/path/extensions/StringStaticExtension.groovy +++ b/mdx-models/src/test/groovy/com/mx/path/extensions/StringStaticExtension.groovy @@ -7,6 +7,6 @@ class StringStaticExtension { } static String sanitizeXml(final String self) { - self.replaceAll("\n","").replaceAll("\r","").replaceAll("\t","").replaceAll(">\\s+<", "") + self.replaceAll("\n","").replaceAll("\r","").replaceAll("\t","").replaceAll(">\\s+<", "><") } } diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ResourcesTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ResourcesTest.groovy index ba1f8b9d..f9ef022d 100644 --- a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ResourcesTest.groovy +++ b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ResourcesTest.groovy @@ -1,10 +1,11 @@ package com.mx.path.model.mdx.model -import com.fasterxml.jackson.databind.module.SimpleModule import com.google.gson.GsonBuilder import spock.lang.Specification +import tools.jackson.databind.module.SimpleModule + class ResourcesTest extends Specification { def "registerResources registers all Gson type adapters"() { given: diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializerTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializerTest.groovy index 875ebda5..23f5c9bc 100644 --- a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializerTest.groovy +++ b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandDeserializerTest.groovy @@ -1,11 +1,12 @@ package com.mx.path.model.mdx.model.ondemand -import com.fasterxml.jackson.core.JsonParser -import com.fasterxml.jackson.dataformat.xml.XmlMapper import com.mx.path.model.mdx.model.account.Account import spock.lang.Specification +import tools.jackson.core.JsonParser +import tools.jackson.dataformat.xml.XmlMapper + class MdxOnDemandDeserializerTest extends Specification { MdxOnDemandDeserializer subject void setup() { @@ -15,7 +16,7 @@ class MdxOnDemandDeserializerTest extends Specification { def "deserializes"() { given: XmlMapper mapper = new XmlMapper() - JsonParser parser = mapper.getFactory().createParser("0.09A-123Checking") + JsonParser parser = mapper.createParser("0.09A-123Checking") when: def account = subject.deserialize(parser, null) diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializerTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializerTest.groovy index 00d9efb5..de34bbe0 100644 --- a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializerTest.groovy +++ b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandMdxListSerializerTest.groovy @@ -2,22 +2,20 @@ package com.mx.path.model.mdx.model.ondemand import static com.mx.path.extensions.StringStaticExtension.sanitizeXml -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.dataformat.xml.XmlFactory -import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator import com.mx.path.model.mdx.model.MdxList import com.mx.path.model.mdx.model.account.Account import com.mx.path.model.mdx.model.account.Transaction import com.mx.path.model.mdx.model.ondemand.mixins.AccountXmlMixin import com.mx.path.model.mdx.model.ondemand.mixins.MixinDefinition -import com.mx.path.testing.WithMockery +import com.mx.path.testing.MockeryAndSessionRepository -import spock.lang.Specification +import tools.jackson.core.JsonGenerator +import tools.jackson.databind.SerializationContext +import tools.jackson.dataformat.xml.XmlFactory -class MdxOnDemandMdxListSerializerTest extends Specification implements WithMockery { +class MdxOnDemandMdxListSerializerTest extends MockeryAndSessionRepository { MdxOnDemandMdxListSerializer subject - ToXmlGenerator generator + JsonGenerator generator StringWriter stringWriter void setup() { @@ -32,7 +30,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock def list = new MdxListWrapper(null, transactions) when: - subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(list, generator, (SerializationContext) null) generator.flush() then: @@ -50,7 +48,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock def list = new MdxListWrapper(null, transactions) when: - subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(list, generator, (SerializationContext) null) generator.flush() then: @@ -70,7 +68,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock def list = new MdxListWrapper("transactions", transactions) when: - subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(list, generator, (SerializationContext) null) generator.flush() then: @@ -83,7 +81,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock def list = new MdxListWrapper("transactions", transactions) when: - subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(list, generator, (SerializationContext) null) generator.flush() then: @@ -110,7 +108,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock def list = new MdxListWrapper("transactions", transactions.wrapped()) when: - subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(list, generator, (SerializationContext) null) generator.flush() then: @@ -154,7 +152,7 @@ class MdxOnDemandMdxListSerializerTest extends Specification implements WithMock def list = new MdxListWrapper("accounts", transactions.wrapped()) when: - subject.serialize(list, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(list, generator, (SerializationContext) null) then: def expectedResponse= "\n" + diff --git a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializerTest.groovy b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializerTest.groovy index e5a3fe20..423951e8 100644 --- a/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializerTest.groovy +++ b/mdx-models/src/test/groovy/com/mx/path/model/mdx/model/ondemand/MdxOnDemandSerializerTest.groovy @@ -4,10 +4,6 @@ import static com.mx.path.extensions.StringStaticExtension.sanitizeXml import java.time.LocalDate -import com.fasterxml.jackson.core.JsonGenerator -import com.fasterxml.jackson.databind.SerializerProvider -import com.fasterxml.jackson.dataformat.xml.XmlFactory -import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator import com.mx.path.model.mdx.model.MdxList import com.mx.path.model.mdx.model.account.Account import com.mx.path.model.mdx.model.account.OnDemandAccounts @@ -19,6 +15,11 @@ import com.mx.path.testing.WithMockery import spock.lang.Specification +import tools.jackson.core.JsonGenerator +import tools.jackson.databind.SerializationContext +import tools.jackson.dataformat.xml.XmlFactory +import tools.jackson.dataformat.xml.ser.ToXmlGenerator + class MdxOnDemandSerializerTest extends Specification implements WithMockery { MdxOnDemandSerializer subject ToXmlGenerator generator @@ -45,7 +46,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { } when: - subject.serialize(account, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(account, (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: @@ -69,7 +70,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { } when: - subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: @@ -98,7 +99,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { } when: - subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: @@ -139,7 +140,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { def onDemandAccounts = new OnDemandAccounts(accounts) when: - subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: @@ -173,7 +174,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { def onDemandAccounts = new OnDemandAccounts(accounts) when: - subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(onDemandAccounts.wrapped(), (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: @@ -191,7 +192,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { } when: - subject.serialize(transaction, (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(transaction, (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: @@ -214,7 +215,7 @@ class MdxOnDemandSerializerTest extends Specification implements WithMockery { when: print("BALANCE: "+account.balance) - subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializerProvider) null) + subject.serialize(account.wrapped(), (JsonGenerator) generator, (SerializationContext) null) generator.flush() then: diff --git a/mdx-web/build.gradle b/mdx-web/build.gradle index f955f8e4..1a671230 100644 --- a/mdx-web/build.gradle +++ b/mdx-web/build.gradle @@ -4,9 +4,24 @@ coppuccino { } } +configurations.configureEach { + resolutionStrategy { + // Downgrade spring-boot-starter-parent 4 groovy transitive dependency because gradle 9 does not support groovy 5 + // Upgrade to Gradle 10 to remove this + force 'org.apache.groovy:groovy:4.0.29' + } +} + dependencies { + //necessary to avoid class conflict with lombok imported from spring-boot-starter-parent + compileOnly "org.projectlombok:lombok:[1.18,2.0)" + annotationProcessor "org.projectlombok:lombok:[1.18,2.0)" + testCompileOnly "org.projectlombok:lombok:[1.18,2.0)" + testAnnotationProcessor "org.projectlombok:lombok:[1.18,2.0)" + api platform("org.springframework.boot:spring-boot-starter-parent:${project.ext.springVersion}") - api "org.springframework.boot:spring-boot-starter-web" + + api "org.springframework.boot:spring-boot-starter-webmvc" api project(":mdx-gateways") diff --git a/mdx-web/gradle.lockfile b/mdx-web/gradle.lockfile index 9349233b..a739cc8a 100644 --- a/mdx-web/gradle.lockfile +++ b/mdx-web/gradle.lockfile @@ -1,85 +1,74 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -ch.qos.logback:logback-classic:1.5.32=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.5.32=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.auth0:java-jwt:4.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +biz.aQute.bnd:biz.aQute.bnd.annotation:7.1.0=compileClasspath,testCompileClasspath +ch.qos.logback:logback-classic:1.5.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.5.34=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,testCompileClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:7.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs:4.10.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath +com.github.spotbugs:spotbugs-annotations:4.10.3=spotbugs +com.github.spotbugs:spotbugs:4.10.3=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=compileClasspath,pmd,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.14.0=spotbugs -com.google.errorprone:error_prone_annotations:2.36.0=checkstyle com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,pmd,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=checkstyle com.google.errorprone:error_prone_annotations:2.48.0=spotbugs com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.3=checkstyle com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.4.8-jre=checkstyle +com.google.guava:guava:33.6.0-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath -com.google.j2objc:j2objc-annotations:3.0.0=checkstyle -com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:common:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:7.0.1=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +com.google.j2objc:j2objc-annotations:3.1=checkstyle +com.jayway.jsonpath:json-path:2.10.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.puppycrawl.tools:checkstyle:13.7.0=checkstyle com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.vaadin.external.google:android-json:0.0.20131108.vaadin1=testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.11.0=checkstyle,runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle -commons-codec:commons-codec:1.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=checkstyle +commons-codec:commons-codec:1.21.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=checkstyle,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -commons-logging:commons-logging:1.3.5=runtimeClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.3.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath info.picocli:picocli:4.7.7=checkstyle io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath -io.micrometer:micrometer-commons:1.15.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.15.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.17.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-mock:0.33.0=testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:2.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:3.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -net.bytebuddy:byte-buddy-agent:1.17.8=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.3=testCompileClasspath,testRuntimeClasspath -net.minidev:accessors-smart:2.5.2=testCompileClasspath,testRuntimeClasspath -net.minidev:json-smart:2.5.2=testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle -net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs +net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.minidev:accessors-smart:2.6.0=testCompileClasspath,testRuntimeClasspath +net.minidev:json-smart:2.6.0=testCompileClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:12.10=spotbugs +net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd net.sourceforge.pmd:pmd-ant:7.22.0=pmd net.sourceforge.pmd:pmd-core:7.22.0=pmd net.sourceforge.pmd:pmd-java:7.22.0=pmd @@ -90,32 +79,29 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.3=checkstyle -org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle +org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=checkstyle org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle org.apache.httpcomponents:httpcore:4.4.16=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.24.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.26.0=spotbugs -org.apache.logging.log4j:log4j-core:2.26.0=spotbugs -org.apache.logging.log4j:log4j-to-slf4j:2.24.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.25.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.26.1=spotbugs +org.apache.logging.log4j:log4j-core:2.26.1=spotbugs +org.apache.logging.log4j:log4j-to-slf4j:2.25.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.maven.doxia:doxia-core:1.12.0=checkstyle org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle -org.apache.tomcat.embed:tomcat-embed-core:10.1.54=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:10.1.54=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.54=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:11.0.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:11.0.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:11.0.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.7=testCompileClasspath,testRuntimeClasspath -org.awaitility:awaitility:4.2.2=testCompileClasspath,testRuntimeClasspath +org.awaitility:awaitility:4.3.0=testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.49.3=checkstyle org.checkerframework:checker-qual:3.53.1=pmd -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle @@ -123,73 +109,87 @@ org.codehaus.plexus:plexus-utils:3.3.0=checkstyle org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt -org.jacoco:org.jacoco.core:0.8.13=jacocoAnt -org.jacoco:org.jacoco.report:0.8.13=jacocoAnt +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath -org.jspecify:jspecify:1.0.0=checkstyle -org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath -org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.0=spotbugs -org.mockito:mockito-core:5.17.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:5.17.0=testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:6.0.3=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:6.0.3=testRuntimeClasspath +org.junit:junit-bom:6.0.3=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor +org.junit:junit-bom:6.1.2=spotbugs +org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath +org.osgi:org.osgi.annotation.bundle:2.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.annotation.versioning:1.1.2=compileClasspath,testCompileClasspath +org.osgi:org.osgi.resource:1.0.0=compileClasspath,testCompileClasspath +org.osgi:org.osgi.service.serviceloader:1.0.0=compileClasspath,testCompileClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs org.ow2.asm:asm-commons:9.10.1=spotbugs -org.ow2.asm:asm-commons:9.8=jacocoAnt +org.ow2.asm:asm-commons:9.9=jacocoAnt org.ow2.asm:asm-tree:9.10.1=spotbugs -org.ow2.asm:asm-tree:9.8=jacocoAnt +org.ow2.asm:asm-tree:9.9=jacocoAnt org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm:9.10.1=spotbugs org.ow2.asm:asm:9.7.1=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.8=jacocoAnt +org.ow2.asm:asm:9.9=jacocoAnt org.ow2.asm:asm:9.9.1=pmd org.pcollections:pcollections:4.0.2=pmd -org.projectlombok:lombok:1.18.42=annotationProcessor,lombok,testAnnotationProcessor -org.projectlombok:lombok:1.18.46=compileClasspath,testCompileClasspath +org.projectlombok:lombok:1.18.46=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.skyscreamer:jsonassert:1.5.3=testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.36=pmd -org.slf4j:jul-to-slf4j:2.0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=compileClasspath,runtimeClasspath,spotbugsSlf4j,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.18=spotbugs +org.slf4j:jul-to-slf4j:2.0.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j +org.slf4j:slf4j-api:2.0.18=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-parent:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:3.5.14=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:3.5.14=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:3.5.14=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:3.5.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-test:6.2.18=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-web:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-webmvc:6.2.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.2=checkstyle -org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs -org.xmlunit:xmlunit-core:2.10.4=testCompileClasspath,testRuntimeClasspath -org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-simple:2.0.18=checkstyle +org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-http-converter:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-jackson:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-servlet:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-jackson:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-parent:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:4.1.0=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat-runtime:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-webmvc:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:4.1.0=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-test:4.1.0=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-tomcat:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-web-server:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-webmvc:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot:4.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aop:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-beans:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-context:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-core:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-expression:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-test:7.0.8=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-web:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-webmvc:7.0.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs +org.xmlunit:xmlunit-core:2.11.0=testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-core:3.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.dataformat:jackson-dataformat-xml:3.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson:jackson-bom:3.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurer.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurer.java index 0f7c996a..2f42f442 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurer.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurer.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.stream.Collectors; -import com.fasterxml.jackson.databind.module.SimpleModule; import com.mx.path.model.mdx.model.Resources; import org.springframework.context.annotation.Configuration; @@ -12,10 +11,13 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.StringHttpMessageConverter; import org.springframework.http.converter.json.GsonHttpMessageConverter; -import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; -import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter; +import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import tools.jackson.databind.SerializationFeature; +import tools.jackson.databind.module.SimpleModule; +import tools.jackson.dataformat.xml.XmlMapper; + @Configuration public class MdxOnDemandSerializationWebMvcConfigurer implements WebMvcConfigurer { /** @@ -31,16 +33,15 @@ public class MdxOnDemandSerializationWebMvcConfigurer implements WebMvcConfigure @Override public final void configureMessageConverters(List> converters) { - // Get rid of unused converters // These get in the way of the other List> toRemove = converters.stream().filter(t -> !CONVERT_CLASSES.contains(t.getClass())).collect(Collectors.toCollection(ArrayList::new)); converters.removeAll(toRemove); // XML - converters.add(new MappingJackson2XmlHttpMessageConverter(Jackson2ObjectMapperBuilder - .xml() - .modules(payloadModule()) + converters.add(new JacksonXmlHttpMessageConverter(XmlMapper.builder() + .addModule(payloadModule()) + .enable(SerializationFeature.INDENT_OUTPUT) .build())); } diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializationConfiguration.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializationConfiguration.java index b211f4ba..4d100a64 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializationConfiguration.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializationConfiguration.java @@ -1,20 +1,32 @@ package com.mx.path.model.mdx.web; +import java.util.List; + import com.google.gson.Gson; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.GsonHttpMessageConverter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @SuppressWarnings("checkstyle:designforextension") -public class MdxSerializationConfiguration { +public class MdxSerializationConfiguration implements WebMvcConfigurer { public MdxSerializerFactoryBean gsonBeanFactory() { MdxSerializerFactoryBean factory = new MdxSerializerFactoryBean(); return factory; } @Bean - public Gson gson() throws Exception { + public Gson gson() { return gsonBeanFactory().getObject(); } + + @Override + public void configureMessageConverters(List> converters) { + GsonHttpMessageConverter gsonConverter = new GsonHttpMessageConverter(); + gsonConverter.setGson(gson()); + converters.add(gsonConverter); + } } diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializerFactoryBean.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializerFactoryBean.java index b25d0512..929c8c02 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializerFactoryBean.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/MdxSerializerFactoryBean.java @@ -12,7 +12,7 @@ public MdxSerializerFactoryBean() { } @Override - public final Gson getObject() throws Exception { + public final Gson getObject() { GsonBuilder baseGson = new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES) .setDateFormat("YYYY-MM-dd").setPrettyPrinting(); diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/BaseController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/BaseController.java index 81e881c9..cb2063cd 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/BaseController.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/BaseController.java @@ -94,7 +94,9 @@ public final MultiValueMap createMultiMapForResponse(Map multiValueMapHttpHeaders = new LinkedMultiValueMap<>(); + httpHeaders.forEach(multiValueMapHttpHeaders::addAll); + headerMap.addAll(multiValueMapHttpHeaders); return headerMap; } diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilter.java index 004c74b1..c960395b 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilter.java @@ -59,7 +59,7 @@ protected final void doFilterInternal(HttpServletRequest request, HttpServletRes ContentCachingResponseWrapper responseWrapper; try { - requestWrapper = new ContentCachingRequestWrapper(request); + requestWrapper = new ContentCachingRequestWrapper(request, 0); responseWrapper = new ContentCachingResponseWrapper(response); } catch (Exception ex) { MDC.put("exception", LoggingExceptionFormatter.formatLoggingExceptionWithStacktrace(ex)); diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurerTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurerTest.groovy index c977889a..36c4f66f 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurerTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/MdxOnDemandSerializationWebMvcConfigurerTest.groovy @@ -1,16 +1,16 @@ package com.mx.path.model.mdx.web -import com.fasterxml.jackson.databind.module.SimpleModule - import org.springframework.http.converter.ByteArrayHttpMessageConverter import org.springframework.http.converter.FormHttpMessageConverter import org.springframework.http.converter.ResourceHttpMessageConverter import org.springframework.http.converter.StringHttpMessageConverter import org.springframework.http.converter.json.GsonHttpMessageConverter -import org.springframework.http.converter.xml.MappingJackson2XmlHttpMessageConverter +import org.springframework.http.converter.xml.JacksonXmlHttpMessageConverter import spock.lang.Specification +import tools.jackson.databind.module.SimpleModule + class MdxOnDemandSerializationWebMvcConfigurerTest extends Specification { MdxOnDemandSerializationWebMvcConfigurer subject @@ -46,7 +46,7 @@ class MdxOnDemandSerializationWebMvcConfigurerTest extends Specification { it.contains(byteArrayConverter) !it.contains(unwantedResourceConverter) !it.contains(unwantedFormConverter) - it.last() instanceof MappingJackson2XmlHttpMessageConverter + it.last() instanceof JacksonXmlHttpMessageConverter } } diff --git a/realtime/gradle.lockfile b/realtime/gradle.lockfile index 0c77da78..42dec38f 100644 --- a/realtime/gradle.lockfile +++ b/realtime/gradle.lockfile @@ -1,54 +1,45 @@ # This is a Gradle generated file for dependency locking. # Manual edits can break the build and are not advised. # This file is expected to be part of source control. -com.auth0:java-jwt:4.5.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.auth0:java-jwt:4.6.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-core:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.2=compileClasspath,testCompileClasspath -com.fasterxml.jackson:jackson-bom:2.21.3=runtimeClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:7.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath,testRuntimeClasspath +com.fasterxml.woodstox:woodstox-core:7.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,testAnnotationProcessor -com.github.spotbugs:spotbugs:4.10.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.2=annotationProcessor,testAnnotationProcessor +com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs,testCompileClasspath +com.github.spotbugs:spotbugs:4.10.3=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.13.2=pmd com.google.code.gson:gson:2.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.36.0=checkstyle com.google.errorprone:error_prone_annotations:2.41.0=pmd +com.google.errorprone:error_prone_annotations:2.47.0=checkstyle com.google.errorprone:error_prone_annotations:2.48.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.3=checkstyle com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:33.4.8-jre=checkstyle +com.google.guava:guava:33.6.0-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath -com.google.j2objc:j2objc-annotations:3.0.0=checkstyle -com.mx.path-core:common:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:http:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:7.0.1=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:7.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +com.google.j2objc:j2objc-annotations:3.1=checkstyle +com.mx.path-core:common:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:http:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:8.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:8.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.puppycrawl.tools:checkstyle:13.7.0=checkstyle com.sun.istack:istack-commons-runtime:4.1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-beanutils:commons-beanutils:1.11.0=checkstyle,runtimeClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=checkstyle commons-codec:commons-codec:1.14=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs commons-logging:commons-logging:1.3.5=runtimeClasspath,testRuntimeClasspath @@ -59,14 +50,14 @@ io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,testComp io.opentracing:opentracing-noop:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:2.1.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs net.bytebuddy:byte-buddy-agent:1.17.7=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.17.7=testCompileClasspath net.bytebuddy:byte-buddy:1.18.3=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle -net.sf.saxon:Saxon-HE:12.9=pmd,spotbugs +net.sf.saxon:Saxon-HE:12.10=spotbugs +net.sf.saxon:Saxon-HE:12.9=checkstyle,pmd net.sourceforge.pmd:pmd-ant:7.22.0=pmd net.sourceforge.pmd:pmd-core:7.22.0=pmd net.sourceforge.pmd:pmd-java:7.22.0=pmd @@ -77,15 +68,14 @@ org.apache.commons:commons-lang3:3.18.0=checkstyle org.apache.commons:commons-lang3:3.20.0=compileClasspath,pmd,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-text:1.3=checkstyle -org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle -org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle +org.apache.groovy:groovy-bom:4.0.29=testCompileClasspath,testRuntimeClasspath +org.apache.groovy:groovy:4.0.29=testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=checkstyle org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle org.apache.httpcomponents:httpcore:4.4.16=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.26.0=spotbugs -org.apache.logging.log4j:log4j-core:2.26.0=spotbugs +org.apache.logging.log4j:log4j-api:2.26.1=spotbugs +org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.maven.doxia:doxia-core:1.12.0=checkstyle org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle @@ -94,54 +84,58 @@ org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.7=testRuntimeClasspath org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:3.49.3=checkstyle org.checkerframework:checker-qual:3.53.1=pmd -org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle org.codehaus.plexus:plexus-container-default:2.1.0=checkstyle org.codehaus.plexus:plexus-utils:3.3.0=checkstyle -org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs org.eclipse.angus:angus-activation:2.0.3=runtimeClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath -org.jacoco:org.jacoco.agent:0.8.13=jacocoAgent,jacocoAnt -org.jacoco:org.jacoco.ant:0.8.13=jacocoAnt -org.jacoco:org.jacoco.core:0.8.13=jacocoAnt -org.jacoco:org.jacoco.report:0.8.13=jacocoAnt +org.jacoco:org.jacoco.agent:0.8.14=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.14=jacocoAnt +org.jacoco:org.jacoco.core:0.8.14=jacocoAnt +org.jacoco:org.jacoco.report:0.8.14=jacocoAnt org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath org.jspecify:jspecify:1.0.0=checkstyle -org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.0=annotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.0=spotbugs +org.junit.jupiter:junit-jupiter-api:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath +org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:6.1.0=annotationProcessor,testAnnotationProcessor +org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:5.23.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs org.ow2.asm:asm-commons:9.10.1=spotbugs -org.ow2.asm:asm-commons:9.8=jacocoAnt +org.ow2.asm:asm-commons:9.9=jacocoAnt org.ow2.asm:asm-tree:9.10.1=spotbugs -org.ow2.asm:asm-tree:9.8=jacocoAnt +org.ow2.asm:asm-tree:9.9=jacocoAnt org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm:9.10.1=spotbugs -org.ow2.asm:asm:9.8=jacocoAnt +org.ow2.asm:asm:9.9=jacocoAnt org.ow2.asm:asm:9.9.1=pmd org.pcollections:pcollections:4.0.2=pmd -org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.projectlombok:lombok:1.18.44=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.36=pmd org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.2=checkstyle -org.xmlresolver:xmlresolver:5.3.3=pmd,spotbugs +org.slf4j:slf4j-simple:2.0.18=checkstyle +org.spockframework:spock-bom:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-4.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=checkstyle,pmd,spotbugs org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-core:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.core:jackson-databind:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson.dataformat:jackson-dataformat-xml:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +tools.jackson:jackson-bom:3.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeMembersConnectionTest.groovy b/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeMembersConnectionTest.groovy index c20ff453..7cc13929 100644 --- a/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeMembersConnectionTest.groovy +++ b/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeMembersConnectionTest.groovy @@ -79,11 +79,11 @@ class MdxRealtimeMembersConnectionTest extends Mockery { expectConnection(withPath("/clientId/users/userId/members.json") .withMatcher { request -> return request.body == "{\n" + - " \"member\": {\n" + - " \"id\": \"memberId\",\n" + - " \"userkey\": \"userKey\"\n" + - " }\n" + - "}" + " \"member\": {\n" + + " \"id\": \"memberId\",\n" + + " \"userkey\": \"userKey\"\n" + + " }\n" + + "}" } ) .toRespond { request, response -> @@ -107,12 +107,12 @@ class MdxRealtimeMembersConnectionTest extends Mockery { expectConnection(withPath("/clientId/users/userId/members.json") .withMatcher { request -> return request.body == "{\n" + - " \"member\": {\n" + - " \"id\": \"memberId\",\n" + - " \"login\": \"login\",\n" + - " \"password\": \"abc\"\n" + - " }\n" + - "}" + " \"member\": {\n" + + " \"id\": \"memberId\",\n" + + " \"login\": \"login\",\n" + + " \"password\": \"abc\"\n" + + " }\n" + + "}" } ) .toRespond { request, response -> @@ -154,11 +154,11 @@ class MdxRealtimeMembersConnectionTest extends Mockery { expectConnection(withPath("/clientId/users/userId/members/memberId.json") .withMatcher { request -> return request.body == "{\n" + - " \"member\": {\n" + - " \"id\": \"memberId\",\n" + - " \"userkey\": \"newUserKey\"\n" + - " }\n" + - "}" + " \"member\": {\n" + + " \"id\": \"memberId\",\n" + + " \"userkey\": \"newUserKey\"\n" + + " }\n" + + "}" } ) .toRespond { request, response -> diff --git a/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeUsersConnectionTest.groovy b/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeUsersConnectionTest.groovy index dc0cfb4b..1d98024c 100644 --- a/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeUsersConnectionTest.groovy +++ b/realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeUsersConnectionTest.groovy @@ -78,14 +78,14 @@ class MdxRealtimeUsersConnectionTest extends Mockery { expectConnection(withPath("/clientId/users.json") .withMatcher {req -> return req.body == "{\n" + - " \"user\": {\n" + - " \"id\": \"userId\",\n" + - " \"email\": \"email\",\n" + - " \"first_name\": \"firstName\",\n" + - " \"last_name\": \"lastName\",\n" + - " \"phone\": \"phone\"\n" + - " }\n" + - "}" + " \"user\": {\n" + + " \"id\": \"userId\",\n" + + " \"email\": \"email\",\n" + + " \"first_name\": \"firstName\",\n" + + " \"last_name\": \"lastName\",\n" + + " \"phone\": \"phone\"\n" + + " }\n" + + "}" }) .toRespond { request, response -> response.withStatus(HttpStatus.OK)