Skip to content

Commit b2f8c97

Browse files
tomasbjerretomasbjerre
committed
feat: upgrading dependencies
1 parent eea3951 commit b2f8c97

File tree

15 files changed

+130
-126
lines changed

15 files changed

+130
-126
lines changed

‎build.gradle

+96-106
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,110 @@
1-
apply plugin: 'java-library'
2-
31
buildscript {
4-
repositories {
5-
mavenCentral()
6-
mavenLocal()
7-
}
8-
dependencies {
9-
classpath 'se.bjurr.gradle:gradle-scripts:2.+'
10-
classpath "org.springframework.boot:spring-boot-gradle-plugin:3.2.5"
11-
}
2+
repositories {
3+
maven { url "https://plugins.gradle.org/m2/" }
4+
mavenCentral()
5+
mavenLocal()
6+
}
7+
dependencies {
8+
classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.3.4'
9+
classpath "se.bjurr.gradle:conventional-release-gradle-plugin:0.+"
10+
classpath "se.bjurr.gradle:update-versions-gradle-plugin:0.+"
11+
classpath "se.bjurr.gradle:java-convention-gradle-plugin:0.+"
12+
}
1213
}
1314

15+
apply plugin: "se.bjurr.gradle.conventional-release"
16+
1417
allprojects {
15-
apply plugin: 'java-library'
16-
17-
project.ext.buildConfig = [
18-
repoType: "DEFAULT",
19-
sourceCompatibility: 17,
20-
targetCompatibility: 17,
21-
staticCodeAnalysis: [
22-
maxViolations: 0
23-
]
24-
]
25-
apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
26-
27-
test {
28-
useJUnitPlatform()
29-
}
30-
31-
dependencies {
32-
testImplementation 'org.assertj:assertj-core:3.25.3'
33-
testImplementation platform('org.junit:junit-bom:5.10.2')
34-
testImplementation 'org.junit.jupiter:junit-jupiter'
35-
testImplementation 'org.junit.platform:junit-platform-launcher'
36-
}
18+
apply plugin: "se.bjurr.gradle.java-convention"
19+
apply plugin: "se.bjurr.gradle.update-versions"
20+
21+
dependencies {
22+
testImplementation 'org.assertj:assertj-core:3.26.3'
23+
testImplementation platform('org.junit:junit-bom:5.11.2')
24+
testImplementation 'org.junit.jupiter:junit-jupiter'
25+
testImplementation 'org.junit.platform:junit-platform-launcher'
26+
}
3727
}
3828

3929
project('wiremock-pact-lib', {
40-
def classpathTest = sourceSets.create('classpathTest')
41-
configurations[classpathTest.implementationConfigurationName].extendsFrom(configurations.runtimeClasspath)
42-
def classpathTestTask = tasks.register('classpathTest', Test) {
43-
description = 'Tests that the excluded transitives does not break the library.'
44-
group = 'verification'
45-
useJUnitPlatform()
46-
47-
testClassesDirs = classpathTest.output.classesDirs
48-
classpath = configurations[classpathTest.runtimeClasspathConfigurationName] + classpathTest.output
49-
50-
shouldRunAfter(tasks.named('test'))
51-
}
52-
53-
tasks.named('check') {
54-
dependsOn(classpathTestTask)
55-
}
56-
57-
dependencies {
58-
compileOnly 'org.wiremock:wiremock:3.5.4'
59-
implementation('au.com.dius.pact.core:model:4.6.9') {
60-
exclude group: "org.apache.groovy", module: "groovy-xml"
61-
exclude group: "org.apache.commons", module: "commons-collections4"
62-
exclude group: "org.apache.httpcomponents.client5", module: "httpclient5"
63-
exclude group: "org.apache.httpcomponents.client5", module: "httpclient5-fluent"
64-
exclude group: "com.google.guava", module: "guava"
65-
exclude group: "commons-codec", module: "commons-codec"
66-
exclude group: "io.ktor", module: "ktor-http-jvm"
67-
exclude group: "com.github.mifmif", module: "generex"
68-
exclude group: "javax.mail", module: "mail"
69-
exclude group: "commons-beanutils", module: "commons-beanutils"
70-
exclude group: "au.com.dius.pact.core", module: "pactbroker"
71-
}
72-
73-
testImplementation 'org.wiremock:wiremock:3.5.4'
74-
testImplementation "io.rest-assured:rest-assured:5.4.0"
75-
76-
classpathTestImplementation project
77-
classpathTestImplementation 'org.wiremock:wiremock:3.5.4'
78-
classpathTestImplementation 'org.assertj:assertj-core:3.25.3'
79-
classpathTestImplementation platform('org.junit:junit-bom:5.10.2')
80-
classpathTestImplementation 'org.junit.jupiter:junit-jupiter'
81-
classpathTestImplementation 'org.junit.platform:junit-platform-launcher'
82-
}
30+
def classpathTest = sourceSets.create('classpathTest')
31+
configurations[classpathTest.implementationConfigurationName].extendsFrom(configurations.runtimeClasspath)
32+
def classpathTestTask = tasks.register('classpathTest', Test) {
33+
description = 'Tests that the excluded transitives does not break the library.'
34+
group = 'verification'
35+
useJUnitPlatform()
36+
37+
testClassesDirs = classpathTest.output.classesDirs
38+
classpath = configurations[classpathTest.runtimeClasspathConfigurationName] + classpathTest.output
39+
40+
shouldRunAfter(tasks.named('test'))
41+
}
42+
43+
tasks.named('check') {
44+
dependsOn(classpathTestTask)
45+
}
46+
47+
dependencies {
48+
compileOnly 'org.wiremock:wiremock:3.9.1'
49+
implementation('au.com.dius.pact.core:model:4.6.14') {
50+
exclude group: "org.apache.groovy", module: "groovy-xml"
51+
exclude group: "org.apache.commons", module: "commons-collections4"
52+
exclude group: "org.apache.httpcomponents.client5", module: "httpclient5"
53+
exclude group: "org.apache.httpcomponents.client5", module: "httpclient5-fluent"
54+
exclude group: "com.google.guava", module: "guava"
55+
exclude group: "commons-codec", module: "commons-codec"
56+
exclude group: "io.ktor", module: "ktor-http-jvm"
57+
exclude group: "com.github.mifmif", module: "generex"
58+
exclude group: "javax.mail", module: "mail"
59+
exclude group: "commons-beanutils", module: "commons-beanutils"
60+
exclude group: "au.com.dius.pact.core", module: "pactbroker"
61+
}
62+
63+
testImplementation 'org.wiremock:wiremock:3.9.1'
64+
testImplementation 'io.rest-assured:rest-assured:5.5.0'
65+
66+
classpathTestImplementation project
67+
classpathTestImplementation 'org.wiremock:wiremock:3.9.1'
68+
classpathTestImplementation 'org.assertj:assertj-core:3.26.3'
69+
classpathTestImplementation platform('org.junit:junit-bom:5.11.2')
70+
classpathTestImplementation 'org.junit.jupiter:junit-jupiter'
71+
classpathTestImplementation 'org.junit.platform:junit-platform-launcher'
72+
}
8373
})
8474

