chore: using splitted convention plugins (#99)

Author: tomasbjerre

.github/workflows/build-and-test.yml

@@ -29,7 +29,7 @@ jobs:
         run: |
           java -version
           javac -version
-          ./gradlew --no-daemon check -x shadowJar
+          ./gradlew --no-daemon check
 
       - name: Publish Build
         uses: actions/upload-artifact@v4

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
         id: publish_package
         uses: gradle/[email protected]
         with:
-          arguments: -Pversion=${{ steps.new_version.outputs.new_version }} publish closeAndReleaseStagingRepository -x shadowJar -x publishStandaloneJarPublicationToGitHubPackagesRepository -x publishStandaloneJarPublicationToSonatypeRepository
+          arguments: -Pversion=${{ steps.new_version.outputs.new_version }} publish closeAndReleaseStagingRepository -x publishStandaloneJarPublicationToGitHubPackagesRepository -x publishStandaloneJarPublicationToSonatypeRepository
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           OSSRH_USERNAME: ${{ vars.MAVEN_CENTRAL_USERNAME }}

build.gradle

@@ -1,23 +1,12 @@
-buildscript {
-	repositories {
-		gradlePluginPortal()
-		mavenCentral()
-		mavenLocal()
-	}
-	dependencies {
-		classpath "se.bjurr.gradle.java-convention:se.bjurr.gradle.java-convention.gradle.plugin:0.+"
-		classpath "org.wiremock.tools.gradle:gradle-wiremock-extension-plugins:0.5.1"
-	}
+plugins {
+	id "se.bjurr.gradle.java-convention" version "0.+"
+	id "org.wiremock.tools.gradle.publishing" version "0.5.1"
+	id "org.wiremock.tools.gradle.java" version "0.5.1"
+	id "project-report"
 }
 
-apply plugin: "project-report"
-apply plugin: "se.bjurr.gradle.java-convention"
-
-// Or else it will be 11 in wiremock-extension-convention
 sourceCompatibility = 17
 targetCompatibility = 17
-apply plugin: "org.wiremock.tools.gradle.wiremock-extension-convention"
-
 
 group 'org.wiremock.integrations'
 
@@ -41,7 +30,6 @@ configurations {
 dependencies {
 	implementation platform("org.eclipse.jetty:jetty-bom:12.0.15")
 	api "org.wiremock:wiremock-jetty12:${wiremockVersion}"
-
 	api "org.springframework.boot:spring-boot-test:3.4.1"
 	api "org.springframework:spring-test:6.1.13"
 	api "org.slf4j:slf4j-api:2.0.16"
@@ -68,10 +56,3 @@ dependencies {
 		}
 	}
 }
-
-// Not using shadowJar, but currently not possible to disable in wiremock-extension-convention
-shadowJar {
-	mergeServiceFiles()
-
-	exclude '**/*'
-}

gradle.properties

@@ -8,3 +8,4 @@ githubRepo=wiremock-spring-boot
 developer.id=tomasbjerre
 developer.name=Tomas Bjerre
 developer.email=[email protected]
+useShadowJar=false

settings.gradle

@@ -1 +1,9 @@
+pluginManagement {
+	repositories {
+		mavenLocal()
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}
+
 rootProject.name = 'wiremock-spring-boot'

src/test/java/test/ConfigurationValidationTest.java

@@ -1,7 +1,7 @@
 package test;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.test.context.ContextCustomizer;