Another attempt at separating core/jetty12 releasing via JDK 11/17

wiremock · Mar 28, 2024 · bb00451 · bb00451
1 parent 0bb8105
commit bb00451
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 40 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -4,7 +4,35 @@ on:
   workflow_dispatch:
 
 jobs:
-  publish:
+  publish-core:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Java
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@v1
+
+      - name: Publish core package
+        id: publish_package
+        uses: gradle/gradle-build-action@v2.9.0
+        with:
+          arguments: :publish :closeAndReleaseStagingRepository addGitTag --stacktrace
+
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
+          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          OSSRH_GPG_SECRET_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
+          OSSRH_GPG_SECRET_KEY_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
+
+  publish-jetty12:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -19,11 +47,11 @@ jobs:
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@v1
 
-      - name: Publish package
+      - name: Publish Jetty 12 package
         id: publish_package
         uses: gradle/gradle-build-action@v2.9.0
         with:
-          arguments: publish closeAndReleaseStagingRepository addGitTag --stacktrace
+          arguments: :wiremock-jetty12:publish :closeAndReleaseStagingRepository --stacktrace
 
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/build.gradle b/build.gradle
@@ -368,30 +368,32 @@ publishing {
     }
   }
 
-  publications {
-    mavenJava(MavenPublication) { publication ->
-      artifactId = "${jar.getArchiveBaseName().get()}"
-      from components.java
-      artifact testJar
-
-      pom.withXml {
-        asNode().appendNode('description', 'A web service test double for all occasions')
-        asNode().children().last() + pomInfo
+  if (JavaVersion.current().isJava11()) {
+    publications {
+      mavenJava(MavenPublication) { publication ->
+        artifactId = "${jar.getArchiveBaseName().get()}"
+        from components.java
+        artifact testJar
+
+        pom.withXml {
+          asNode().appendNode('description', 'A web service test double for all occasions')
+          asNode().children().last() + pomInfo
+        }
       }
-    }
 
-    standaloneJar(MavenPublication) { publication ->
-      artifactId = "${jar.getArchiveBaseName().get()}-standalone"
-      project.shadow.component(publication)
+      standaloneJar(MavenPublication) { publication ->
+        artifactId = "${jar.getArchiveBaseName().get()}-standalone"
+        project.shadow.component(publication)
 
-      artifact sourcesJar
-      artifact javadocJar
-      artifact testJar
+        artifact sourcesJar
+        artifact javadocJar
+        artifact testJar
 
-      pom.packaging 'jar'
-      pom.withXml {
-        asNode().appendNode('description', 'A web service test double for all occasions - standalone edition')
-        asNode().children().last() + pomInfo
+        pom.packaging 'jar'
+        pom.withXml {
+          asNode().appendNode('description', 'A web service test double for all occasions - standalone edition')
+          asNode().children().last() + pomInfo
+        }
       }
     }
   }
@@ -416,7 +418,7 @@ task checkReleasePreconditions {
     def REQUIRED_GIT_BRANCH = 'master'
     def currentGitBranch = 'git rev-parse --abbrev-ref HEAD'.execute().text.trim()
     assert currentGitBranch == REQUIRED_GIT_BRANCH, "Must be on the $REQUIRED_GIT_BRANCH branch in order to release to Sonatype"
-    assert JavaVersion.current().isJava11(), 'Must use Java 8 when releasing'
+//    assert JavaVersion.current().isJava11(), 'Must use Java 8 when releasing'
   }
 }
 

diff --git a/wiremock-jetty12/build.gradle b/wiremock-jetty12/build.gradle
@@ -96,26 +96,28 @@ signing {
   sign publishing.publications
 }
 
-publishing {
-  repositories {
-    maven {
-      name = "GitHubPackages"
-      url = "https://maven.pkg.github.com/wiremock/wiremock"
-      credentials {
-        username = System.getenv("GITHUB_ACTOR")
-        password = System.getenv("GITHUB_TOKEN")
+if (JavaVersion.current().getMajorVersion() == '17') {
+  publishing {
+    repositories {
+      maven {
+        name = "GitHubPackages"
+        url = "https://maven.pkg.github.com/wiremock/wiremock"
+        credentials {
+          username = System.getenv("GITHUB_ACTOR")
+          password = System.getenv("GITHUB_TOKEN")
+        }
       }
     }
-  }
 
-  publications {
-    mavenJava(MavenPublication) { publication ->
-      artifactId = "${jar.getArchiveBaseName().get()}"
-      from components.java
+    publications {
+      mavenJava(MavenPublication) { publication ->
+        artifactId = "${jar.getArchiveBaseName().get()}"
+        from components.java
 
-      pom.withXml {
-        asNode().appendNode('description', 'WireMock with Jetty 12 as its HTTP server')
-        asNode().children().last() + pomInfo
+        pom.withXml {
+          asNode().appendNode('description', 'WireMock with Jetty 12 as its HTTP server')
+          asNode().children().last() + pomInfo
+        }
       }
     }
   }