diff --git a/build.gradle b/build.gradle index 351f172e..d2b0398e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id "idea" - id "com.github.mxenabled.coppuccino" version "4.+" apply false - id "com.github.mxenabled.vogue" version "1.+" + id "com.github.mxenabled.coppuccino" version "4.4.2" apply false + id "com.github.mxenabled.vogue" version "1.1.0" id "io.freefair.lombok" version "8.+" apply false id "io.github.gradle-nexus.publish-plugin" version "1.1.+" } @@ -29,8 +29,8 @@ allprojects { group "com.mx.path-core" description "MX Path Core" version rootProject.version - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 repositories { mavenCentral() @@ -52,8 +52,8 @@ subprojects { ext { mockitoVersion = "[4.0,5.0)" - spockVersion = "2.4-M1-groovy-4.0" - junitVersion = "[5.9.0,5.10.0)" + spockVersion = "2.4-M6-groovy-3.0" + junitVersion = "5.14.0" } dependencies { @@ -80,7 +80,7 @@ subprojects { } api("com.google.guava:guava") { version { - require "[31.0,32.0)" + require "[32.0,33.0)" } } api("com.github.rholder:guava-retrying") { @@ -101,7 +101,7 @@ subprojects { api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3!!" api "jakarta.xml.soap:jakarta.xml.soap-api:1.4.2!!" api "com.sun.xml.bind:jaxb-impl:2.3.1!!" - api "org.glassfish.jaxb:jaxb-runtime:2.3.7!!" + api "org.glassfish.jaxb:jaxb-runtime:2.3.9!!" // ----------------------------------------------------------------- } @@ -251,6 +251,6 @@ task subdependencies { project.tasks.getByPath("dependencies").finalizedBy("subdependencies") wrapper { - gradleVersion = "7.5.1" - distributionType = Wrapper.DistributionType.BIN + gradleVersion = "7.6.3" + distributionType = Wrapper.DistributionType.ALL } diff --git a/common/build.gradle b/common/build.gradle index 396a56ec..0b189b48 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -1,6 +1,6 @@ coppuccino { coverage { - minimumCoverage = 0.69 + minimumCoverage = 0.75 } } @@ -8,7 +8,7 @@ dependencies { api "org.apache.commons:commons-text:latest.release" // For string manipulation utilities. There is a very small overlap with Guava's strings class, but adds many more features. api "com.google.guava:guava" api "com.github.rholder:guava-retrying" // For Request retries - api "com.github.spotbugs:spotbugs-annotations:4.7.2" // For annotating classes and methods to suppress SpotBugs violations + api "com.github.spotbugs:spotbugs-annotations:4.9.8" // For annotating classes and methods to suppress SpotBugs violations api "com.google.code.gson:gson" api "org.yaml:snakeyaml:1.33" implementation "org.slf4j:slf4j-api" diff --git a/common/gradle.lockfile b/common/gradle.lockfile index 440ea391..d6ae6c68 100644 --- a/common/gradle.lockfile +++ b/common/gradle.lockfile @@ -1,86 +1,102 @@ # 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. -antlr:antlr:2.7.7=checkstyle com.beust:jcommander:1.48=pmd com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle -commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.15=spotbugs +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle -info.picocli:picocli:4.1.4=checkstyle +commons-io:commons-io:2.20.0=spotbugs +info.picocli:picocli:4.7.7=checkstyle +io.leangen.geantyref:geantyref:1.3.16=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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +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-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:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.dom4j:dom4j:2.2.0=spotbugs +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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.reflections:reflections:0.10.2=checkstyle org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/common/src/main/java/com/mx/path/core/common/connect/Request.java b/common/src/main/java/com/mx/path/core/common/connect/Request.java index 843eed8a..f17a666b 100644 --- a/common/src/main/java/com/mx/path/core/common/connect/Request.java +++ b/common/src/main/java/com/mx/path/core/common/connect/Request.java @@ -567,7 +567,7 @@ public final void setTimeout(Duration timeout) { /** * Called before the request starts. Sets start time. Override to add behavior. Be sure to call {@code super.start()} */ - public void start() { + public synchronized void start() { if (attemptCount < 1) { attemptCount = 1; } @@ -579,7 +579,7 @@ public void start() { /** * Called before retrying request. Sets start time. Override to add behavior. Be sure to call {@code super.startRetry()} */ - public void startRetry() { + public synchronized void startRetry() { attemptCount++; startNano = 0; } diff --git a/common/src/main/java/com/mx/path/core/common/http/MimeType.java b/common/src/main/java/com/mx/path/core/common/http/MimeType.java index 49c897bf..7b18bf62 100644 --- a/common/src/main/java/com/mx/path/core/common/http/MimeType.java +++ b/common/src/main/java/com/mx/path/core/common/http/MimeType.java @@ -277,7 +277,7 @@ private boolean isQuotedString(String s) { } } - protected String unquote(String s) { + protected final String unquote(String s) { return (isQuotedString(s) ? s.substring(1, s.length() - 1) : s); } @@ -350,7 +350,7 @@ public Charset getCharset() { * @return the parameter value, or {@code null} if not present */ @Nullable - public String getParameter(String name) { + public final String getParameter(String name) { return this.parameters.get(name); } @@ -611,4 +611,12 @@ private static Map addCharsetParameter(Charset charset, Map> implements List, ModelWrappabl private static final Map, Class> CACHED_TYPE_TO_LIST_TYPE = new LinkedHashMap<>(); private static final Map, Type> CACHED_TYPE_TO_LIST_TYPETOKEN = new LinkedHashMap<>(); - @SuppressFBWarnings("DM_NEW_FOR_GETCLASS") public static > Class ofClass(Class klass) { if (!CACHED_TYPE_TO_LIST_TYPE.containsKey(klass)) { CACHED_TYPE_TO_LIST_TYPE.put(klass, ModelList.class); diff --git a/common/src/main/java/com/mx/path/core/common/serialization/ThrowableTypeAdapter.java b/common/src/main/java/com/mx/path/core/common/serialization/ThrowableTypeAdapter.java index 22a687af..6c5d22e1 100644 --- a/common/src/main/java/com/mx/path/core/common/serialization/ThrowableTypeAdapter.java +++ b/common/src/main/java/com/mx/path/core/common/serialization/ThrowableTypeAdapter.java @@ -98,7 +98,7 @@ public final void write(JsonWriter out, Throwable value) throws IOException { } @Data - private static class ErrorInfo { + private static final class ErrorInfo { private String throwableType = null; private String payloadFallbackType = null; private Throwable cause = null; diff --git a/context/gradle.lockfile b/context/gradle.lockfile index 885b7d38..1f7eb1f5 100644 --- a/context/gradle.lockfile +++ b/context/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle com.auth0:java-jwt:4.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.48=pmd com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -9,89 +8,106 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle -commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.15=spotbugs +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +info.picocli:picocli:4.7.7=checkstyle io.github.cdimascio:dotenv-java:2.3.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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 jaxen:jaxen:2.0.0=spotbugs net.bytebuddy:byte-buddy-agent:1.14.9=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.14.9=testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +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-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:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.dom4j:dom4j:2.2.0=spotbugs +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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.reflections:reflections:0.10.2=checkstyle org.slf4j:slf4j-api:1.7.30=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath uk.org.webcompere:system-stubs-core:2.1.5=testCompileClasspath,testRuntimeClasspath uk.org.webcompere:system-stubs-jupiter:2.1.5=testCompileClasspath,testRuntimeClasspath diff --git a/gateway-generator/build.gradle b/gateway-generator/build.gradle index 0651b4dc..72c9bc03 100644 --- a/gateway-generator/build.gradle +++ b/gateway-generator/build.gradle @@ -2,8 +2,8 @@ dependencies { implementation project(":gateway") implementation "com.squareup:javapoet:1.13.0" - implementation "com.google.auto.service:auto-service:1.0.1" + implementation "com.google.auto.service:auto-service:1.1.1" implementation "org.projectlombok:lombok:1.18.24" - annotationProcessor "com.google.auto.service:auto-service:1.0.1" + annotationProcessor "com.google.auto.service:auto-service:1.1.1" } diff --git a/gateway-generator/gradle.lockfile b/gateway-generator/gradle.lockfile index 7f3956c0..a1778b85 100644 --- a/gateway-generator/gradle.lockfile +++ b/gateway-generator/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle 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 @@ -10,37 +9,41 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.auto.service:auto-service-annotations:1.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto.service:auto-service:1.0.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auto:auto-common:1.2=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.auto:auto-common:1.2.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -com.google.code.gson:gson:2.10.1=spotbugs +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.3.4=checkstyle -com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.0.1-jre=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +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,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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:1.3=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +com.puppycrawl.tools:checkstyle:10.25.0=checkstyle com.squareup:javapoet:1.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,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 -commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +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.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 @@ -50,67 +53,77 @@ jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,te 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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath +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-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,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.httpcomponents:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.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.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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.24=runtimeClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/gateway-generator/src/main/java/com/mx/path/api/AccessorProxyGenerator.java b/gateway-generator/src/main/java/com/mx/path/api/AccessorProxyGenerator.java index 23463ba6..0d57cca0 100644 --- a/gateway-generator/src/main/java/com/mx/path/api/AccessorProxyGenerator.java +++ b/gateway-generator/src/main/java/com/mx/path/api/AccessorProxyGenerator.java @@ -13,6 +13,8 @@ import javax.annotation.processing.ProcessingEnvironment; import javax.lang.model.element.Modifier; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + import com.mx.path.core.common.accessor.API; import com.mx.path.core.common.accessor.RootAccessor; import com.mx.path.core.common.gateway.GatewayAPI; @@ -20,6 +22,7 @@ import com.mx.path.core.common.reflection.Annotations; import com.mx.path.gateway.accessor.Accessor; import com.mx.path.gateway.accessor.AccessorConfiguration; +import com.squareup.javapoet.AnnotationSpec; import com.squareup.javapoet.ClassName; import com.squareup.javapoet.CodeBlock; import com.squareup.javapoet.FieldSpec; @@ -196,6 +199,10 @@ private void generateSingletonProxy(String proxyBaseClass, Class klass; private ClassName remoteClassName; private String getterMethodName; diff --git a/gateway/build.gradle b/gateway/build.gradle index 01e2f10a..56fa12bc 100644 --- a/gateway/build.gradle +++ b/gateway/build.gradle @@ -1,6 +1,6 @@ coppuccino { coverage { - minimumCoverage = 0.51 + minimumCoverage = 0.66 excludes = [ "build/generated/**", "com/mx/path/gateway/api/**", diff --git a/gateway/gradle.lockfile b/gateway/gradle.lockfile index 2d1534e2..0c15fd79 100644 --- a/gateway/gradle.lockfile +++ b/gateway/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle 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 @@ -10,33 +9,37 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +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 -commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle commons-codec:commons-codec:1.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +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.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 @@ -47,67 +50,77 @@ jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,te 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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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-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,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.httpcomponents:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.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.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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.javassist:javassist:3.28.0-GA=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.reflections:reflections:0.10.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.2.2=checkstyle +org.xmlresolver:xmlresolver:5.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/gateway/src/main/java/com/mx/path/gateway/configuration/AccessorConstructionContext.java b/gateway/src/main/java/com/mx/path/gateway/configuration/AccessorConstructionContext.java index e998e238..6cba988b 100644 --- a/gateway/src/main/java/com/mx/path/gateway/configuration/AccessorConstructionContext.java +++ b/gateway/src/main/java/com/mx/path/gateway/configuration/AccessorConstructionContext.java @@ -11,8 +11,6 @@ import lombok.Getter; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.mx.path.core.common.collection.ObjectArray; @@ -106,7 +104,6 @@ public class AccessorConstructionContext { * @param configuration configuration for accessor * @param accessor class type */ - @SuppressFBWarnings("CT_CONSTRUCTOR_THROW") public AccessorConstructionContext(Class accessorClass, AccessorConfiguration configuration) { this.accessorConfiguration = configuration; this.accessorClass = accessorClass; diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 249e5832..afba1092 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..ec7c722f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a69d9cb6..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,10 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' @@ -143,12 +143,16 @@ fi if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/gradlew.bat b/gradlew.bat index f127cfd4..93e3f59f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% diff --git a/http/build.gradle b/http/build.gradle index 90f325c0..4ff34259 100644 --- a/http/build.gradle +++ b/http/build.gradle @@ -1,6 +1,6 @@ coppuccino { coverage { - minimumCoverage = 0.45 + minimumCoverage = 0.50 } } @@ -9,7 +9,7 @@ dependencies { implementation "io.opentracing:opentracing-api" implementation "org.apache.httpcomponents:httpclient" - implementation "commons-beanutils:commons-beanutils:1.9.4" + implementation "commons-beanutils:commons-beanutils:1.11.0" compileOnly "org.slf4j:slf4j-api" testImplementation "io.opentracing:opentracing-mock:0.33.0" diff --git a/http/gradle.lockfile b/http/gradle.lockfile index cc08794f..e0aa6e3e 100644 --- a/http/gradle.lockfile +++ b/http/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle 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 @@ -10,33 +9,37 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +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 -commons-beanutils:commons-beanutils:1.9.4=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.11.0=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath commons-codec:commons-codec:1.11=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.15=checkstyle 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 -commons-logging:commons-logging:1.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +commons-logging:commons-logging:1.3.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +info.picocli:picocli:4.7.7=checkstyle io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.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 @@ -47,68 +50,78 @@ jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,te 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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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-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,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.httpcomponents:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.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.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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=compileClasspath,testCompileClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.2.2=checkstyle +org.xmlresolver:xmlresolver:5.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/http/src/test/groovy/com/mx/path/api/connect/http/HttpClientFilterTest.groovy b/http/src/test/groovy/com/mx/path/api/connect/http/HttpClientFilterTest.groovy index a498b474..c483b51e 100644 --- a/http/src/test/groovy/com/mx/path/api/connect/http/HttpClientFilterTest.groovy +++ b/http/src/test/groovy/com/mx/path/api/connect/http/HttpClientFilterTest.groovy @@ -13,6 +13,7 @@ import com.mx.path.core.common.connect.Request import com.mx.path.core.common.connect.RequestFilter import org.apache.http.HttpEntity +import org.mockito.Mockito import spock.lang.Specification import spock.lang.Unroll @@ -116,13 +117,10 @@ class HttpClientFilterTest extends Specification { def "test connect exception handling in execute method"() { given: "A mock HttpRequest and Response" - def mockRequest = Mock(HttpRequest) - def mockResponse = Mock(HttpResponse) - - // Create the real executor object (HttpClientFilter) - HttpClientFilter executor = Mock(HttpClientFilter) - - executor.execute(mockRequest, mockResponse) >> { throw new ConnectException("Connection Exception") } + def mockRequest = mock(HttpRequest) + def mockResponse = mock(HttpResponse) + HttpClientFilter executor = mock(HttpClientFilter) + Mockito.when(executor.execute(mockRequest, mockResponse)).thenThrow(new ConnectException("Connection Exception", null)) when: "Execute method is called" executor.execute(mockRequest, mockResponse) diff --git a/messaging/build.gradle b/messaging/build.gradle index 689e7877..e12fddb2 100644 --- a/messaging/build.gradle +++ b/messaging/build.gradle @@ -1,6 +1,6 @@ coppuccino { coverage { - minimumCoverage = 0.79 + minimumCoverage = 0.84 } } diff --git a/messaging/gradle.lockfile b/messaging/gradle.lockfile index 8d40e490..1f8bf5fe 100644 --- a/messaging/gradle.lockfile +++ b/messaging/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle com.auth0:java-jwt:4.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.48=pmd com.fasterxml.jackson.core:jackson-annotations:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -9,28 +8,32 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle -commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.15=spotbugs +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +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.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 @@ -38,61 +41,74 @@ io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCom 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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +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-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:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.dom4j:dom4j:2.2.0=spotbugs +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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath +org.reflections:reflections:0.10.2=checkstyle org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs +org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j org.slf4j:slf4j-simple:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j +org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.2.2=checkstyle +org.xmlresolver:xmlresolver:5.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/test-gateway-generator/gradle.lockfile b/test-gateway-generator/gradle.lockfile index 68b5dff1..8d647132 100644 --- a/test-gateway-generator/gradle.lockfile +++ b/test-gateway-generator/gradle.lockfile @@ -8,32 +8,33 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.auto.service:auto-service-annotations:1.0.1=runtimeClasspath,testRuntimeClasspath -com.google.auto.service:auto-service:1.0.1=runtimeClasspath,testRuntimeClasspath -com.google.auto:auto-common:1.2=runtimeClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=runtimeClasspath,testRuntimeClasspath +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.10.1=spotbugs +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.11.0=compileClasspath,testCompileClasspath -com.google.errorprone:error_prone_annotations:2.7.1=runtimeClasspath,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.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:31.0.1-jre=runtimeClasspath,testRuntimeClasspath -com.google.guava:guava:31.1-jre=compileClasspath,testCompileClasspath +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:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=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 commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath +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 @@ -43,58 +44,53 @@ jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,te 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.3=spotbugs -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=spotbugs +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-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs +org.apache.commons:commons-lang3:3.19.0=spotbugs +org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,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.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.33.0=runtimeClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,testCompileClasspath +org.codehaus.groovy:groovy:3.0.24=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.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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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.6=spotbugs +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.24=runtimeClasspath,testRuntimeClasspath org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/test-gateways/gradle.lockfile b/test-gateways/gradle.lockfile index 9407b6ea..6e0fd603 100644 --- a/test-gateways/gradle.lockfile +++ b/test-gateways/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle 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 @@ -10,39 +9,43 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=annotationProcessor,compileClassp com.fasterxml.jackson.core:jackson-databind:2.15.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.9.8=annotationProcessor,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.auto.service:auto-service-annotations:1.0.1=annotationProcessor -com.google.auto.service:auto-service:1.0.1=annotationProcessor -com.google.auto:auto-common:1.2=annotationProcessor +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.errorprone:error_prone_annotations:2.7.1=annotationProcessor -com.google.guava:failureaccess:1.0.1=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.0.1-jre=annotationProcessor -com.google.guava:guava:31.1-jre=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.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +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 +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +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:1.3=annotationProcessor,checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +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 -commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle commons-codec:commons-codec:1.11=annotationProcessor,runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=annotationProcessor,runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +info.picocli:picocli:4.7.7=checkstyle io.github.cdimascio:dotenv-java:2.3.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath io.opentracing:opentracing-api:0.33.0=annotationProcessor,compileClasspath,runtimeClasspath,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 @@ -52,66 +55,77 @@ jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=annotationProcessor,compileClasspath 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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=spotbugs +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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=annotationProcessor,runtimeClasspath,testRuntimeClasspath +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-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=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=annotationProcessor,runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.httpcomponents:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +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.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.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.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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.javassist:javassist:3.28.0-GA=annotationProcessor,runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=annotationProcessor,runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=annotationProcessor,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.reflections:reflections:0.10.2=annotationProcessor,runtimeClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=annotationProcessor,runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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.3.3=spotbugs org.yaml:snakeyaml:1.33=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/test-models/gradle.lockfile b/test-models/gradle.lockfile index 44e37bf9..bcea1bc7 100644 --- a/test-models/gradle.lockfile +++ b/test-models/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle 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 @@ -10,33 +9,37 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +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 -commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +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.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 @@ -46,66 +49,76 @@ jakarta.xml.soap:jakarta.xml.soap-api:1.4.2=compileClasspath,runtimeClasspath,te 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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath +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-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,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.httpcomponents:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.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.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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.0=runtimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/testing/build.gradle b/testing/build.gradle index b2e1efc6..76cbead1 100644 --- a/testing/build.gradle +++ b/testing/build.gradle @@ -1,10 +1,7 @@ dependencies { - api "org.spockframework:spock-junit4:${project.ext.spockVersion}" - implementation project(":gateway") implementation "org.assertj:assertj-core:[3.0,4.0)" implementation "org.mockito:mockito-inline:${project.ext.mockitoVersion}" implementation "org.spockframework:spock-core:${project.ext.spockVersion}" implementation "org.junit.jupiter:junit-jupiter-api:${project.ext.junitVersion}" - runtimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.ext.junitVersion}" } diff --git a/testing/gradle.lockfile b/testing/gradle.lockfile index ed4a037c..ed7672be 100644 --- a/testing/gradle.lockfile +++ b/testing/gradle.lockfile @@ -1,7 +1,6 @@ # 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. -antlr:antlr:2.7.7=checkstyle 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 @@ -10,33 +9,37 @@ com.fasterxml.jackson.core:jackson-core:2.15.4=compileClasspath,runtimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.7.2=runtimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +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.10.1=spotbugs +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.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:28.2-jre=checkstyle -com.google.guava:guava:31.1-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:1.3=checkstyle,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.puppycrawl.tools:checkstyle:8.29=checkstyle +com.google.j2objc:j2objc-annotations:2.8=compileClasspath,testCompileClasspath +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +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 -commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle commons-codec:commons-codec:1.11=runtimeClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.15=spotbugs +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.20.0=spotbugs commons-lang:commons-lang:2.6=runtimeClasspath,testRuntimeClasspath commons-logging:commons-logging:1.2=runtimeClasspath,testRuntimeClasspath -info.picocli:picocli:4.1.4=checkstyle +info.picocli:picocli:4.7.7=checkstyle io.github.cdimascio:dotenv-java:2.3.2=runtimeClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=runtimeClasspath,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 @@ -44,72 +47,79 @@ jakarta.activation:jakarta.activation-api:1.2.2=compileClasspath,runtimeClasspat 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 jaxen:jaxen:2.0.0=spotbugs -junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.12.19=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.17.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.sf.saxon:Saxon-HE:12.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=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.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy-bom:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath +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-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,runtimeClasspath,testRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.httpcomponents:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath org.assertj:assertj-core:3.27.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.checkerframework:checker-qual:3.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.dom4j:dom4j:2.1.4=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest-core:1.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +org.codehaus.groovy:groovy:3.0.24=compileClasspath,runtimeClasspath,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.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.hamcrest:hamcrest:3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.jacoco:org.jacoco.agent:0.8.8=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.9.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.3=runtimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.reflections:reflections:0.10.2=runtimeClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-junit4:2.4-M1-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +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=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-M6-groovy-3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.2.2=checkstyle +org.xmlresolver:xmlresolver:5.3.3=spotbugs org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=signatures,spotbugsPlugins diff --git a/testing/src/main/groovy/com/mx/path/testing/BaseTestingTrait.groovy b/testing/src/main/groovy/com/mx/path/testing/BaseTestingTrait.groovy index d0445eec..40d4f99c 100644 --- a/testing/src/main/groovy/com/mx/path/testing/BaseTestingTrait.groovy +++ b/testing/src/main/groovy/com/mx/path/testing/BaseTestingTrait.groovy @@ -1,19 +1,24 @@ package com.mx.path.testing - -import org.junit.After -import org.junit.Before +import org.junit.jupiter.api.AfterEach +import org.junit.jupiter.api.BeforeEach /** * Base Trait for Path testing traits. Need to register setup and teardown methods here. * This needs to be done because Spock will not execute all included setupSpec and cleanupSpec * methods. Only the last one in. :( + * + * @deprecated Use {@link com.mx.path.testing.TestingBase} */ +@Deprecated trait BaseTestingTrait { /** * Executes once before the class's test is run (NOT before each test) + * + * @deprecated Use {@link com.mx.path.testing.TestingBase#setupSpec()} */ + @Deprecated def setupSpec() { safeInvoke("setupMockery") safeInvoke("setupSessionRepository") @@ -32,14 +37,17 @@ trait BaseTestingTrait { * If the trait needs to be setup before that, then it needs to be invoked in the setup method * by the spec writer. Document this in trait's javadocs */ - @Before() + @BeforeEach() def testSetup() { } /** * Runs after each test + * + * @deprecated Use {@link com.mx.path.testing.TestingBase#cleanup()} */ - @After() + @AfterEach() + @Deprecated def testCleanup() { safeInvoke("cleanupRequestExpectations") safeInvoke("cleanupMockery") diff --git a/testing/src/main/groovy/com/mx/path/testing/Mockery.groovy b/testing/src/main/groovy/com/mx/path/testing/Mockery.groovy new file mode 100644 index 00000000..d49e60c0 --- /dev/null +++ b/testing/src/main/groovy/com/mx/path/testing/Mockery.groovy @@ -0,0 +1,14 @@ +package com.mx.path.testing + +import org.mockito.Mockito +import org.mockito.MockitoAnnotations + +class Mockery extends TestingBase { + def setupMockery(){ + MockitoAnnotations.openMocks(this) + } + + def cleanupMockery() { + Mockito.validateMockitoUsage() + } +} diff --git a/testing/src/main/groovy/com/mx/path/testing/MockeryAndSessionRepository.groovy b/testing/src/main/groovy/com/mx/path/testing/MockeryAndSessionRepository.groovy new file mode 100644 index 00000000..9ae1c797 --- /dev/null +++ b/testing/src/main/groovy/com/mx/path/testing/MockeryAndSessionRepository.groovy @@ -0,0 +1,51 @@ +package com.mx.path.testing + +import com.mx.path.core.common.collection.ObjectMap +import com.mx.path.core.context.Session +import com.mx.path.testing.session.TestEncryptionService +import com.mx.path.testing.session.TestSessionRepository + +import org.mockito.Mockito +import org.mockito.MockitoAnnotations + +class MockeryAndSessionRepository extends TestingBase { + + def setupMockery(){ + MockitoAnnotations.openMocks(this) + } + + def cleanupMockery() { + Mockito.validateMockitoUsage() + } + + /** + * Configures in-memory session repository and fake encryption service + */ + def setupSessionRepository() { + com.mx.path.core.context.store.SessionRepository repository = new TestSessionRepository() + Session.setRepositorySupplier({ -> repository }) + TestEncryptionService testEncryptionService = new TestEncryptionService(new ObjectMap()) + Session.setEncryptionServiceSupplier({-> testEncryptionService}) + } + + /** + * Sets clean session repository + * + *

Invoked after each test + */ + def clearSessionRepository() { + com.mx.path.core.context.store.SessionRepository repository = new TestSessionRepository() + Session.setRepositorySupplier({ -> repository }) + } + + /** + * Removes fake session repository and encryption service + * + *

Invoked once after class's last test + */ + def cleanupSessionRepository() { + Session.clearSession() + Session.setRepositorySupplier({ -> null }) + Session.setEncryptionServiceSupplier({-> null}) + } +} diff --git a/testing/src/main/groovy/com/mx/path/testing/SessionRepository.groovy b/testing/src/main/groovy/com/mx/path/testing/SessionRepository.groovy new file mode 100644 index 00000000..3a04b390 --- /dev/null +++ b/testing/src/main/groovy/com/mx/path/testing/SessionRepository.groovy @@ -0,0 +1,40 @@ +package com.mx.path.testing + +import com.mx.path.core.common.collection.ObjectMap +import com.mx.path.core.context.Session +import com.mx.path.testing.session.TestEncryptionService +import com.mx.path.testing.session.TestSessionRepository + +class SessionRepository extends TestingBase { + + /** + * Configures in-memory session repository and fake encryption service + */ + def setupSessionRepository() { + com.mx.path.core.context.store.SessionRepository repository = new TestSessionRepository() + Session.setRepositorySupplier({ -> repository }) + TestEncryptionService testEncryptionService = new TestEncryptionService(new ObjectMap()) + Session.setEncryptionServiceSupplier({-> testEncryptionService}) + } + + /** + * Sets clean session repository + * + *

Invoked after each test + */ + def clearSessionRepository() { + com.mx.path.core.context.store.SessionRepository repository = new TestSessionRepository() + Session.setRepositorySupplier({ -> repository }) + } + + /** + * Removes fake session repository and encryption service + * + *

Invoked once after class's last test + */ + def cleanupSessionRepository() { + Session.clearSession() + Session.setRepositorySupplier({ -> null }) + Session.setEncryptionServiceSupplier({-> null}) + } +} diff --git a/testing/src/main/groovy/com/mx/path/testing/TestingBase.groovy b/testing/src/main/groovy/com/mx/path/testing/TestingBase.groovy new file mode 100644 index 00000000..c69afebe --- /dev/null +++ b/testing/src/main/groovy/com/mx/path/testing/TestingBase.groovy @@ -0,0 +1,83 @@ +package com.mx.path.testing + +import com.mx.path.core.common.connect.Request +import com.mx.path.gateway.accessor.AccessorConnectionBase +import com.mx.path.testing.request.RequestExpectation +import com.mx.path.testing.request.RequestExpectations +import com.mx.path.testing.request.RequestMatcher + +import spock.lang.Specification + +class TestingBase extends Specification { + + def setupSpec() { + safeInvoke("setupMockery") + safeInvoke("setupSessionRepository") + } + + def cleanup() { + safeInvoke("cleanupRequestExpectations") + safeInvoke("cleanupMockery") + safeInvoke("clearSessionRepository") + } + + RequestExpectation allowConnection(RequestMatcher requestMatcher) { + stubConnection(requestMatcher) + } + + def cleanupRequestExpectations() { + RequestExpectations.verifyConnectionExpectations() + RequestExpectations.reset() + } + + RequestMatcher exactly(Request request) { + RequestMatcher.Fluent.exactly(request) + } + + RequestExpectation expectConnection(RequestMatcher requestMatcher) { + RequestExpectations.Fluent.expectRequest(requestMatcher) + } + + Request request() { + RequestExpectations.request() + } + + Request request(RequestMatcher requestMatcher) { + RequestExpectations.request(requestMatcher) + } + + List requests() { + RequestExpectations.requests() + } + + List requests(RequestMatcher requestMatcher) { + RequestExpectations.requests(requestMatcher) + } + + def setupConnectionMocking() { + RequestExpectations.reset() + } + + AccessorConnectionBase setupConnection(AccessorConnectionBase connection) { + return RequestExpectations.Fluent.setupConnection(connection) + } + + RequestExpectation stubConnection(RequestMatcher requestMatcher) { + RequestExpectations.Fluent.stubRequest(requestMatcher) + } + + RequestMatcher withMethod(String method) { + RequestMatcher.Fluent.withMethod(method) + } + + RequestMatcher withPath(String path) { + RequestMatcher.Fluent.withPath(path) + } + + private def safeInvoke(String methodName) { + if (respondsTo(methodName)) { + println("Invoking ${methodName}") + invokeMethod(methodName, []) + } + } +} diff --git a/testing/src/main/groovy/com/mx/path/testing/WithMockery.groovy b/testing/src/main/groovy/com/mx/path/testing/WithMockery.groovy index 95d315a9..c96cd4cb 100644 --- a/testing/src/main/groovy/com/mx/path/testing/WithMockery.groovy +++ b/testing/src/main/groovy/com/mx/path/testing/WithMockery.groovy @@ -19,7 +19,10 @@ import org.mockito.MockitoAnnotations * } * } * + * + * @deprecated Use {@link com.mx.path.testing.Mockery} */ +@Deprecated trait WithMockery extends BaseTestingTrait { def setupMockery(){ MockitoAnnotations.openMocks(this) diff --git a/testing/src/main/groovy/com/mx/path/testing/WithRequestExpectations.groovy b/testing/src/main/groovy/com/mx/path/testing/WithRequestExpectations.groovy index 3df22088..4adcb29d 100644 --- a/testing/src/main/groovy/com/mx/path/testing/WithRequestExpectations.groovy +++ b/testing/src/main/groovy/com/mx/path/testing/WithRequestExpectations.groovy @@ -42,7 +42,10 @@ import com.mx.path.testing.request.RequestMatcher * * } * + * + * @deprecated Use {@link com.mx.path.testing.TestingBase} */ +@Deprecated trait WithRequestExpectations extends WithMockery { RequestExpectation allowConnection(RequestMatcher requestMatcher) { diff --git a/testing/src/main/groovy/com/mx/path/testing/WithSessionRepository.groovy b/testing/src/main/groovy/com/mx/path/testing/WithSessionRepository.groovy index 14ba90e0..7fd96f9e 100644 --- a/testing/src/main/groovy/com/mx/path/testing/WithSessionRepository.groovy +++ b/testing/src/main/groovy/com/mx/path/testing/WithSessionRepository.groovy @@ -15,10 +15,13 @@ import com.mx.path.testing.session.TestSessionRepository * * Usage: * 

- *   class SessionieTest extends Specification implements WithSessionRepository {
+ *   class SessionTest extends Specification implements WithSessionRepository {
  *   }
  *
+ * + * @deprecated Use {@link com.mx.path.testing.SessionRepository} */ +@Deprecated @SuppressFBWarnings("SE_NO_SERIALVERSIONID") trait WithSessionRepository extends BaseTestingTrait { /** diff --git a/utilities/build.gradle b/utilities/build.gradle index 56fb9c29..89872c9f 100644 --- a/utilities/build.gradle +++ b/utilities/build.gradle @@ -1,6 +1,6 @@ coppuccino { coverage { - minimumCoverage = 0.96 + minimumCoverage = 0.98 } } diff --git a/utilities/gradle.lockfile b/utilities/gradle.lockfile index 049254fb..0f0effc5 100644 --- a/utilities/gradle.lockfile +++ b/utilities/gradle.lockfile @@ -1,80 +1,97 @@ # 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. -antlr:antlr:2.7.7=checkstyle com.auth0:java-jwt:4.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.beust:jcommander:1.48=pmd 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:jackson-bom:2.15.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.8.2=compileClasspath,spotbugs,testCompileClasspath -com.github.spotbugs:spotbugs:4.8.2=spotbugs +com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,spotbugs,testCompileClasspath +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,spotbugs,testCompileClasspath -com.google.code.gson:gson:2.10.1=spotbugs +com.google.code.gson:gson:2.13.2=spotbugs com.google.code.gson:gson:2.8.9=pmd -com.google.errorprone:error_prone_annotations:2.3.4=checkstyle -com.google.guava:failureaccess:1.0.1=checkstyle -com.google.guava:guava:28.2-jre=checkstyle +com.google.errorprone:error_prone_annotations:2.36.0=checkstyle +com.google.errorprone:error_prone_annotations:2.41.0=spotbugs +com.google.guava:failureaccess:1.0.3=checkstyle +com.google.guava:guava:33.4.8-jre=checkstyle com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle -com.google.j2objc:j2objc-annotations:1.3=checkstyle -com.puppycrawl.tools:checkstyle:8.29=checkstyle -commons-beanutils:commons-beanutils:1.9.4=checkstyle -commons-codec:commons-codec:1.15=spotbugs +com.google.j2objc:j2objc-annotations:3.0.0=checkstyle +com.puppycrawl.tools:checkstyle:10.25.0=checkstyle +commons-beanutils:commons-beanutils:1.11.0=checkstyle +commons-codec:commons-codec:1.15=checkstyle commons-collections:commons-collections:3.2.2=checkstyle -info.picocli:picocli:4.1.4=checkstyle +commons-io:commons-io:2.20.0=spotbugs +info.picocli:picocli:4.7.7=checkstyle +io.leangen.geantyref:geantyref:1.3.16=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.3=spotbugs -net.sf.saxon:Saxon-HE:9.9.1-6=checkstyle -net.sourceforge.pmd:pmd-core:6.54.0=pmd -net.sourceforge.pmd:pmd-java:6.54.0=pmd +net.sf.saxon:Saxon-HE:12.5=checkstyle +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 +org.antlr:antlr4-runtime:4.13.2=checkstyle org.antlr:antlr4-runtime:4.7.2=pmd -org.antlr:antlr4-runtime:4.8-1=checkstyle -org.apache.bcel:bcel:6.6.1=spotbugs -org.apache.commons:commons-lang3:3.13.0=spotbugs -org.apache.commons:commons-lang3:3.8.1=pmd -org.apache.commons:commons-text:1.10.0=spotbugs -org.apache.groovy:groovy-bom:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.groovy:groovy:4.0.6=testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs -org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs -org.apache.logging.log4j:log4j-api:2.22.0=spotbugs -org.apache.logging.log4j:log4j-core:2.22.0=spotbugs +org.apache.bcel:bcel:6.11.0=spotbugs +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=spotbugs +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:httpcore:4.4.14=checkstyle +org.apache.logging.log4j:log4j-api:2.25.2=spotbugs +org.apache.logging.log4j:log4j-core:2.25.2=spotbugs +org.apache.maven.doxia:doxia-core:1.12.0=checkstyle +org.apache.maven.doxia:doxia-logging-api:1.12.0=checkstyle +org.apache.maven.doxia:doxia-module-xdoc:1.12.0=checkstyle +org.apache.maven.doxia:doxia-sink-api:1.12.0=checkstyle +org.apache.xbean:xbean-reflect:3.7=checkstyle org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath -org.checkerframework:checker-qual:2.10.0=checkstyle -org.dom4j:dom4j:2.1.4=spotbugs -org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.49.3=checkstyle +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.dom4j:dom4j:2.2.0=spotbugs +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 org.jacoco:org.jacoco.core:0.8.8=jacocoAnt org.jacoco:org.jacoco.report:0.8.8=jacocoAnt -org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.3=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath +org.javassist:javassist:3.28.0-GA=checkstyle +org.jspecify:jspecify:1.0.0=checkstyle +org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.0=spotbugs,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testRuntimeClasspath -org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.2=jacocoAnt -org.ow2.asm:asm-analysis:9.6=spotbugs +org.ow2.asm:asm-analysis:9.9=spotbugs org.ow2.asm:asm-commons:9.2=jacocoAnt -org.ow2.asm:asm-commons:9.6=spotbugs +org.ow2.asm:asm-commons:9.9=spotbugs org.ow2.asm:asm-tree:9.2=jacocoAnt -org.ow2.asm:asm-tree:9.6=spotbugs -org.ow2.asm:asm-util:9.6=spotbugs +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=pmd -org.ow2.asm:asm:9.6=spotbugs +org.ow2.asm:asm:9.4=pmd +org.ow2.asm:asm:9.9=spotbugs org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath -org.slf4j:slf4j-api:2.0.0=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.9=spotbugs -org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j -org.spockframework:spock-core:2.4-M1-groovy-4.0=testCompileClasspath,testRuntimeClasspath -org.xmlresolver:xmlresolver:5.2.0=spotbugs +org.reflections:reflections:0.10.2=checkstyle +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.3.3=spotbugs empty=signatures,spotbugsPlugins