Update junit/jaxb

meotchwilliams · meotchwilliams · commit 3c5073443eaf · 2025-11-07T09:37:32.000-07:00
diff --git a/build.gradle b/build.gradle
@@ -97,7 +97,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!!"
         // -----------------------------------------------------------------
       }
 
diff --git a/gateway-generator/gradle.lockfile b/gateway-generator/gradle.lockfile
@@ -88,8 +88,8 @@ 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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/gateway/gradle.lockfile b/gateway/gradle.lockfile
@@ -85,8 +85,8 @@ 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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/http/gradle.lockfile b/http/gradle.lockfile
@@ -85,8 +85,8 @@ 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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/test-gateway-generator/gradle.lockfile b/test-gateway-generator/gradle.lockfile
@@ -58,8 +58,8 @@ 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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/test-gateways/gradle.lockfile b/test-gateways/gradle.lockfile
@@ -91,8 +91,8 @@ 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.7=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.7=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/test-models/gradle.lockfile b/test-models/gradle.lockfile
@@ -84,8 +84,8 @@ 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.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.glassfish.jaxb:txw2:2.3.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/testing/build.gradle b/testing/build.gradle
@@ -1,6 +1,4 @@
 dependencies {
-  api "org.spockframework:spock-junit4:[2.0,3.0)"
-
   implementation project(":gateway")
   // Unit tests
   implementation "org.junit.jupiter:junit-jupiter-api:5.14.0"
diff --git a/testing/gradle.lockfile b/testing/gradle.lockfile
@@ -47,7 +47,6 @@ 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.12.19=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 net.sf.saxon:Saxon-HE:12.5=checkstyle
@@ -63,8 +62,6 @@ 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.groovy:groovy-bom:4.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.apache.groovy:groovy:4.0.26=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 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
@@ -81,14 +78,14 @@ org.apache.xbean:xbean-reflect:3.7=checkstyle
 org.apiguardian:apiguardian-api:1.1.2=compileClasspath,testCompileClasspath
 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.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.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
@@ -119,9 +116,8 @@ org.reflections:reflections:0.10.2=checkstyle,runtimeClasspath,testRuntimeClassp
 org.slf4j:slf4j-api:1.7.32=runtimeClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
 org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
-org.spockframework:spock-bom:2.4-M6-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.4-M6-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.4-M6-groovy-4.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+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
diff --git a/testing/src/main/groovy/com/mx/path/testing/BaseTestingTrait.groovy b/testing/src/main/groovy/com/mx/path/testing/BaseTestingTrait.groovy
@@ -1,8 +1,7 @@
 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.
@@ -32,14 +31,14 @@ 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
    */
-  @After()
+  @AfterEach()
   def testCleanup() {
     safeInvoke("cleanupRequestExpectations")
     safeInvoke("cleanupMockery")

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ subprojects {`
`97`	`97`	`api "jakarta.xml.bind:jakarta.xml.bind-api:2.3.3!!"`
`98`	`98`	`api "jakarta.xml.soap:jakarta.xml.soap-api:1.4.2!!"`
`99`	`99`	`api "com.sun.xml.bind:jaxb-impl:2.3.1!!"`
`100`		`- api "org.glassfish.jaxb:jaxb-runtime:2.3.7!!"`
	`100`	`+ api "org.glassfish.jaxb:jaxb-runtime:2.3.9!!"`
`101`	`101`	`// -----------------------------------------------------------------`
`102`	`102`	`}`
`103`	`103`