Skip to content

Commit 9013889

Browse files
meotchwilliamsmeotchwilliams
committed
fix: cleanup
1 parent 498dae5 commit 9013889

9 files changed

Lines changed: 51 additions & 65 deletions

File tree

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77
id "com.netflix.nebula.maven-resolved-dependencies" version "21.2.0" apply false
88
}
99

10-
version "17.1.0" // x-release-please-version
10+
version "18.0.0-SNAPSHOT" // x-release-please-version
1111

1212
def platformProject = "platform"
1313
def publishedProjects = [
@@ -64,7 +64,7 @@ subprojects {
6464

6565
testImplementation "org.mockito:mockito-inline:[4.0,5.0)"
6666
testImplementation "org.spockframework:spock-core:2.4-M6-groovy-3.0"
67-
testImplementation "org.junit.jupiter:junit-jupiter-api:5.14.0"
67+
// testImplementation "org.junit.jupiter:junit-jupiter-api:5.14.0"
6868
}
6969

7070
test { useJUnitPlatform() }

‎mdx-gateway-generator/gradle.lockfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ net.bytebuddy:byte-buddy-agent:1.12.19=testCompileClasspath,testRuntimeClasspath
5858
net.bytebuddy:byte-buddy:1.12.19=testCompileClasspath,testRuntimeClasspath
5959
net.sf.saxon:Saxon-HE:12.9=spotbugs
6060
org.apache.bcel:bcel:6.11.0=spotbugs
61-
org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
62-
org.apache.commons:commons-lang3:3.19.0=spotbugs
61+
org.apache.commons:commons-lang3:3.19.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
6362
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
6463
org.apache.httpcomponents:httpclient:4.5.13=runtimeClasspath,testRuntimeClasspath
6564
org.apache.httpcomponents:httpcore:4.4.13=runtimeClasspath,testRuntimeClasspath
@@ -79,10 +78,12 @@ org.jacoco:org.jacoco.ant:0.8.8=jacocoAnt
7978
org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
8079
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
8180
org.javassist:javassist:3.28.0-GA=runtimeClasspath,testRuntimeClasspath
82-
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
83-
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
84-
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
85-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
81+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath
82+
org.junit.platform:junit-platform-commons:1.14.0=testRuntimeClasspath
83+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath
84+
org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
85+
org.junit:junit-bom:5.12.2=testCompileClasspath
86+
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
8687
org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath
8788
org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath
8889
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath

‎mdx-gateways/gradle.lockfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ net.sourceforge.saxon:saxon:9.1.0.8=pmd
7474
org.antlr:antlr4-runtime:4.13.2=checkstyle
7575
org.antlr:antlr4-runtime:4.7.2=pmd
7676
org.apache.bcel:bcel:6.11.0=spotbugs
77-
org.apache.commons:commons-lang3:3.18.0=annotationProcessor,compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
78-
org.apache.commons:commons-lang3:3.19.0=spotbugs
77+
org.apache.commons:commons-lang3:3.19.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
7978
org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd
8079
org.apache.commons:commons-text:1.14.0=annotationProcessor,compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
8180
org.apache.commons:commons-text:1.3=checkstyle
@@ -112,10 +111,12 @@ org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
112111
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
113112
org.javassist:javassist:3.28.0-GA=annotationProcessor,checkstyle,runtimeClasspath,testRuntimeClasspath
114113
org.jspecify:jspecify:1.0.0=checkstyle
115-
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
116-
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
117-
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
118-
org.junit:junit-bom:5.14.0=annotationProcessor,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
114+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath
115+
org.junit.platform:junit-platform-commons:1.14.0=testRuntimeClasspath
116+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath
117+
org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
118+
org.junit:junit-bom:5.12.2=testCompileClasspath
119+
org.junit:junit-bom:5.14.0=annotationProcessor,runtimeClasspath,spotbugs,testRuntimeClasspath
119120
org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath
120121
org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath
121122
org.objenesis:objenesis:3.3=annotationProcessor,runtimeClasspath,testRuntimeClasspath

‎mdx-models/gradle.lockfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ net.sourceforge.saxon:saxon:9.1.0.8=pmd
6767
org.antlr:antlr4-runtime:4.13.2=checkstyle
6868
org.antlr:antlr4-runtime:4.7.2=pmd
6969
org.apache.bcel:bcel:6.11.0=spotbugs
70-
org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
71-
org.apache.commons:commons-lang3:3.19.0=spotbugs
70+
org.apache.commons:commons-lang3:3.19.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
7271
org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd
7372
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
7473
org.apache.commons:commons-text:1.3=checkstyle
@@ -104,10 +103,13 @@ org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
104103
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
105104
org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
106105
org.jspecify:jspecify:1.0.0=checkstyle
107-
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
108-
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
109-
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
110-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
106+
org.junit.jupiter:junit-jupiter-api:5.14.0=testRuntimeClasspath
107+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath
108+
org.junit.platform:junit-platform-commons:1.14.0=testRuntimeClasspath
109+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath
110+
org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
111+
org.junit:junit-bom:5.12.2=testCompileClasspath
112+
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
111113
org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath
112114
org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath
113115
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
@@ -132,5 +134,4 @@ org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntime
132134
org.xmlresolver:xmlresolver:5.2.2=checkstyle
133135
org.xmlresolver:xmlresolver:5.3.3=spotbugs
134136
org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
135-
ru.vyarus:spock-junit5:1.0.1=testCompileClasspath,testRuntimeClasspath
136137
empty=signatures,spotbugsPlugins

‎mdx-web/gradle.lockfile‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ net.sourceforge.saxon:saxon:9.1.0.8=pmd
7777
org.antlr:antlr4-runtime:4.13.2=checkstyle
7878
org.antlr:antlr4-runtime:4.7.2=pmd
7979
org.apache.bcel:bcel:6.11.0=spotbugs
80-
org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
81-
org.apache.commons:commons-lang3:3.19.0=spotbugs
80+
org.apache.commons:commons-lang3:3.19.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
8281
org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd
8382
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
8483
org.apache.commons:commons-text:1.3=checkstyle
@@ -121,14 +120,20 @@ org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
121120
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
122121
org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
123122
org.jspecify:jspecify:1.0.0=checkstyle
124-
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
123+
org.junit.jupiter:junit-jupiter-api:5.12.2=testCompileClasspath
124+
org.junit.jupiter:junit-jupiter-api:5.14.0=testRuntimeClasspath
125125
org.junit.jupiter:junit-jupiter-engine:5.14.0=testRuntimeClasspath
126-
org.junit.jupiter:junit-jupiter-params:5.14.0=testCompileClasspath,testRuntimeClasspath
127-
org.junit.jupiter:junit-jupiter:5.14.0=testCompileClasspath,testRuntimeClasspath
128-
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
129-
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
126+
org.junit.jupiter:junit-jupiter-params:5.12.2=testCompileClasspath
127+
org.junit.jupiter:junit-jupiter-params:5.14.0=testRuntimeClasspath
128+
org.junit.jupiter:junit-jupiter:5.12.2=testCompileClasspath
129+
org.junit.jupiter:junit-jupiter:5.14.0=testRuntimeClasspath
130+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath
131+
org.junit.platform:junit-platform-commons:1.14.0=testRuntimeClasspath
132+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath
133+
org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
130134
org.junit.platform:junit-platform-launcher:1.14.0=testRuntimeClasspath
131-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
135+
org.junit:junit-bom:5.12.2=testCompileClasspath
136+
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
132137
org.mockito:mockito-core:4.5.1=testCompileClasspath,testRuntimeClasspath
133138
org.mockito:mockito-inline:4.5.1=testCompileClasspath,testRuntimeClasspath
134139
org.mockito:mockito-junit-jupiter:4.5.1=testCompileClasspath,testRuntimeClasspath
@@ -178,5 +183,4 @@ org.xmlresolver:xmlresolver:5.2.2=checkstyle
178183
org.xmlresolver:xmlresolver:5.3.3=spotbugs
179184
org.xmlunit:xmlunit-core:2.9.1=testCompileClasspath,testRuntimeClasspath
180185
org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
181-
ru.vyarus:spock-junit5:1.0.1=testCompileClasspath,testRuntimeClasspath
182186
empty=signatures,spotbugsPlugins

‎realtime/gradle.lockfile‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ net.sourceforge.saxon:saxon:9.1.0.8=pmd
6868
org.antlr:antlr4-runtime:4.13.2=checkstyle
6969
org.antlr:antlr4-runtime:4.7.2=pmd
7070
org.apache.bcel:bcel:6.11.0=spotbugs
71-
org.apache.commons:commons-lang3:3.18.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
72-
org.apache.commons:commons-lang3:3.19.0=spotbugs
71+
org.apache.commons:commons-lang3:3.19.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
7372
org.apache.commons:commons-lang3:3.8.1=checkstyle,pmd
7473
org.apache.commons:commons-text:1.14.0=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
7574
org.apache.commons:commons-text:1.3=checkstyle
@@ -105,10 +104,13 @@ org.jacoco:org.jacoco.core:0.8.8=jacocoAnt
105104
org.jacoco:org.jacoco.report:0.8.8=jacocoAnt
106105
org.javassist:javassist:3.28.0-GA=checkstyle,runtimeClasspath,testRuntimeClasspath
107106
org.jspecify:jspecify:1.0.0=checkstyle
108-
org.junit.jupiter:junit-jupiter-api:5.14.0=testCompileClasspath,testRuntimeClasspath
109-
org.junit.platform:junit-platform-commons:1.14.0=testCompileClasspath,testRuntimeClasspath
110-
org.junit.platform:junit-platform-engine:1.14.0=testCompileClasspath,testRuntimeClasspath
111-
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
107+
org.junit.jupiter:junit-jupiter-api:5.14.0=testRuntimeClasspath
108+
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath
109+
org.junit.platform:junit-platform-commons:1.14.0=testRuntimeClasspath
110+
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath
111+
org.junit.platform:junit-platform-engine:1.14.0=testRuntimeClasspath
112+
org.junit:junit-bom:5.12.2=testCompileClasspath
113+
org.junit:junit-bom:5.14.0=runtimeClasspath,spotbugs,testRuntimeClasspath
112114
org.mockito:mockito-core:4.11.0=testCompileClasspath,testRuntimeClasspath
113115
org.mockito:mockito-inline:4.11.0=testCompileClasspath,testRuntimeClasspath
114116
org.objenesis:objenesis:3.3=runtimeClasspath,testRuntimeClasspath
@@ -133,5 +135,4 @@ org.spockframework:spock-core:2.4-M6-groovy-3.0=testCompileClasspath,testRuntime
133135
org.xmlresolver:xmlresolver:5.2.2=checkstyle
134136
org.xmlresolver:xmlresolver:5.3.3=spotbugs
135137
org.yaml:snakeyaml:1.33=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
136-
ru.vyarus:spock-junit5:1.0.1=testCompileClasspath,testRuntimeClasspath
137138
empty=signatures,spotbugsPlugins

‎realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeAccountsConnectionTest.groovy‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
package com.mx.path.service.connection.realtime
22

3-
import static com.mx.path.testing.WithRequestExpectationsExtension.expectConnection
4-
import static com.mx.path.testing.WithRequestExpectationsExtension.setupConnection
5-
import static com.mx.path.testing.WithRequestExpectationsExtension.withPath
63
import static org.mockito.Mockito.mock
74
import static org.mockito.Mockito.when
85

96
import com.mx.path.core.common.accessor.UnauthorizedException
107
import com.mx.path.core.common.http.HttpStatus
118
import com.mx.path.core.common.http.MediaType
129
import com.mx.path.service.connection.realtime.model.MdxAccount
13-
import com.mx.path.testing.WithRequestExpectationsExtension
10+
import com.mx.path.testing.Mockery
1411

15-
import org.junit.jupiter.api.extension.ExtendWith
16-
17-
import spock.lang.Specification
18-
19-
@ExtendWith(WithRequestExpectationsExtension.class)
20-
class MdxRealtimeAccountsConnectionTest extends Specification {
12+
class MdxRealtimeAccountsConnectionTest extends Mockery {
2113
MdxRealtimeAccountsConnection subject
2214
MdxRealtimeConnection connection
2315

‎realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeMembersConnectionTest.groovy‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,14 @@
11
package com.mx.path.service.connection.realtime
22

3-
import static com.mx.path.testing.WithRequestExpectationsExtension.expectConnection
4-
import static com.mx.path.testing.WithRequestExpectationsExtension.setupConnection
5-
import static com.mx.path.testing.WithRequestExpectationsExtension.withPath
63
import static org.mockito.Mockito.mock
74
import static org.mockito.Mockito.when
85

96
import com.mx.path.core.common.accessor.UnauthorizedException
107
import com.mx.path.core.common.http.HttpStatus
118
import com.mx.path.service.connection.realtime.model.MdxMember
12-
import com.mx.path.testing.WithRequestExpectationsExtension
9+
import com.mx.path.testing.Mockery
1310

14-
import org.junit.jupiter.api.extension.ExtendWith
15-
16-
import spock.lang.Specification
17-
18-
@ExtendWith(WithRequestExpectationsExtension.class)
19-
class MdxRealtimeMembersConnectionTest extends Specification {
11+
class MdxRealtimeMembersConnectionTest extends Mockery {
2012
MdxRealtimeMembersConnection subject
2113
MdxRealtimeConnection connection
2214

‎realtime/src/test/groovy/com/mx/path/service/connection/realtime/MdxRealtimeUsersConnectionTest.groovy‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11
package com.mx.path.service.connection.realtime
22

3-
import static com.mx.path.testing.WithRequestExpectationsExtension.*
43
import static org.mockito.Mockito.mock
54
import static org.mockito.Mockito.when
65

76
import com.mx.path.connect.messaging.remote.models.RemoteUser
87
import com.mx.path.core.common.accessor.UnauthorizedException
98
import com.mx.path.core.common.http.HttpStatus
109
import com.mx.path.service.connection.realtime.model.MdxUser
11-
import com.mx.path.testing.WithRequestExpectationsExtension
10+
import com.mx.path.testing.Mockery
1211

13-
import org.junit.jupiter.api.extension.ExtendWith
14-
15-
import spock.lang.Specification
16-
17-
@ExtendWith(WithRequestExpectationsExtension.class)
18-
class MdxRealtimeUsersConnectionTest extends Specification {
12+
class MdxRealtimeUsersConnectionTest extends Mockery {
1913
MdxRealtimeUsersConnection subject
2014
MdxRealtimeConnection connection
2115

0 commit comments

Comments
 (0)