8575
project('wiremock-pact-extension-junit5', {
86-
dependencies {
87-
api project(':wiremock-pact-lib')
88-
compileOnly platform('org.junit:junit-bom:5.10.2')
89-
compileOnly 'org.junit.jupiter:junit-jupiter'
90-
compileOnly 'org.wiremock:wiremock:3.5.4'
91-
92-
testImplementation 'org.wiremock:wiremock:3.5.4'
93-
}
76+
dependencies {
77+
api project(':wiremock-pact-lib')
78+
compileOnly platform('org.junit:junit-bom:5.11.2')
79+
compileOnly 'org.junit.jupiter:junit-jupiter'
80+
compileOnly 'org.wiremock:wiremock:3.9.1'
81+
82+
testImplementation 'org.wiremock:wiremock:3.9.1'
83+
}
9484
})
9585

9686
project('wiremock-pact-example-springboot-app', {
97-
apply plugin: "org.springframework.boot"
98-
apply plugin: 'io.spring.dependency-management'
99-
100-
dependencies {
101-
implementation 'org.springframework.boot:spring-boot-starter-web'
102-
implementation 'org.springframework.boot:spring-boot-starter-actuator'
103-
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
104-
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.0'
105-
implementation 'com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.17.0'
106-
implementation 'org.jboss.resteasy:resteasy-client:6.2.8.Final'
107-
108-
testImplementation project(':wiremock-pact-extension-junit5')
109-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
110-
testImplementation 'com.maciejwalkowiak.spring:wiremock-spring-boot:2.1.2'
111-
}
112-
113-
bootJar {
114-
enabled = false
115-
}
116-
117-
jar {
118-
enabled = true
119-
}
87+
apply plugin: "org.springframework.boot"
88+
apply plugin: 'io.spring.dependency-management'
89+
90+
dependencies {
91+
implementation 'org.springframework.boot:spring-boot-starter-web'
92+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
93+
implementation 'jakarta.ws.rs:jakarta.ws.rs-api:4.0.0'
94+
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.0'
95+
implementation 'com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.18.0'
96+
implementation 'org.jboss.resteasy:resteasy-client:6.2.10.Final'
97+
98+
testImplementation project(':wiremock-pact-extension-junit5')
99+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
100+
testImplementation 'com.maciejwalkowiak.spring:wiremock-spring-boot:2.1.3'
101+
}
102+
103+
bootJar {
104+
enabled = false
105+
}
106+
107+
jar {
108+
enabled = true
109+
}
120110
})

‎gradle.properties

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
#Mon Sep 16 17:49:33 CEST 2024
1+
#
2+
#Fri Oct 04 17:52:54 CEST 2024
23
description="Transform Wiremock mappings to PACT."
3-
version=0.6.1
44
group=se.bjurr.wiremockpact
5+
version=0.6.2

‎settings.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1-
rootProject.name = 'wiremock-pact'
1+
pluginManagement {
2+
repositories {
3+
mavenLocal()
4+
mavenCentral()
5+
gradlePluginPortal()
6+
}
7+
}
8+
9+
rootProject.name = 'wiremock-pact'
210

