ci: updating nexus publish plugin version (#26)

Updating nexus plugin

Author: tanderson-ld

.github/workflows/java-server-sdk.yml

@@ -56,7 +56,7 @@ jobs:
 
       - name: Publish Maven Local
         shell: bash
-        run: lib/sdk/server/gradlew publishToMavenLocal -p lib/sdk/server -P LD_SKIP_SIGNING=1
+        run: lib/sdk/server/gradlew publishToMavenLocal -p lib/sdk/server -P skipSigning=true
 
       - name: Run Packaging Test
         shell: bash

lib/java-server-sdk-otel/build.gradle

@@ -77,7 +77,7 @@ publishing {
 nexusPublishing {
     clientTimeout = java.time.Duration.ofMinutes(2) // we've seen extremely long delays in creating repositories
     repositories {
-        sonatype ()
+        sonatype()
     }
 }
 

lib/sdk/server/build.gradle

@@ -21,7 +21,7 @@ plugins {
     id "signing"
     id "com.github.johnrengelman.shadow" version "7.1.2"
     id "maven-publish"
-    id "de.marcphilipp.nexus-publish" version "0.3.0"
+    id "io.github.gradle-nexus.publish-plugin" version "1.3.0" apply false
     id "io.codearte.nexus-staging" version "0.21.2"
     id "org.ajoberstar.git-publish" version "2.1.3"
     id "idea"
@@ -599,26 +599,24 @@ publishing {
     }
 }
 
-nexusPublishing {
-    clientTimeout = java.time.Duration.ofMinutes(2) // we've seen extremely long delays in creating repositories
-    repositories {
-        sonatype {}
+// The current version of the nexus publish plugin is not well designed and so must be only be applied when this is the root project.
+// This was added to allow other projects to use this server sdk as a subproject (e.g. the contract test service)
+if (project == rootProject) {
+    apply plugin: "io.github.gradle-nexus.publish-plugin"
+
+    nexusPublishing {
+        clientTimeout = java.time.Duration.ofMinutes(2) // we've seen extremely long delays in creating repositories
+        repositories {
+            sonatype()
+        }
     }
 }
 
 signing {
+    required { findProperty("skipSigning") != "true" }
     sign publishing.publications.shadow
 }
 
-tasks.withType(Sign) { t ->
-    onlyIf { !shouldSkipSigning() } // so we can build jars for testing in CI
-}
-
-def shouldSkipSigning() {
-    return "1".equals(project.findProperty("LD_SKIP_SIGNING")) ||
-        "1".equals(System.getenv("LD_SKIP_SIGNING"))
-}
-
 // This task is used by the logic in ./packaging-test to get copies of all the direct and transitive
 // dependencies of the SDK, so they can be put on the classpath as needed during tests.
 task exportDependencies(type: Copy, dependsOn: compileJava) {

lib/sdk/server/gradle.properties

@@ -2,10 +2,5 @@
 version=7.5.0
 #x-release-please-end
 
-# The following empty ossrh properties are used by LaunchDarkly's internal integration testing framework
-# and should not be needed for typical development purposes (including by third-party developers).
-ossrhUsername=
-ossrhPassword=
-
 # See https://github.com/gradle/gradle/issues/11308 regarding the following property
 systemProp.org.gradle.internal.publish.checksums.insecure=true

lib/sdk/server/gradle.properties.example

@@ -4,5 +4,5 @@ githubPassword = YOUR_GITHUB_PASSWORD
 signing.keyId = 5669D902
 signing.password = SIGNING_PASSWORD
 signing.secretKeyRingFile = SECRET_RING_FILE
-ossrhUsername = launchdarkly
-ossrhPassword = OSSHR_PASSWORD
+sonatypeUsername = launchdarkly
+sonatypePassword = OSSHR_PASSWORD

lib/sdk/server/packaging-test/Makefile

@@ -115,7 +115,7 @@ test-pom: $(POM_XML)
 	@! grep '<dependency>' $< || (echo "    FAILED" && exit 1)
 
 $(SDK_DEFAULT_JAR) $(SDK_ALL_JAR) $(SDK_THIN_JAR) $(POM_XML):
-	cd .. && ./gradlew publishToMavenLocal -P version=$(LOCAL_VERSION) -P LD_SKIP_SIGNING=1
+	cd .. && ./gradlew publishToMavenLocal -P version=$(LOCAL_VERSION) -P skipSigning=true
 	@# publishToMavenLocal creates not only the jars but also the pom
 
 $(TEST_APP_JAR): $(SDK_THIN_JAR) $(TEST_APP_SOURCES) | $(TEMP_DIR)

lib/shared/common/build.gradle.kts

@@ -1,9 +1,5 @@
 import java.time.Duration
 
-// These values come from gradle.properties
-val ossrhUsername: String by project
-val ossrhPassword: String by project
-
 buildscript {
     repositories {
         mavenCentral()
@@ -92,10 +88,7 @@ nexusStaging {
 nexusPublishing {
     clientTimeout.set(Duration.ofMinutes(2)) // we've seen extremely long delays in creating repositories
     repositories {
-        sonatype {
-            username.set(ossrhUsername)
-            password.set(ossrhPassword)
-        }
+        sonatype()
     }
 }
 

lib/shared/common/buildSrc/src/main/kotlin/Dependencies.kt

@@ -9,7 +9,7 @@ object Versions {
 }
 
 object PluginVersions {
-    const val nexusPublish = "0.3.0"
+    const val nexusPublish = "1.3.0"
     const val nexusStaging = "0.30.0"
 }
 
@@ -61,7 +61,7 @@ object Libs {
     )
 
     val javaExtGradlePlugins = mapOf(
-        "de.marcphilipp.nexus-publish" to PluginVersions.nexusPublish,
+        "io.github.gradle-nexus.publish-plugin" to PluginVersions.nexusPublish,
         "io.codearte.nexus-staging" to PluginVersions.nexusStaging
     )
 }

lib/shared/common/gradle.properties

@@ -1,8 +1,3 @@
 #x-release-please-start-version
 version=2.1.1
 #x-release-please-end
-
-# The following empty ossrh properties are used by LaunchDarkly's internal integration testing framework
-# and should not be needed for typical development purposes (including by third-party developers).
-ossrhUsername=
-ossrhPassword=

lib/shared/internal/build.gradle.kts

@@ -1,9 +1,5 @@
 import java.time.Duration
 
-// These values come from gradle.properties
-val ossrhUsername: String by project
-val ossrhPassword: String by project
-
 buildscript {
     repositories {
         mavenCentral()
@@ -86,10 +82,7 @@ nexusStaging {
 nexusPublishing {
     clientTimeout.set(Duration.ofMinutes(2)) // we've seen extremely long delays in creating repositories
     repositories {
-        sonatype {
-            username.set(ossrhUsername)
-            password.set(ossrhPassword)
-        }
+        sonatype()
     }
 }