Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id "idea"
id "com.github.mxenabled.coppuccino" version "4.4.2" apply false
id "com.github.mxenabled.vogue" version "1.1.0"
id "com.github.mxenabled.coppuccino" version "5.+" apply false
id "com.github.mxenabled.vogue" version "2.+"
id "io.freefair.lombok" version "8.+" apply false
id "io.github.gradle-nexus.publish-plugin" version "1.1.+"
}
Expand Down Expand Up @@ -29,8 +29,8 @@ allprojects {
group "com.mx.path-core"
description "MX Path Core"
version rootProject.version
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

repositories {
mavenCentral()
Expand All @@ -51,7 +51,7 @@ subprojects {
apply plugin: "io.freefair.lombok"

ext {
mockitoVersion = "[4.0,5.0)"
mockitoVersion = "[5.0,6.0)"
spockVersion = "2.4-M6-groovy-3.0"
junitVersion = "5.14.0"
}
Expand All @@ -60,7 +60,7 @@ subprojects {
constraints {
api("com.google.code.gson:gson") {
version {
require "[2.9,2.10)"
require "[2.13.0,13.0.0)"
}
}
api("io.opentracing:opentracing-api") {
Expand Down Expand Up @@ -98,10 +98,10 @@ subprojects {
// Version changes to any of these need to be tested (not just built)
// with an apps that use SOAP.
// -----------------------------------------------------------------
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.9!!"
api "jakarta.xml.bind:jakarta.xml.bind-api:4.0.4!!"
api "jakarta.xml.soap:jakarta.xml.soap-api:3.0.2!!"
api "com.sun.xml.bind:jaxb-impl:4.0.6!!"
api "org.glassfish.jaxb:jaxb-runtime:4.0.6!!"
// -----------------------------------------------------------------
}

Expand All @@ -114,13 +114,6 @@ subprojects {

compileJava { options.compilerArgs << "-parameters" }

sourceSets {
test {
groovy { srcDirs "src/test/groovy" }
java { srcDirs "src/test/java" }
}
}

javadoc {
classpath = configurations.compileClasspath
options {
Expand Down Expand Up @@ -251,6 +244,6 @@ task subdependencies {
project.tasks.getByPath("dependencies").finalizedBy("subdependencies")

wrapper {
gradleVersion = "7.6.3"
gradleVersion = "7.6.4"
distributionType = Wrapper.DistributionType.ALL
}
2 changes: 1 addition & 1 deletion common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {
api "com.github.rholder:guava-retrying" // For Request retries
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"
api "org.yaml:snakeyaml:2.4"
implementation "org.slf4j:slf4j-api"
implementation "org.objenesis:objenesis:3.3"
testImplementation "org.objenesis:objenesis:3.3"
Expand Down
54 changes: 29 additions & 25 deletions common/gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.beust:jcommander:1.48=pmd
com.github.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs:4.9.8=spotbugs
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.2=spotbugs
com.google.code.gson:gson:2.8.9=pmd
com.google.code.gson:gson:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.1=pmd
com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
com.google.errorprone:error_prone_annotations:2.38.0=pmd
com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:failureaccess:1.0.3=checkstyle
com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -22,30 +21,32 @@ 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-codec:commons-codec:1.15=checkstyle,pmd
commons-collections:commons-collections:3.2.2=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.5=checkstyle
net.bytebuddy:byte-buddy-agent:1.14.1=testCompileClasspath,testRuntimeClasspath
net.bytebuddy:byte-buddy:1.14.1=testCompileClasspath,testRuntimeClasspath
net.sf.saxon:Saxon-HE:12.5=checkstyle,pmd
net.sf.saxon:Saxon-HE:12.9=spotbugs
net.sourceforge.pmd:pmd-core:6.55.0=pmd
net.sourceforge.pmd:pmd-java:6.55.0=pmd
net.sourceforge.saxon:saxon:9.1.0.8=pmd
net.sourceforge.pmd:pmd-ant:7.16.0=pmd
net.sourceforge.pmd:pmd-core:7.16.0=pmd
net.sourceforge.pmd:pmd-java:7.16.0=pmd
org.antlr:antlr4-runtime:4.13.2=checkstyle
org.antlr:antlr4-runtime:4.7.2=pmd
org.antlr:antlr4-runtime:4.9.3=pmd
org.apache.bcel:bcel:6.11.0=spotbugs
org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.18.0=pmd
org.apache.commons:commons-lang3:3.19.0=spotbugs
org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.8.1=checkstyle
org.apache.commons:commons-text:1.14.0=spotbugs
org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.3=checkstyle
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd
org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle,pmd
org.apache.httpcomponents:httpclient:4.5.13=checkstyle
org.apache.httpcomponents:httpcore:4.4.14=checkstyle
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
Expand All @@ -58,6 +59,7 @@ org.apache.xbean:xbean-reflect:3.7=checkstyle
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.49.3=checkstyle
org.checkerframework:checker-qual:3.49.5=pmd
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
Expand All @@ -75,8 +77,8 @@ org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClass
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.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-analysis:9.2=jacocoAnt
Expand All @@ -87,16 +89,18 @@ org.ow2.asm:asm-tree:9.2=jacocoAnt
org.ow2.asm:asm-tree:9.9=spotbugs
org.ow2.asm:asm-util:9.9=spotbugs
org.ow2.asm:asm:9.2=jacocoAnt
org.ow2.asm:asm:9.4=pmd
org.ow2.asm:asm:9.8=pmd
org.ow2.asm:asm:9.9=spotbugs
org.pcollections:pcollections:4.0.2=pmd
org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
org.reflections:reflections:0.10.2=checkstyle
org.slf4j:jul-to-slf4j:1.7.36=pmd
org.slf4j:slf4j-api:1.7.30=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
org.xmlresolver:xmlresolver:5.2.2=checkstyle
org.xmlresolver:xmlresolver:5.2.2=checkstyle,pmd
org.xmlresolver:xmlresolver:5.3.3=spotbugs
org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
empty=signatures,spotbugsPlugins
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public ObjectMapYamlDeserializer(Parameters parameters) {
public final Object fromYaml(String document) {
LoaderOptions options = new LoaderOptions();
options.setMaxAliasesForCollections(getParameters().getMaxYamlAliases());
Yaml yaml = new Yaml(new ObjectMapConstructor(options), new Representer(), new DumperOptions(), options);
Yaml yaml = new Yaml(new ObjectMapConstructor(options), new Representer(new DumperOptions()), new DumperOptions(), options);
Object root = yaml.load(document);

// If the root node is a Map we need to convert it to an ObjectMap
Expand Down
50 changes: 27 additions & 23 deletions context/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,21 @@
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
com.auth0:java-jwt:4.5.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.beust:jcommander:1.48=pmd
com.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.oowekyala.ooxml:nice-xml-messages:3.1=pmd
com.github.rholder:guava-retrying:2.0.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs-annotations:4.9.8=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.github.spotbugs:spotbugs:4.9.8=spotbugs
com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs
com.google.code.findbugs:jsr305:3.0.2=checkstyle,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.2=spotbugs
com.google.code.gson:gson:2.8.9=pmd
com.google.code.gson:gson:2.9.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.21.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.code.gson:gson:2.13.1=pmd
com.google.code.gson:gson:2.13.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.errorprone:error_prone_annotations:2.36.0=checkstyle
com.google.errorprone:error_prone_annotations:2.41.0=spotbugs
com.google.errorprone:error_prone_annotations:2.38.0=pmd
com.google.errorprone:error_prone_annotations:2.41.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
com.google.guava:failureaccess:1.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
com.google.guava:failureaccess:1.0.3=checkstyle
com.google.guava:guava:32.1.3-jre=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
Expand All @@ -27,7 +26,7 @@ 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-codec:commons-codec:1.15=checkstyle,pmd
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
Expand All @@ -40,22 +39,24 @@ io.opentracing:opentracing-util:0.33.0=compileClasspath,runtimeClasspath,testCom
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.5=checkstyle
net.sf.saxon:Saxon-HE:12.5=checkstyle,pmd
net.sf.saxon:Saxon-HE:12.9=spotbugs
net.sourceforge.pmd:pmd-core:6.55.0=pmd
net.sourceforge.pmd:pmd-java:6.55.0=pmd
net.sourceforge.saxon:saxon:9.1.0.8=pmd
net.sourceforge.pmd:pmd-ant:7.16.0=pmd
net.sourceforge.pmd:pmd-core:7.16.0=pmd
net.sourceforge.pmd:pmd-java:7.16.0=pmd
org.antlr:antlr4-runtime:4.13.2=checkstyle
org.antlr:antlr4-runtime:4.7.2=pmd
org.antlr:antlr4-runtime:4.9.3=pmd
org.apache.bcel:bcel:6.11.0=spotbugs
org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.18.0=pmd
org.apache.commons:commons-lang3:3.19.0=spotbugs
org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.20.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-lang3:3.8.1=checkstyle
org.apache.commons:commons-text:1.14.0=spotbugs
org.apache.commons:commons-text:1.15.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.apache.commons:commons-text:1.3=checkstyle
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle
org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle
org.apache.httpcomponents.client5:httpclient5:5.1.3=checkstyle,pmd
org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=checkstyle,pmd
org.apache.httpcomponents.core5:httpcore5:5.1.3=checkstyle,pmd
org.apache.httpcomponents:httpclient:4.5.13=checkstyle
org.apache.httpcomponents:httpcore:4.4.14=checkstyle
org.apache.logging.log4j:log4j-api:2.25.2=spotbugs
Expand All @@ -68,6 +69,7 @@ org.apache.xbean:xbean-reflect:3.7=checkstyle
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
org.checkerframework:checker-qual:3.37.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.checkerframework:checker-qual:3.49.3=checkstyle
org.checkerframework:checker-qual:3.49.5=pmd
org.codehaus.groovy:groovy:3.0.24=testCompileClasspath,testRuntimeClasspath
org.codehaus.plexus:plexus-classworlds:2.6.0=checkstyle
org.codehaus.plexus:plexus-component-annotations:2.1.0=checkstyle
Expand All @@ -85,8 +87,8 @@ org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClass
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.mockito:mockito-core:5.2.0=testCompileClasspath,testRuntimeClasspath
org.mockito:mockito-inline:5.2.0=testCompileClasspath,testRuntimeClasspath
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
org.ow2.asm:asm-analysis:9.2=jacocoAnt
Expand All @@ -97,18 +99,20 @@ org.ow2.asm:asm-tree:9.2=jacocoAnt
org.ow2.asm:asm-tree:9.9=spotbugs
org.ow2.asm:asm-util:9.9=spotbugs
org.ow2.asm:asm:9.2=jacocoAnt
org.ow2.asm:asm:9.4=pmd
org.ow2.asm:asm:9.8=pmd
org.ow2.asm:asm:9.9=spotbugs
org.pcollections:pcollections:4.0.2=pmd
org.projectlombok:lombok:1.18.42=annotationProcessor,compileClasspath,lombok,testAnnotationProcessor,testCompileClasspath
org.reflections:reflections:0.10.2=checkstyle
org.slf4j:jul-to-slf4j:1.7.36=pmd
org.slf4j:slf4j-api:1.7.30=runtimeClasspath,testRuntimeClasspath
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
org.spockframework:spock-bom:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntimeClasspath
org.xmlresolver:xmlresolver:5.2.2=checkstyle
org.xmlresolver:xmlresolver:5.2.2=checkstyle,pmd
org.xmlresolver:xmlresolver:5.3.3=spotbugs
org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
org.yaml:snakeyaml:2.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
uk.org.webcompere:system-stubs-core:2.1.5=testCompileClasspath,testRuntimeClasspath
uk.org.webcompere:system-stubs-jupiter:2.1.5=testCompileClasspath,testRuntimeClasspath
empty=signatures,spotbugsPlugins
Loading