311
include 'wiremock-pact-lib', 'wiremock-pact-extension-junit5', 'wiremock-pact-example-springboot-app'

‎wiremock-pact-example-springboot-app/src/test/resources/pact-json/WireMockPactExample-UnknownProvider.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
],
121121
"metadata": {
122122
"pact-jvm": {
123-
"version": "4.6.9"
123+
"version": "4.6.14"
124124
},
125125
"pactSpecification": {
126126
"version": "4.0"

‎wiremock-pact-example-springboot-app/src/test/resources/pact-json/WireMockPactExample-some-other-system.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
],
4646
"metadata": {
4747
"pact-jvm": {
48-
"version": "4.6.9"
48+
"version": "4.6.14"
4949
},
5050
"pactSpecification": {
5151
"version": "4.0"

‎wiremock-pact-example-springboot-app/src/test/resources/wiremock/mappings/get-animal_1.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515
"metadata": {
1616
"wireMockPactSettings": {
1717
"provider": "some-other-system",
18-
"providerStates": ["state1"]
18+
"providerStates": [
19+
"state1"
20+
]
1921
}
2022
}
2123
}

‎wiremock-pact-example-springboot-app/src/test/resources/wiremock/mappings/get-animals.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
"uuid": "d68fb4e2-48ed-40d2-bc73-0a18f54f3ece",
1515
"metadata": {
1616
"wireMockPactSettings": {
17-
"providerStates": ["state1", "state2"]
17+
"providerStates": [
18+
"state1",
19+
"state2"
20+
]
1821
}
1922
}
2023
}

‎wiremock-pact-lib/src/classpathTest/java/se/bjurr/wiremockpact/wiremockpact/test/ClasspathTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public static void after() {
229229
],
230230
"metadata": {
231231
"pact-jvm": {
232-
"version": "4.6.9"
232+
"version": "4.6.14"
233233
},
234234
"pactSpecification": {
235235
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ExampleTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public static void after() {
144144
],
145145
"metadata": {
146146
"pact-jvm": {
147-
"version": "4.6.9"
147+
"version": "4.6.14"
148148
},
149149
"pactSpecification": {
150150
"version": "4.0"
@@ -206,7 +206,7 @@ public static void after() {
206206
],
207207
"metadata": {
208208
"pact-jvm": {
209-
"version": "4.6.9"
209+
"version": "4.6.14"
210210
},
211211
"pactSpecification": {
212212
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/GetTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testThatSingleGetRequestCanGeneratePact() {
6363
],
6464
"metadata": {
6565
"pact-jvm": {
66-
"version": "4.6.9"
66+
"version": "4.6.14"
6767
},
6868
"pactSpecification": {
6969
"version": "4.0"
@@ -197,7 +197,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations() {
197197
],
198198
"metadata": {
199199
"pact-jvm": {
200-
"version": "4.6.9"
200+
"version": "4.6.14"
201201
},
202202
"pactSpecification": {
203203
"version": "4.0"
@@ -353,7 +353,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations_query() {
353353
],
354354
"metadata": {
355355
"pact-jvm": {
356-
"version": "4.6.9"
356+
"version": "4.6.14"
357357
},
358358
"pactSpecification": {
359359
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/HeadersTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public void testThatSingleHeaderIsRecorded() {
7575
],
7676
"metadata": {
7777
"pact-jvm": {
78-
"version": "4.6.9"
78+
"version": "4.6.14"
7979
},
8080
"pactSpecification": {
8181
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/NotMatchedTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testRequestNotMatching() {
6363
],
6464
"metadata": {
6565
"pact-jvm": {
66-
"version": "4.6.9"
66+
"version": "4.6.14"
6767
},
6868
"pactSpecification": {
6969
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/PostTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void testThatSingleGetRequestCanGeneratePact() {
7676
],
7777
"metadata": {
7878
"pact-jvm": {
79-
"version": "4.6.9"
79+
"version": "4.6.14"
8080
},
8181
"pactSpecification": {
8282
"version": "4.0"
@@ -249,7 +249,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations() {
249249
],
250250
"metadata": {
251251
"pact-jvm": {
252-
"version": "4.6.9"
252+
"version": "4.6.14"
253253
},
254254
"pactSpecification": {
255255
"version": "4.0"
@@ -444,7 +444,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations_query() {
444444
],
445445
"metadata": {
446446
"pact-jvm": {
447-
"version": "4.6.9"
447+
"version": "4.6.14"
448448
},
449449
"pactSpecification": {
450450
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/QueryParamsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testThatSingleHeaderIsRecorded() {
7070
],
7171
"metadata": {
7272
"pact-jvm": {
73-
"version": "4.6.9"
73+
"version": "4.6.14"
7474
},
7575
"pactSpecification": {
7676
"version": "4.0"

‎wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ScenarioTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void testThatProviderStateIsSetFromScenario() {
184184
],
185185
"metadata": {
186186
"pact-jvm": {
187-
"version": "4.6.9"
187+
"version": "4.6.14"
188188
},
189189
"pactSpecification": {
190190
"version": "4.0"

0 commit comments

Comments
 (0)