diff --git a/build.gradle b/build.gradle index ada58403..62496a38 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id "idea" - id "com.github.mxenabled.coppuccino" version "4.4.2" apply false - id "com.github.mxenabled.vogue" version "1.1.0" + id "com.github.mxenabled.coppuccino" version "5.+" apply false + id "com.github.mxenabled.vogue" version "2.+" id "io.freefair.lombok" version "8.+" apply false id "io.github.gradle-nexus.publish-plugin" version "1.1.+" id "com.netflix.nebula.maven-resolved-dependencies" version "21.2.0" apply false @@ -39,8 +39,8 @@ allprojects { } ext { - pathSDKVersion = "4.7.0" - springVersion = "2.7.18" + pathSDKVersion = "[5.0,6.0)" + springVersion = "3.5.8" } } @@ -56,7 +56,7 @@ subprojects { dependencies { api platform("com.mx.path-core:platform:${project.ext.pathSDKVersion}") - testImplementation "org.mockito:mockito-inline:[4.0,5.0)" + testImplementation "org.mockito:mockito-inline:[5.0,6.0)" testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0" } @@ -64,13 +64,6 @@ subprojects { compileJava { options.compilerArgs << "-parameters" } - sourceSets { - test { - groovy { srcDirs "src/test/groovy" } - java { srcDirs "src/test/java" } - } - } - javadoc { classpath = configurations.compileClasspath options { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b1624c47..c7d437bb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mdx-gateway-generator/gradle.lockfile b/mdx-gateway-generator/gradle.lockfile index 6de40d20..3b70a7d7 100644 --- a/mdx-gateway-generator/gradle.lockfile +++ b/mdx-gateway-generator/gradle.lockfile @@ -18,27 +18,24 @@ com.google.auto.service:auto-service-annotations:1.1.1=runtimeClasspath,testRunt com.google.auto.service:auto-service:1.1.1=runtimeClasspath,testRuntimeClasspath com.google.auto:auto-common:1.2.1=runtimeClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.code.gson:gson:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.18.0=runtimeClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,testCompileClasspath -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.guava:guava:32.0.1-jre=runtimeClasspath,testRuntimeClasspath com.google.guava:guava:32.1.3-jre=compileClasspath,testCompileClasspath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.j2objc:j2objc-annotations:2.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:common:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway-generator:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway-generator:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup:javapoet:1.13.0=runtimeClasspath,testRuntimeClasspath -com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,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.11=runtimeClasspath,testRuntimeClasspath commons-collections:commons-collections:3.2.2=runtimeClasspath,testRuntimeClasspath @@ -50,17 +47,18 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,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:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=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.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.9=spotbugs org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.2=spotbugs @@ -71,8 +69,10 @@ org.checkerframework:checker-qual:3.37.0=compileClasspath,testCompileClasspath org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath org.codehaus.woodstox:stax2-api:4.2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt @@ -85,8 +85,8 @@ org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath org.junit:junit-bom:5.12.2=testCompileClasspath org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath -org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt @@ -107,5 +107,5 @@ 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.3.3=spotbugs -org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/mdx-gateways/gradle.lockfile b/mdx-gateways/gradle.lockfile index f84d61db..98762548 100644 --- a/mdx-gateways/gradle.lockfile +++ b/mdx-gateways/gradle.lockfile @@ -2,7 +2,6 @@ # 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.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.48=pmd com.datadoghq:dd-trace-api:1.38.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.15.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -11,6 +10,7 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.4=annotationProcess com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:6.5.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.9.8=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.9.8=spotbugs @@ -19,13 +19,11 @@ com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor com.google.auto.service:auto-service:1.1.1=annotationProcessor com.google.auto:auto-common:1.2.1=annotationProcessor com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.code.gson:gson:2.8.9=pmd -com.google.code.gson:gson:2.9.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor -com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.1=pmd +com.google.code.gson:gson:2.13.2=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=spotbugs +com.google.errorprone:error_prone_annotations:2.38.0=pmd +com.google.errorprone:error_prone_annotations:2.41.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.0.1-jre=annotationProcessor @@ -34,21 +32,21 @@ com.google.guava:guava:33.4.8-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=annotationProcessor,compileClasspath,testCompileClasspath com.google.j2objc:j2objc-annotations:3.0.0=checkstyle -com.mx.path-core:common:4.7.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:4.7.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway-generator:4.7.0=annotationProcessor -com.mx.path-core:gateway:4.7.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:4.7.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:4.7.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:4.7.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:5.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:5.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway-generator:5.0.0=annotationProcessor +com.mx.path-core:gateway:5.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:5.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:5.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:5.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.25.0=checkstyle com.squareup:javapoet:1.13.0=annotationProcessor -com.sun.activation:jakarta.activation:1.2.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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=annotationProcessor,runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle +commons-codec:commons-codec:1.15=checkstyle,pmd commons-collections:commons-collections:3.2.2=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=annotationProcessor,runtimeClasspath,testRuntimeClasspath @@ -60,28 +58,30 @@ io.opentracing:opentracing-api:0.33.0=annotationProcessor,compileClasspath,runti 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:1.2.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=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.soap:jakarta.xml.soap-api:3.0.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle +net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath +net.sf.saxon:Saxon-HE:12.5=checkstyle,pmd net.sf.saxon:Saxon-HE:12.9=spotbugs -net.sourceforge.pmd:pmd-core:6.55.0=pmd -net.sourceforge.pmd:pmd-java:6.55.0=pmd -net.sourceforge.saxon:saxon:9.1.0.8=pmd +net.sourceforge.pmd:pmd-ant:7.16.0=pmd +net.sourceforge.pmd:pmd-core:7.16.0=pmd +net.sourceforge.pmd:pmd-java:7.16.0=pmd org.antlr:antlr4-runtime:4.13.2=checkstyle -org.antlr:antlr4-runtime:4.7.2=pmd +org.antlr:antlr4-runtime:4.9.3=pmd org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.18.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.18.0=pmd org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd -org.apache.commons:commons-text:1.14.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.8.1=checkstyle +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.commons:commons-text:1.15.0=annotationProcessor,compileClasspath,runtimeClasspath,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.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle,pmd org.apache.httpcomponents:httpclient:4.5.13=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=annotationProcessor,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle @@ -96,6 +96,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.checkerframework:checker-qual:3.33.0=annotationProcessor org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.49.3=checkstyle +org.checkerframework:checker-qual:3.49.5=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 @@ -103,8 +104,10 @@ 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.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.9=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt @@ -118,8 +121,8 @@ org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath org.junit:junit-bom:5.12.2=testCompileClasspath org.junit:junit-bom:5.14.0=annotationProcessor,runtimeClasspath,spotbugs,testRuntimeClasspath -org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-inline:5.2.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.2=jacocoAnt @@ -130,10 +133,12 @@ org.ow2.asm:asm-tree:9.2=jacocoAnt org.ow2.asm:asm-tree:9.9=spotbugs org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.2=jacocoAnt -org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.8=pmd org.ow2.asm:asm:9.9=spotbugs +org.pcollections:pcollections:4.0.2=pmd org.projectlombok:lombok:1.18.42=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 org.slf4j:slf4j-api:1.7.32=annotationProcessor,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j @@ -141,7 +146,7 @@ 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.2.2=checkstyle,pmd org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:1.33=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/mdx-models/gradle.lockfile b/mdx-models/gradle.lockfile index 4da285a1..0f280b35 100644 --- a/mdx-models/gradle.lockfile +++ b/mdx-models/gradle.lockfile @@ -2,7 +2,6 @@ # 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.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.48=pmd com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -11,17 +10,17 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.4=compileClasspath, com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:6.5.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.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.code.gson:gson:2.8.9=pmd -com.google.code.gson:gson:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.1=pmd +com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=checkstyle -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.38.0=pmd +com.google.errorprone:error_prone_annotations:2.41.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 @@ -29,20 +28,20 @@ com.google.guava:guava:33.4.8-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:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:4.7.0=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:5.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.25.0=checkstyle -com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,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=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle +commons-codec:commons-codec:1.15=checkstyle,pmd commons-collections:commons-collections:3.2.2=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath @@ -53,29 +52,31 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,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:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=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.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath +net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath net.bytebuddy:byte-buddy:1.17.7=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle +net.sf.saxon:Saxon-HE:12.5=checkstyle,pmd net.sf.saxon:Saxon-HE:12.9=spotbugs -net.sourceforge.pmd:pmd-core:6.55.0=pmd -net.sourceforge.pmd:pmd-java:6.55.0=pmd -net.sourceforge.saxon:saxon:9.1.0.8=pmd +net.sourceforge.pmd:pmd-ant:7.16.0=pmd +net.sourceforge.pmd:pmd-core:7.16.0=pmd +net.sourceforge.pmd:pmd-java:7.16.0=pmd org.antlr:antlr4-runtime:4.13.2=checkstyle -org.antlr:antlr4-runtime:4.7.2=pmd +org.antlr:antlr4-runtime:4.9.3=pmd org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.18.0=pmd org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.8.1=checkstyle +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,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.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle,pmd org.apache.httpcomponents:httpclient:4.5.13=checkstyle,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle @@ -90,6 +91,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.6=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.49.5=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 @@ -97,8 +99,10 @@ 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.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt @@ -113,8 +117,8 @@ org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath org.junit:junit-bom:5.12.2=testCompileClasspath org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath -org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt @@ -125,16 +129,18 @@ org.ow2.asm:asm-tree:9.2=jacocoAnt org.ow2.asm:asm-tree:9.9=spotbugs org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.2=jacocoAnt -org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.8=pmd org.ow2.asm:asm:9.9=spotbugs +org.pcollections:pcollections:4.0.2=pmd org.projectlombok:lombok:1.18.42=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=spotbugs,spotbugsSlf4j 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.2.2=checkstyle,pmd org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Account.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Account.java index 50397dbe..91e50784 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Account.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Account.java @@ -3,14 +3,14 @@ import java.math.BigDecimal; import java.time.LocalDate; -import javax.xml.bind.annotation.XmlElement; - import com.google.gson.annotations.SerializedName; import com.mx.path.core.common.model.Internal; import com.mx.path.model.mdx.model.MdxBase; import com.mx.path.model.mdx.model.MdxList; import com.mx.path.model.mdx.model.challenges.Challenge; +import jakarta.xml.bind.annotation.XmlElement; + @SuppressWarnings("PMD.CyclomaticComplexity") public class Account extends MdxBase { @XmlElement(name = "available_balance") diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Transaction.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Transaction.java index da2cf999..19f50195 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Transaction.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/account/Transaction.java @@ -3,10 +3,10 @@ import java.math.BigDecimal; import java.time.LocalDate; -import javax.xml.bind.annotation.XmlElement; - import com.mx.path.model.mdx.model.MdxBase; +import jakarta.xml.bind.annotation.XmlElement; + /** * Represents an MDX transaction. XmlElements assigned so that it can be demarshalled from MDXv5 XML. */ diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/Dispute.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/Dispute.java index 306b33e0..ee9dd542 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/Dispute.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/Dispute.java @@ -1,9 +1,9 @@ package com.mx.path.model.mdx.model.dispute; -import javax.xml.bind.annotation.XmlElement; - import com.mx.path.model.mdx.model.MdxBase; +import jakarta.xml.bind.annotation.XmlElement; + /** * Represents an MDX dispute. XmlElements assigned so that it can be demarshalled from MDXv5 XML. */ diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/DisputedTransaction.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/DisputedTransaction.java index 7f31562f..d9b340af 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/DisputedTransaction.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/dispute/DisputedTransaction.java @@ -1,9 +1,9 @@ package com.mx.path.model.mdx.model.dispute; -import javax.xml.bind.annotation.XmlElement; - import com.mx.path.model.mdx.model.MdxBase; +import jakarta.xml.bind.annotation.XmlElement; + /** * Represents an MDX disputed transaction. XmlElements assigned so that it can be demarshalled from MDXv5 XML. */ diff --git a/mdx-models/src/main/java/com/mx/path/model/mdx/model/payment/PayeeCategory.java b/mdx-models/src/main/java/com/mx/path/model/mdx/model/payment/PayeeCategory.java index 46665c82..a81292a1 100644 --- a/mdx-models/src/main/java/com/mx/path/model/mdx/model/payment/PayeeCategory.java +++ b/mdx-models/src/main/java/com/mx/path/model/mdx/model/payment/PayeeCategory.java @@ -1,11 +1,11 @@ package com.mx.path.model.mdx.model.payment; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; - import com.mx.path.model.mdx.model.MdxBase; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; + @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) public class PayeeCategory extends MdxBase { diff --git a/mdx-web/build.gradle b/mdx-web/build.gradle index 459b5c01..3deee366 100644 --- a/mdx-web/build.gradle +++ b/mdx-web/build.gradle @@ -16,6 +16,6 @@ dependencies { testImplementation "com.mx.path-core:testing" testImplementation "io.opentracing:opentracing-mock:0.33.0" testImplementation "org.springframework.boot:spring-boot-starter-test" - testImplementation "org.mockito:mockito-inline:[4.0,5.0)" + testImplementation "org.mockito:mockito-inline:[5.0,6.0)" testRuntimeOnly "org.junit.platform:junit-platform-launcher" } diff --git a/mdx-web/gradle.lockfile b/mdx-web/gradle.lockfile index 69532bdb..5081838a 100644 --- a/mdx-web/gradle.lockfile +++ b/mdx-web/gradle.lockfile @@ -1,31 +1,30 @@ # 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.2.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.5.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.5.21=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.auth0:java-jwt:4.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.48=pmd com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.woodstox:woodstox-core:6.5.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.19.4=compileClasspath,runtimeClasspath,testCompileClasspath,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.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.code.gson:gson:2.8.9=pmd -com.google.code.gson:gson:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.1=pmd +com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=checkstyle -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.38.0=pmd +com.google.errorprone:error_prone_annotations:2.41.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 @@ -33,21 +32,22 @@ com.google.guava:guava:33.4.8-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.7.0=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:common:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:4.7.0=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.jayway.jsonpath:json-path:2.9.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:5.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.25.0=checkstyle -com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,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 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,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.15=checkstyle,pmd +commons-codec:commons-codec:1.18.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.20.0=spotbugs @@ -56,64 +56,71 @@ commons-logging:commons-logging:1.3.5=runtimeClasspath,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.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.15.6=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:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=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.xml.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.23=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.23=testCompileClasspath,testRuntimeClasspath -net.minidev:accessors-smart:2.4.11=testCompileClasspath,testRuntimeClasspath -net.minidev:json-smart:2.4.11=testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle +net.bytebuddy:byte-buddy-agent:1.17.8=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.17.8=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,pmd net.sf.saxon:Saxon-HE:12.9=spotbugs -net.sourceforge.pmd:pmd-core:6.55.0=pmd -net.sourceforge.pmd:pmd-java:6.55.0=pmd -net.sourceforge.saxon:saxon:9.1.0.8=pmd +net.sourceforge.pmd:pmd-ant:7.16.0=pmd +net.sourceforge.pmd:pmd-core:7.16.0=pmd +net.sourceforge.pmd:pmd-java:7.16.0=pmd org.antlr:antlr4-runtime:4.13.2=checkstyle -org.antlr:antlr4-runtime:4.7.2=pmd +org.antlr:antlr4-runtime:4.9.3=pmd org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.18.0=pmd org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.8.1=checkstyle +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,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.httpcomponents:httpclient:4.5.13=checkstyle -org.apache.httpcomponents:httpclient:4.5.14=runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle,pmd +org.apache.httpcomponents:httpclient:4.5.13=checkstyle,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.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.25.2=spotbugs org.apache.logging.log4j:log4j-core:2.25.2=spotbugs -org.apache.logging.log4j:log4j-to-slf4j:2.17.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.3=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:9.0.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:9.0.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.49=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:10.1.49=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.49=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.22.0=testCompileClasspath,testRuntimeClasspath +org.assertj:assertj-core:3.27.6=testCompileClasspath,testRuntimeClasspath +org.awaitility:awaitility:4.2.2=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.49.5=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.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.woodstox:stax2-api:4.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt @@ -135,9 +142,9 @@ org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath org.junit:junit-bom:5.12.2=testCompileClasspath org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath -org.mockito:mockito-core:4.5.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-inline:4.5.1=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-junit-jupiter:4.5.1=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.17.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:5.17.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt @@ -148,40 +155,41 @@ org.ow2.asm:asm-tree:9.2=jacocoAnt org.ow2.asm:asm-tree:9.9=spotbugs org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.2=jacocoAnt -org.ow2.asm:asm:9.3=testCompileClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.7.1=testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.8=pmd org.ow2.asm:asm:9.9=spotbugs +org.pcollections:pcollections:4.0.2=pmd org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath -org.skyscreamer:jsonassert:1.5.1=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j +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,spotbugs,spotbugsSlf4j,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:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-parent:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:2.7.18=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:2.7.18=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:2.7.18=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:2.7.18=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-jcl:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-test:5.3.31=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-web:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework:spring-webmvc:5.3.31=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.2=checkstyle +org.springframework.boot:spring-boot-autoconfigure:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-parent:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:3.5.8=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:3.5.8=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-test:3.5.8=testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot:3.5.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-aop:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-beans:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-context:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-core:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-expression:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-jcl:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-test:6.2.14=testCompileClasspath,testRuntimeClasspath +org.springframework:spring-web:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-webmvc:6.2.14=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.2.2=checkstyle,pmd org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath -org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xmlunit:xmlunit-core:2.10.4=testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/DateVersionedResponse.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/DateVersionedResponse.java index 004685dc..8d0666d5 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/DateVersionedResponse.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/DateVersionedResponse.java @@ -13,8 +13,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; - import lombok.Builder; import lombok.Data; @@ -30,6 +28,8 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; +import jakarta.servlet.http.HttpServletRequest; + /** * Use in Controller to provide multiple code paths, based on provided version header. *

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 55f8faf2..b211f4ba 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 @@ -8,7 +8,6 @@ @Configuration @SuppressWarnings("checkstyle:designforextension") public class MdxSerializationConfiguration { - @Bean(name = "gson") public MdxSerializerFactoryBean gsonBeanFactory() { MdxSerializerFactoryBean factory = new MdxSerializerFactoryBean(); return factory; diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AccountsController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AccountsController.java index b8412c28..10af077a 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AccountsController.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AccountsController.java @@ -1,7 +1,5 @@ package com.mx.path.model.mdx.web.controller; -import javax.servlet.http.HttpSession; - import com.mx.path.gateway.accessor.AccessorResponse; import com.mx.path.model.mdx.model.MdxList; import com.mx.path.model.mdx.model.account.Account; @@ -23,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpSession; + @RestController @RequestMapping(value = "{clientId}", produces = BaseController.MDX_MEDIA) public class AccountsController extends BaseController { diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AuthenticationController.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AuthenticationController.java index e3c31fea..61466a87 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AuthenticationController.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/controller/AuthenticationController.java @@ -3,8 +3,6 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; -import javax.servlet.http.HttpServletRequest; - import com.google.common.hash.Hashing; import com.mx.path.core.common.accessor.BadRequestException; import com.mx.path.core.common.lang.Strings; @@ -28,6 +26,8 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import jakarta.servlet.http.HttpServletRequest; + @RestController @RequestMapping(value = "{clientId}", produces = BaseController.MDX_MEDIA) public class AuthenticationController extends BaseController { 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 612ee7f2..81e881c9 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 @@ -3,8 +3,6 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import com.mx.path.core.common.accessor.PathResponseStatus; import com.mx.path.core.common.lang.Strings; import com.mx.path.core.context.RequestContext; @@ -18,6 +16,8 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; +import jakarta.servlet.http.HttpServletRequest; + @Service public class BaseController { // NO INSTANCE VARIABLES! Controllers are Singletons diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/CustomServletInputStream.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/CustomServletInputStream.java index 46f35b2a..a6ee89c2 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/CustomServletInputStream.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/CustomServletInputStream.java @@ -3,8 +3,8 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; /** * Wraps request input stream to allow multiple reads diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandler.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandler.java index eb28e2b6..fbc66153 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandler.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandler.java @@ -5,9 +5,6 @@ import java.time.ZoneOffset; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import com.google.gson.JsonObject; @@ -26,6 +23,9 @@ import org.springframework.core.env.Environment; import org.springframework.stereotype.Component; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Component class ErrorHandler { private static final Logger LOGGER = LoggerFactory.getLogger(ErrorHandler.class); diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandlerFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandlerFilter.java index f42a6857..3522806a 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandlerFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ErrorHandlerFilter.java @@ -2,15 +2,15 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Error handler filter */ diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ExceptionFormatter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ExceptionFormatter.java index 7d2cdc63..97386095 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ExceptionFormatter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ExceptionFormatter.java @@ -1,13 +1,13 @@ package com.mx.path.model.mdx.web.filter; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.core.common.accessor.PathResponseStatus; import com.mx.path.core.common.exception.PathRequestException; import com.mx.path.core.common.exception.PathRequestExceptionWrapper; import com.mx.path.core.common.http.HttpStatus; import com.mx.path.core.common.lang.Strings; +import jakarta.servlet.http.HttpServletResponse; + /** * */ diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/GatewayFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/GatewayFilter.java index 929b87cb..a4037f75 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/GatewayFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/GatewayFilter.java @@ -6,11 +6,6 @@ import java.util.function.Predicate; import java.util.regex.Pattern; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.model.mdx.web.PathTools; import com.mx.path.model.mdx.web.SpringMdxGatewayManager; import com.mx.path.model.mdx.web.controller.BaseController; @@ -19,6 +14,11 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Sets gateway instance for controllers */ diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/HMACFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/HMACFilter.java index 07fc8b80..192e2c38 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/HMACFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/HMACFilter.java @@ -6,11 +6,6 @@ import java.util.function.Predicate; import java.util.regex.Pattern; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.core.common.accessor.ResourceNotFoundException; import com.mx.path.model.mdx.web.PathTools; import com.mx.path.model.mdx.web.filter.hmac.HMACConfiguration; @@ -22,6 +17,11 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @Component @Order(FilterOrderSequence.HMAC_FILTER) public class HMACFilter extends OncePerRequestFilter { diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/MultiReadHttpServletRequest.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/MultiReadHttpServletRequest.java index 9327d820..058bd64c 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/MultiReadHttpServletRequest.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/MultiReadHttpServletRequest.java @@ -5,12 +5,12 @@ import java.io.IOException; import java.io.InputStreamReader; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; - import org.apache.commons.io.IOUtils; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; + /** * Wraps HttpServletRequest and allows the contents to be read multiple times. */ diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestContextFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestContextFilter.java index c5847285..a437917a 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestContextFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/PathRequestContextFilter.java @@ -4,11 +4,6 @@ import java.util.Collections; import java.util.Enumeration; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.core.common.lang.Strings; import com.mx.path.core.context.RequestContext; import com.mx.path.core.context.ResponseContext; @@ -17,6 +12,11 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Request context filter *

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 6e480ccb..004c74b1 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 @@ -8,11 +8,6 @@ import java.util.Map; import java.util.UUID; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -29,6 +24,11 @@ import org.springframework.web.util.ContentCachingRequestWrapper; import org.springframework.web.util.ContentCachingResponseWrapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Request logging filter *

diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilter.java index b501f6f2..dc0342d7 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilter.java @@ -2,11 +2,6 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.core.common.accessor.UnauthorizedException; import com.mx.path.core.common.lang.Strings; import com.mx.path.core.context.Session; @@ -19,6 +14,11 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Require Authentication Filter * diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/SessionFilter.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/SessionFilter.java index 2a118f12..5c14b421 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/SessionFilter.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/SessionFilter.java @@ -2,11 +2,6 @@ import java.io.IOException; -import javax.servlet.FilterChain; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.core.common.lang.Strings; import com.mx.path.core.context.Session; import com.mx.path.core.utility.jwt.JWTUtility; @@ -16,6 +11,11 @@ import org.springframework.stereotype.Component; import org.springframework.web.filter.OncePerRequestFilter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + /** * Session Filter *

diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ValidationExceptionHandler.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ValidationExceptionHandler.java index d9e876a2..4f3646b1 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ValidationExceptionHandler.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/ValidationExceptionHandler.java @@ -3,9 +3,6 @@ import java.io.IOException; import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.mx.path.core.common.accessor.RequestValidationException; import com.mx.path.model.mdx.web.EnvironmentHelper; @@ -16,6 +13,9 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestControllerAdvice; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + @RestControllerAdvice public class ValidationExceptionHandler { @Autowired diff --git a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/WebExceptionContext.java b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/WebExceptionContext.java index fe57066f..2a56330c 100644 --- a/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/WebExceptionContext.java +++ b/mdx-web/src/main/java/com/mx/path/model/mdx/web/filter/WebExceptionContext.java @@ -6,8 +6,6 @@ import java.util.LinkedHashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import com.mx.path.core.common.collection.MultiValueMap; import com.mx.path.core.common.exception.ExceptionContext; import com.mx.path.core.context.RequestContext; @@ -18,6 +16,8 @@ import io.opentracing.util.GlobalTracer; +import jakarta.servlet.http.HttpServletRequest; + class WebExceptionContext implements ExceptionContext { private final Map context = new LinkedHashMap<>(); diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/DateVersionedResponseTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/DateVersionedResponseTest.groovy index e246e865..e6efe315 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/DateVersionedResponseTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/DateVersionedResponseTest.groovy @@ -3,8 +3,6 @@ package com.mx.path.model.mdx.web import static org.mockito.Mockito.mock import static org.mockito.Mockito.when -import javax.servlet.http.HttpServletRequest - import com.google.gson.Gson import com.google.gson.GsonBuilder import com.mx.path.core.common.accessor.PathResponseStatus @@ -20,6 +18,8 @@ import org.springframework.http.ResponseEntity import spock.lang.Specification import spock.lang.Unroll +import jakarta.servlet.http.HttpServletRequest + class DateVersionedResponseTest extends Specification implements WithMockery { Gson gson diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/AuthenticationControllerTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/AuthenticationControllerTest.groovy index 57a58a2a..655f082e 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/AuthenticationControllerTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/controller/AuthenticationControllerTest.groovy @@ -11,8 +11,6 @@ import static org.mockito.Mockito.when import java.nio.charset.StandardCharsets -import javax.servlet.http.HttpServletRequest - import com.google.common.hash.Hashing import com.google.gson.Gson import com.google.gson.GsonBuilder @@ -51,6 +49,8 @@ import org.springframework.http.ResponseEntity import spock.lang.Specification +import jakarta.servlet.http.HttpServletRequest + class AuthenticationControllerTest extends Specification implements WithMockery { Authentication authentication com.mx.path.model.mdx.model.id.v20240213.Authentication authentication20240213 diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/ErrorHandlerFilterTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/ErrorHandlerFilterTest.groovy index 20b6f81b..5fa1349a 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/ErrorHandlerFilterTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/ErrorHandlerFilterTest.groovy @@ -1,10 +1,5 @@ package com.mx.path.model.mdx.web.filter -import javax.servlet.FilterChain -import javax.servlet.ServletOutputStream -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - import com.mx.path.core.common.accessor.PathResponseStatus import com.mx.path.core.common.accessor.RequestValidationException import com.mx.path.core.context.RequestContext @@ -12,13 +7,17 @@ import com.mx.path.core.context.ResponseContext import spock.lang.Specification +import jakarta.servlet.FilterChain +import jakarta.servlet.ServletOutputStream +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse + class ErrorHandlerFilterTest extends Specification { FilterChain filterChain HttpServletRequest request HttpServletResponse response ErrorHandlerFilter subject ServletOutputStream outputStream - String clientId = "client-123" ErrorHandler errorHandler String responseBody diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/HMACFilterTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/HMACFilterTest.groovy index 8701b714..a5e2b0d4 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/HMACFilterTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/HMACFilterTest.groovy @@ -1,9 +1,5 @@ package com.mx.path.model.mdx.web.filter -import javax.servlet.FilterChain -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - import com.mx.path.core.common.accessor.ResourceNotFoundException import com.mx.path.core.context.Session import com.mx.path.core.context.store.SessionRepository @@ -12,6 +8,10 @@ import com.mx.path.model.mdx.web.filter.hmac.HMACConfigurationFactory import spock.lang.Specification +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse + class HMACFilterTest extends Specification { FilterChain filterChain diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestContextFilterTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestContextFilterTest.groovy index e9acbb1a..d96f23ee 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestContextFilterTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestContextFilterTest.groovy @@ -1,15 +1,15 @@ package com.mx.path.model.mdx.web.filter -import javax.servlet.FilterChain -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - import com.mx.path.core.context.RequestContext import com.mx.path.core.context.ResponseContext import com.mx.path.core.context.store.SessionRepository import spock.lang.Specification +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse + class PathRequestContextFilterTest extends Specification { FilterChain filterChain HttpServletRequest request @@ -18,7 +18,6 @@ class PathRequestContextFilterTest extends Specification { PathRequestContextFilter subject RequestContext requestContext - ResponseContext responseContext def setup() { filterChain = Mock() diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilterTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilterTest.groovy index 99cc50eb..8b71f156 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilterTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/PathRequestLoggingFilterTest.groovy @@ -1,18 +1,15 @@ package com.mx.path.model.mdx.web.filter +import static org.mockito.ArgumentMatchers.any import static org.mockito.ArgumentMatchers.anyLong -import static org.mockito.Mockito.* import static org.mockito.Mockito.mock +import static org.mockito.Mockito.never +import static org.mockito.Mockito.spy import static org.mockito.Mockito.verify import static org.mockito.Mockito.when -import javax.servlet.FilterChain -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - import com.mx.path.core.context.RequestContext -import org.mockito.Mockito import org.slf4j.Logger import org.slf4j.MDC import org.springframework.web.util.ContentCachingRequestWrapper @@ -21,6 +18,10 @@ import org.springframework.web.util.ContentCachingResponseWrapper import spock.lang.Specification import spock.lang.Unroll +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse + class PathRequestLoggingFilterTest extends Specification { HttpServletRequest request HttpServletResponse response diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilterTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilterTest.groovy index c7cbe0b7..91090f82 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilterTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/RequireAuthenticationFilterTest.groovy @@ -1,15 +1,15 @@ package com.mx.path.model.mdx.web.filter -import javax.servlet.FilterChain -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - import com.mx.path.core.common.accessor.UnauthorizedException import com.mx.path.core.context.Session import com.mx.path.core.context.store.SessionRepository import spock.lang.Specification +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse + class RequireAuthenticationFilterTest extends Specification { FilterChain filterChain HttpServletRequest request diff --git a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/SessionFilterTest.groovy b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/SessionFilterTest.groovy index bdcd86df..06f17813 100644 --- a/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/SessionFilterTest.groovy +++ b/mdx-web/src/test/groovy/com/mx/path/model/mdx/web/filter/SessionFilterTest.groovy @@ -1,15 +1,15 @@ package com.mx.path.model.mdx.web.filter -import javax.servlet.FilterChain -import javax.servlet.http.HttpServletRequest -import javax.servlet.http.HttpServletResponse - import com.mx.path.core.context.RequestContext import com.mx.path.core.context.Session import com.mx.path.core.context.store.SessionRepository import spock.lang.Specification +import jakarta.servlet.FilterChain +import jakarta.servlet.http.HttpServletRequest +import jakarta.servlet.http.HttpServletResponse + class SessionFilterTest extends Specification { FilterChain filterChain HttpServletRequest request diff --git a/realtime/gradle.lockfile b/realtime/gradle.lockfile index fdfa2544..1a2f8b37 100644 --- a/realtime/gradle.lockfile +++ b/realtime/gradle.lockfile @@ -2,7 +2,6 @@ # 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.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.beust:jcommander:1.48=pmd com.datadoghq:dd-trace-api:1.38.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -11,17 +10,17 @@ com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.4=compileClasspath, com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.woodstox:woodstox-core:6.5.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.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.github.spotbugs:spotbugs:4.9.8=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.13.2=spotbugs -com.google.code.gson:gson:2.8.9=pmd -com.google.code.gson:gson:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.gson:gson:2.13.1=pmd +com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=checkstyle -com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.errorprone:error_prone_annotations:2.38.0=pmd +com.google.errorprone:error_prone_annotations:2.41.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 @@ -29,21 +28,21 @@ com.google.guava:guava:33.4.8-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:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:context:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:gateway:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:http:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:messaging:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:platform:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.mx.path-core:testing:4.7.0=testCompileClasspath,testRuntimeClasspath -com.mx.path-core:utilities:4.7.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:common:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:context:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:gateway:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:http:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:messaging:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:platform:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.mx.path-core:testing:5.0.0=testCompileClasspath,testRuntimeClasspath +com.mx.path-core:utilities:5.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.puppycrawl.tools:checkstyle:10.25.0=checkstyle -com.sun.activation:jakarta.activation:1.2.2=runtimeClasspath,testRuntimeClasspath -com.sun.istack:istack-commons-runtime:3.0.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,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=checkstyle,runtimeClasspath,testRuntimeClasspath commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=checkstyle +commons-codec:commons-codec:1.15=checkstyle,pmd commons-collections:commons-collections:3.2.2=checkstyle,runtimeClasspath,testRuntimeClasspath commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath @@ -54,29 +53,31 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.opentracing:opentracing-api:0.33.0=compileClasspath,runtimeClasspath,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:1.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=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.soap:jakarta.xml.soap-api:3.0.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.0=spotbugs -net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath +net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath net.bytebuddy:byte-buddy:1.17.7=testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.5=checkstyle +net.sf.saxon:Saxon-HE:12.5=checkstyle,pmd net.sf.saxon:Saxon-HE:12.9=spotbugs -net.sourceforge.pmd:pmd-core:6.55.0=pmd -net.sourceforge.pmd:pmd-java:6.55.0=pmd -net.sourceforge.saxon:saxon:9.1.0.8=pmd +net.sourceforge.pmd:pmd-ant:7.16.0=pmd +net.sourceforge.pmd:pmd-core:7.16.0=pmd +net.sourceforge.pmd:pmd-java:7.16.0=pmd org.antlr:antlr4-runtime:4.13.2=checkstyle -org.antlr:antlr4-runtime:4.7.2=pmd +org.antlr:antlr4-runtime:4.9.3=pmd org.apache.bcel:bcel:6.11.0=spotbugs -org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.18.0=pmd org.apache.commons:commons-lang3:3.19.0=spotbugs -org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.8.1=checkstyle +org.apache.commons:commons-text:1.14.0=spotbugs +org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,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.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd +org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle,pmd org.apache.httpcomponents:httpclient:4.5.13=checkstyle,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.14=checkstyle @@ -91,6 +92,7 @@ org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.27.6=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.49.5=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 @@ -98,8 +100,10 @@ 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.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.9=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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.hamcrest:hamcrest:3.0=testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt @@ -114,8 +118,8 @@ org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath org.junit:junit-bom:5.12.2=testCompileClasspath org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath -org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath -org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt @@ -126,16 +130,18 @@ org.ow2.asm:asm-tree:9.2=jacocoAnt org.ow2.asm:asm-tree:9.9=spotbugs org.ow2.asm:asm-util:9.9=spotbugs org.ow2.asm:asm:9.2=jacocoAnt -org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.8=pmd org.ow2.asm:asm:9.9=spotbugs +org.pcollections:pcollections:4.0.2=pmd org.projectlombok:lombok:1.18.42=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=spotbugs,spotbugsSlf4j 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.2.2=checkstyle,pmd org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins