Merge pull request #31 from wiremock/wiremock-4-upgrade

upgrade to wiremock 4 and new maven central publishing.

Author: RafeArnold

README.md

@@ -13,7 +13,7 @@ Features:
 ## Requirements
 
 - Gradle 8.x
-- Java 11 or 17
+- Java 17
 
 ## WireMock dependency
 
@@ -22,6 +22,7 @@ in your plugin, this plugin needs to be updated accordingly:
 
 | Gradle Convention plugin version | Wiremock version |
 |----------------------------------|------------------|
+| 0.6.0+                           | 4.0.0            |
 | 0.4.0+                           | 3.10.0           |
 | 0.3.0+                           | 3.6.0            |
 | 0.1.0+                           | 3.3.1            |
@@ -125,7 +126,7 @@ jobs:
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
-          java-version: '11'
+          java-version: '17'
           distribution: 'adopt'
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
@@ -140,11 +141,11 @@ jobs:
         id: publish_package
         uses: gradle/gradle-build-action@v2.9.0
         with:
-          arguments: -Pversion=${{ steps.new_version.outputs.new_version }} publish closeAndReleaseStagingRepository
+          arguments: -Pversion=${{ steps.new_version.outputs.new_version }} publishAndReleaseToMavenCentral --no-configuration-cache
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ vars.MAVEN_CENTRAL_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_TOKEN }}
           OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
           OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
 ```

build.gradle.kts

@@ -11,15 +11,15 @@ plugins {
     id("com.gradle.plugin-publish") version "1.3.1"
     id("com.palantir.git-version") version "4.0.0" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.github.gradle-nexus.publish-plugin") version "2.0.0" apply false
+    id("com.vanniktech.maven.publish.base") version "0.35.0" apply false
     id("com.github.ben-manes.versions") version "0.52.0"
 }
 
 group = "org.wiremock.tools.gradle"
 
 java {
     toolchain {
-        languageVersion.set(JavaLanguageVersion.of(11))
+        languageVersion.set(JavaLanguageVersion.of(17))
     }
 }
 
@@ -77,7 +77,7 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation("com.palantir.gradle.gitversion:gradle-git-version:4.0.0")
     implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
+    implementation("com.vanniktech.maven.publish.base:com.vanniktech.maven.publish.base.gradle.plugin:0.35.0")
 
     runtimeOnly(kotlin("gradle-plugin"))
 
@@ -101,7 +101,7 @@ tasks {
 
 // default versions ---------------------------------------------------
 
-val wiremockVersion = "3.10.0"
+val wiremockVersion = "4.0.0-beta.19"
 
 val basePackagePath = "org/wiremock/tools/gradle/plugins"
 val processResources by tasks.existing(ProcessResources::class)

gradle.properties

@@ -1 +1 @@
-version=0.5.1
+version=0.6.0-beta.1

src/main/groovy/org.wiremock.tools.gradle.extension-dependencies.gradle

@@ -1,6 +1,6 @@
 project.ext {
     versions = [
-            wiremock  : '3.10.0',
+            wiremock  : '4.0.0-beta.19',
             junit     : '5.10.1',
             assertj   : '3.24.2',
             restAssured: '5.3.2',

src/main/groovy/org.wiremock.tools.gradle.java.gradle

@@ -22,8 +22,8 @@ repositories {
     mavenLocal()
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = 17
+targetCompatibility = 17
 
 compileJava {
     options.encoding = 'UTF-8'
@@ -44,7 +44,7 @@ test {
 
 idea {
     project {
-        jdkName = '11'
-        languageLevel = '11'
+        jdkName = '17'
+        languageLevel = '17'
     }
 }

src/main/groovy/org.wiremock.tools.gradle.publishing.gradle

@@ -8,11 +8,10 @@ def getGivenConfigConventional() {
 logger.info("WireMock conventions given config: ${getGivenConfigConventional()}")
 
 project.plugins.apply 'signing'
-project.plugins.apply 'maven-publish'
 if (getGivenConfigConventional().useShadowJar) {
     project.plugins.apply "com.github.johnrengelman.shadow"
 }
-project.plugins.apply 'io.github.gradle-nexus.publish-plugin'
+project.plugins.apply 'com.vanniktech.maven.publish.base'
 
 if (getGivenConfigConventional().useShadowJar) {
     assemble.dependsOn shadowJar
@@ -201,20 +200,6 @@ tasks.withType(AbstractPublishToMaven).configureEach {
     mustRunAfter(signingTasks)
 }
 
-nexusPublishing {
-    // See https://github.com/wiremock/community/blob/main/infra/maven-central.md
-    repositories {
-        sonatype {
-            // TODO: allow configuring destinations for oss1
-            // nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))
-            // snapshotRepositoryUrl.set(uri("https://oss.sonatype.org/content/repositories/snapshots/"))
-            nexusUrl = uri("https://ossrh-staging-api.central.sonatype.com/service/local/")
-            def envUsername = providers.environmentVariable("OSSRH_USERNAME").orElse("").get()
-            def envPassword = providers.environmentVariable("OSSRH_TOKEN").orElse("").get()
-            if (!envUsername.isEmpty() && !envPassword.isEmpty()) {
-                username.set(envUsername)
-                password.set(envPassword)
-            }
-        }
-    }
-}
+mavenPublishing {
+  publishToMavenCentral()
+}