Skip to content

Commit 7eb238e

Browse files
committed
chore: using splitted convention plugins
1 parent 3c91092 commit 7eb238e

File tree

4 files changed

+23
-30
lines changed

4 files changed

+23
-30
lines changed

build.gradle

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
1-
buildscript {
2-
repositories {
3-
gradlePluginPortal()
4-
mavenCentral()
5-
mavenLocal()
6-
}
7-
dependencies {
8-
classpath "se.bjurr.gradle.java-convention:se.bjurr.gradle.java-convention.gradle.plugin:0.+"
9-
classpath "org.wiremock.tools.gradle:gradle-wiremock-extension-plugins:0.4.0"
10-
}
1+
plugins {
2+
id "se.bjurr.gradle.java-convention"
3+
id "org.wiremock.tools.gradle.publishing"
4+
id "org.wiremock.tools.gradle.java"
5+
id "project-report"
116
}
127

13-
apply plugin: "project-report"
14-
apply plugin: "se.bjurr.gradle.java-convention"
15-
16-
// Or else it will be 11 in wiremock-extension-convention
178
sourceCompatibility = 17
189
targetCompatibility = 17
19-
apply plugin: "org.wiremock.tools.gradle.wiremock-extension-convention"
20-
2110

2211
group 'org.wiremock.integrations'
2312

@@ -28,9 +17,6 @@ jar {
2817
}
2918
}
3019

31-
// Because older version is set in wiremock-extension-convention
32-
def wiremockVersion = "3.13.0"
33-
3420
configurations {
3521
all*.exclude group: 'org.eclipse.jetty', module: 'jetty-servlet'
3622
all*.exclude group: 'org.eclipse.jetty', module: 'jetty-servlets'
@@ -40,14 +26,13 @@ configurations {
4026

4127
dependencies {
4228
implementation platform("org.eclipse.jetty:jetty-bom:12.0.15")
43-
api "org.wiremock:wiremock-jetty12:${wiremockVersion}"
44-
29+
api "org.wiremock:wiremock-jetty12:3.13.0"
4530
api "org.springframework.boot:spring-boot-test:3.4.1"
4631
api "org.springframework:spring-test:6.1.13"
4732
api "org.slf4j:slf4j-api:2.0.16"
4833
api 'org.junit.jupiter:junit-jupiter-api:5.11.2'
4934

50-
testImplementation "org.wiremock:wiremock-jetty12:${wiremockVersion}"
35+
testImplementation "org.wiremock:wiremock-jetty12:3.13.0"
5136
testImplementation "org.springframework.boot:spring-boot-starter-test:3.4.1"
5237
testImplementation 'org.assertj:assertj-core:3.26.3'
5338
testImplementation platform('org.junit:junit-bom:5.11.2')
@@ -68,10 +53,3 @@ dependencies {
6853
}
6954
}
7055
}
71-
72-
// Not using shadowJar, but currently not possible to disable in wiremock-extension-convention
73-
shadowJar {
74-
mergeServiceFiles()
75-
76-
exclude '**/*'
77-
}

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ githubRepo=wiremock-spring-boot
88
developer.id=tomasbjerre
99
developer.name=Tomas Bjerre
1010
developer.email=tomas.bjerre85@gmail.com
11+
useShadowJar=false

settings.gradle

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,15 @@
1+
pluginManagement {
2+
repositories {
3+
mavenLocal()
4+
mavenCentral()
5+
gradlePluginPortal()
6+
}
7+
}
8+
9+
plugins {
10+
id "se.bjurr.gradle.java-convention" version "0.+" apply false
11+
id "org.wiremock.tools.gradle.publishing" version "latest-SNAPSHOT" apply false
12+
id "org.wiremock.tools.gradle.java" version "latest-SNAPSHOT" apply false
13+
}
14+
115
rootProject.name = 'wiremock-spring-boot'

src/test/java/test/ConfigurationValidationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package test;
22

33
import static org.assertj.core.api.Assertions.assertThat;
4-
import static org.junit.Assert.assertThrows;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
55

66
import org.junit.jupiter.api.Test;
77
import org.springframework.test.context.ContextCustomizer;

0 commit comments

Comments
 (0)