NH-33952: Release Java Agent 0.15.0

- [JIRA](https://swicloud.atlassian.net/browse/NH-33952) - use a single publication - exclude local publishing from signing
solarwinds · Feb 22, 2023 · 276c45c · 276c45c
1 parent f240d0f
commit 276c45c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 58 deletions.
diff --git a/agent/build.gradle b/agent/build.gradle
@@ -168,34 +168,8 @@ publishing {
         artifact javadocJar
       }
     }
-    localInstall(MavenPublication){
-      pom {
-        name = "${archivesBaseName}"
-        description = "${archivesBaseName}"
-        url = "www.solarwinds.com"
-        scm {
-          url = 'https://www.solarwinds.com'
-        }
-        developers {
-          developer {
-            id = 'APM'
-            name = 'The APM Agent team'
-          }
-        }
-        licenses {
-          license {
-            name = 'Librato Open License'
-          }
-        }
-        groupId = 'io.github.appoptics'
-        artifactId = "${archivesBaseName}"
-        version = "${versions.agent}"
-        from components.java
-        artifact sourcesJar
-        artifact javadocJar
-      }
-    }
-    publishLocalInstallPublicationToMavenLocal
+
+    publishToMavenLocal
   }
   repositories {
 //    -- uncomment the lines below to publish the agent artifact to the Maven central --
@@ -219,6 +193,9 @@ publishing {
 }
 
 signing {
+  setRequired {
+    gradle.taskGraph.allTasks.any { (it.getClass() == PublishToMavenRepository.class) }
+  }
   def signingKey = System.getenv("SIGNING_KEY")
   def signingPassword = System.getenv("SIGNING_PASSWORD")
   useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/mvnlocalPub.sh b/mvnlocalPub.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env zsh
 # This script exist to enable conveniently building and publishing the artifacts to local maven repo
 ./gradlew clean build
-./gradlew agent:publishLocalInstallPublicationToMavenLocal
-./gradlew solarwinds-otel-sdk:publishLocalInstallPublicationToMavenLocal
+./gradlew agent:publishToMavenLocal
+./gradlew solarwinds-otel-sdk:publishToMavenLocal
 
diff --git a/solarwinds-otel-sdk/build.gradle b/solarwinds-otel-sdk/build.gradle
@@ -74,34 +74,7 @@ publishing {
         artifact javadocJar
       }
     }
-    localInstall(MavenPublication){
-      pom {
-        name = "${archivesBaseName}"
-        description = "${archivesBaseName}"
-        url = "www.solarwinds.com"
-        scm {
-          url = 'https://www.solarwinds.com'
-        }
-        developers {
-          developer {
-            id = 'APM'
-            name = 'The APM Agent team'
-          }
-        }
-        licenses {
-          license {
-            name = 'Librato Open License'
-          }
-        }
-        groupId = 'io.github.appoptics'
-        artifactId = "${archivesBaseName}"
-        version = "${versions.agent}"
-        from components.java
-        artifact sourcesJar
-        artifact javadocJar
-      }
-    }
-    publishLocalInstallPublicationToMavenLocal
+    publishToMavenLocal
   }
   repositories {
     maven {
@@ -124,6 +97,9 @@ publishing {
 }
 
 signing {
+  setRequired {
+    gradle.taskGraph.allTasks.any { (it.getClass() == PublishToMavenRepository.class) }
+  }
   def signingKey = System.getenv("SIGNING_KEY")
   def signingPassword = System.getenv("SIGNING_PASSWORD")
   useInMemoryPgpKeys(signingKey, signingPassword)