Skip to content

Commit d2a3cf4

Browse files
build(deps): bump org.junit.jupiter:junit-jupiter from 5.11.4 to 5.12.0 (#529)
* build(deps): bump org.junit.jupiter:junit-jupiter from 5.11.4 to 5.12.0 Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) from 5.11.4 to 5.12.0. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](junit-team/junit-framework@r5.11.4...r5.12.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Stuck on junit < 5.12.0 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Geoff Bourne <[email protected]>
1 parent 673fa6c commit d2a3cf4

File tree

1 file changed

+98
-92
lines changed

1 file changed

+98
-92
lines changed

build.gradle

Lines changed: 98 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,136 @@
11
plugins {
2-
id 'java'
3-
id 'application'
4-
id 'idea'
5-
id "io.freefair.lombok" version '8.12.2'
6-
// https://github.com/qoomon/gradle-git-versioning-plugin
7-
id 'me.qoomon.git-versioning' version '6.4.4'
8-
// https://github.com/itzg/github-releaser-gradle-plugin
9-
id 'io.github.itzg.github-releaser' version '0.2.1'
10-
// https://github.com/ben-manes/gradle-versions-plugin
11-
id 'com.github.ben-manes.versions' version '0.52.0'
2+
id 'java'
3+
id 'application'
4+
id 'idea'
5+
id "io.freefair.lombok" version '8.12.2'
6+
// https://github.com/qoomon/gradle-git-versioning-plugin
7+
id 'me.qoomon.git-versioning' version '6.4.4'
8+
// https://github.com/itzg/github-releaser-gradle-plugin
9+
id 'io.github.itzg.github-releaser' version '0.2.1'
10+
// https://github.com/ben-manes/gradle-versions-plugin
11+
id 'com.github.ben-manes.versions' version '0.52.0'
1212
}
1313

1414
group = 'io.github.itzg'
1515
description = 'This tool does the complicated bits for itzg/minecraft-server'
1616

1717
version = '0.0.1-SNAPSHOT'
1818
gitVersioning.apply {
19-
refs {
20-
tag('.+') {
21-
version = '${ref}'
22-
}
23-
branch('main') {
24-
version = '0.0.0-${describe.tag}-SNAPSHOT'
25-
}
26-
branch('.+') {
27-
version = '0.0.0-${ref}-SNAPSHOT'
28-
}
19+
refs {
20+
tag('.+') {
21+
version = '${ref}'
2922
}
30-
31-
// optional fallback configuration in case of no matching ref configuration
32-
rev {
33-
version = '${commit}'
23+
branch('main') {
24+
version = '0.0.0-${describe.tag}-SNAPSHOT'
25+
}
26+
branch('.+') {
27+
version = '0.0.0-${ref}-SNAPSHOT'
3428
}
29+
}
30+
31+
// optional fallback configuration in case of no matching ref configuration
32+
rev {
33+
version = '${commit}'
34+
}
3535

3636
}
3737

3838
jar {
39-
manifest {
40-
attributes(
41-
"Implementation-Title": 'mc-image-helper',
42-
"Implementation-Version": project.version
43-
)
44-
}
39+
manifest {
40+
attributes(
41+
"Implementation-Title": 'mc-image-helper',
42+
"Implementation-Version": project.version
43+
)
44+
}
4545
}
4646

4747
java {
48-
sourceCompatibility = JavaVersion.VERSION_1_8
48+
sourceCompatibility = JavaVersion.VERSION_1_8
4949
}
5050

5151
test {
52-
useJUnitPlatform()
52+
useJUnitPlatform()
5353

54-
// Can set with -PmockServerLogLevel=info
55-
systemProperty 'mockServerLogLevel', findProperty('mockServerLogLevel') ?: 'warn'
56-
systemProperty 'testEnableManualTests', findProperty('testEnableManualTests') ?: 'false'
54+
// Can set with -PmockServerLogLevel=info
55+
systemProperty 'mockServerLogLevel', findProperty('mockServerLogLevel') ?: 'warn'
56+
systemProperty 'testEnableManualTests', findProperty('testEnableManualTests') ?: 'false'
5757
}
5858

5959
application {
60-
mainClass = 'me.itzg.helpers.McImageHelper'
60+
mainClass = 'me.itzg.helpers.McImageHelper'
6161
}
6262

6363
project.tasks.distTar {
64-
compression = Compression.GZIP
64+
compression = Compression.GZIP
6565
}
6666

6767
idea {
68-
module {
69-
downloadJavadoc = true
70-
}
68+
module {
69+
downloadJavadoc = true
70+
}
7171
}
7272

7373
repositories {
74-
mavenLocal()
75-
mavenCentral()
74+
mavenLocal()
75+
mavenCentral()
7676
}
7777

7878
dependencies {
79-
def picocliVersion = '4.7.6'
80-
81-
implementation(platform('com.fasterxml.jackson:jackson-bom:2.18.2'))
82-
// 1.4.+ requires Java 11 and we are stuck on 8
83-
implementation(platform('ch.qos.logback:logback-parent:[1.3.5,1.4)'))
84-
85-
implementation 'ch.qos.logback:logback-core'
86-
implementation 'ch.qos.logback:logback-classic'
87-
implementation "info.picocli:picocli:${picocliVersion}"
88-
implementation 'org.fusesource.jansi:jansi:2.4.1'
89-
implementation 'com.fasterxml.jackson.core:jackson-databind'
90-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
91-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
92-
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml'
93-
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
94-
// https://github.com/mbknor/mbknor-jackson-jsonSchema
95-
implementation 'com.kjetland:mbknor-jackson-jsonschema_2.13:1.0.39'
96-
implementation 'com.jayway.jsonpath:json-path:2.9.0'
97-
implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
98-
implementation 'io.projectreactor.netty:reactor-netty-http:1.2.3'
99-
implementation 'org.apache.maven:maven-artifact:3.9.9'
100-
implementation 'commons-codec:commons-codec:1.18.0'
101-
// for RFC5987 parsing of content-disposition filename*
102-
// 3.5.x is last of Java8 compatible: https://cxf.apache.org/download.html
103-
implementation 'org.apache.cxf:cxf-core:[3.5.6,3.6.0)'
104-
implementation 'org.jetbrains:annotations:26.0.2'
105-
106-
// https://commons.apache.org/proper/commons-compress/zip.html
107-
// For IMPLODE compression used by some CurseForge modpacks
108-
implementation 'org.apache.commons:commons-compress:1.27.1'
109-
110-
testImplementation 'org.assertj:assertj-core:3.27.3'
111-
// https://github.com/webcompere/model-assert
112-
// for json assertions
113-
testImplementation 'uk.org.webcompere:model-assert:1.1.0'
114-
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'
115-
testImplementation 'org.mockito:mockito-junit-jupiter:5.15.2'
116-
// would like to transition these to wiremock
117-
testImplementation 'org.mock-server:mockserver-junit-jupiter:5.15.0'
118-
// https://github.com/wiremock/wiremock/releases/tag/3.0.0 drops support for Java 8
119-
testImplementation 'com.github.tomakehurst:wiremock-jre8:[2.35.1,3.0.0)'
120-
// https://github.com/stefanbirkner/system-lambda
121-
testImplementation 'com.github.stefanbirkner:system-lambda:1.2.1'
122-
123-
annotationProcessor "info.picocli:picocli-codegen:${picocliVersion}"
79+
def picocliVersion = '4.7.6'
80+
81+
implementation(platform('com.fasterxml.jackson:jackson-bom:2.18.2'))
82+
// 1.4.+ requires Java 11 and we are stuck on 8
83+
implementation(platform('ch.qos.logback:logback-parent:[1.3.5,1.4)'))
84+
85+
implementation 'ch.qos.logback:logback-core'
86+
implementation 'ch.qos.logback:logback-classic'
87+
implementation "info.picocli:picocli:${picocliVersion}"
88+
implementation 'org.fusesource.jansi:jansi:2.4.1'
89+
implementation 'com.fasterxml.jackson.core:jackson-databind'
90+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
91+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
92+
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-toml'
93+
implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'
94+
// https://github.com/mbknor/mbknor-jackson-jsonSchema
95+
implementation 'com.kjetland:mbknor-jackson-jsonschema_2.13:1.0.39'
96+
implementation 'com.jayway.jsonpath:json-path:2.9.0'
97+
implementation 'org.apache.httpcomponents.client5:httpclient5:5.4.2'
98+
implementation 'io.projectreactor.netty:reactor-netty-http:1.2.3'
99+
implementation 'org.apache.maven:maven-artifact:3.9.9'
100+
implementation 'commons-codec:commons-codec:1.18.0'
101+
// for RFC5987 parsing of content-disposition filename*
102+
// 3.5.x is last of Java8 compatible: https://cxf.apache.org/download.html
103+
implementation 'org.apache.cxf:cxf-core:[3.5.6,3.6.0)'
104+
implementation 'org.jetbrains:annotations:26.0.2'
105+
106+
// https://commons.apache.org/proper/commons-compress/zip.html
107+
// For IMPLODE compression used by some CurseForge modpacks
108+
implementation 'org.apache.commons:commons-compress:1.27.1'
109+
110+
testImplementation 'org.assertj:assertj-core:3.27.3'
111+
// https://github.com/webcompere/model-assert
112+
// for json assertions
113+
testImplementation 'uk.org.webcompere:model-assert:1.1.0'
114+
115+
// https://junit.org/junit5/docs/current/user-guide/#running-tests-build-gradle-bom
116+
// stuck < 5.12.0 due to Java 8
117+
testImplementation(platform("org.junit:junit-bom:[5.11.4,5.12.0)"))
118+
testImplementation 'org.junit.jupiter:junit-jupiter'
119+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
120+
121+
testImplementation 'org.mockito:mockito-junit-jupiter:5.15.2'
122+
// would like to transition these to wiremock
123+
testImplementation 'org.mock-server:mockserver-junit-jupiter:5.15.0'
124+
// https://github.com/wiremock/wiremock/releases/tag/3.0.0 drops support for Java 8
125+
testImplementation 'com.github.tomakehurst:wiremock-jre8:[2.35.1,3.0.0)'
126+
// https://github.com/stefanbirkner/system-lambda
127+
testImplementation 'com.github.stefanbirkner:system-lambda:1.2.1'
128+
129+
annotationProcessor "info.picocli:picocli-codegen:${picocliVersion}"
124130
}
125131

126132
java {
127-
sourceCompatibility = JavaVersion.VERSION_1_8
133+
sourceCompatibility = JavaVersion.VERSION_1_8
128134
}
129135

130136
compileJava {
@@ -136,8 +142,8 @@ compileTestJava {
136142
}
137143

138144
githubReleaser {
139-
project {
140-
homepage = 'https://github.com/itzg/mc-image-helper'
141-
license = 'MIT'
142-
}
145+
project {
146+
homepage = 'https://github.com/itzg/mc-image-helper'
147+
license = 'MIT'
148+
}
143149
}

0 commit comments

Comments
 (0)