From f0ad5da61e40aca737e5aed181426c2ce7a58bbc Mon Sep 17 00:00:00 2001
From: vincent van beek <vincent@vlogic.nl>
Date: Thu, 23 Apr 2026 10:06:32 +0200
Subject: attempt to fix the maven publish step (#408)

---
 buildSrc/src/main/kotlin/publishing-conventions.gradle.kts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 5b36509f..3100412a 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -31,10 +31,10 @@ val isSnapshot = project.version.toString().contains("SNAPSHOT")
 
 // Ensure project is built successfully before publishing it
 tasks.withType<PublishToMavenRepository>().configureEach {
-    dependsOn(tasks.build)
+    dependsOn(tasks.assemble)
 }
 tasks.withType<PublishToMavenLocal>().configureEach {
-    dependsOn(tasks.build)
+    dependsOn(tasks.assemble)
 }
 
 signing {
-- 
cgit v1.2.3


From f9aba13b6d0f26d3a2a3f9de788d43aa2f4a82b7 Mon Sep 17 00:00:00 2001
From: vincent van beek <vincent@vlogic.nl>
Date: Fri, 24 Apr 2026 12:01:41 +0200
Subject: Fix maven (#409)

* attempt to fix the maven publish step

* fix publishing to maven central
---
 .github/workflows/publish.yml                             |  6 +++---
 .../src/main/kotlin/publishing-conventions.gradle.kts     | 15 ---------------
 settings.gradle.kts                                       | 12 ++++++++++++
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index d076dc87..315ab9d4 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -81,9 +81,9 @@ jobs:
       - name: Publish with Gradle
         uses: gradle/actions/setup-gradle@v3
         with:
-          arguments: publish -Pversion="${{ steps.prep.outputs.version }}"
+          arguments: publishAggregationToCentralPortal -Pversion="${{ steps.prep.outputs.version }}"
         env:
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.GPG_PRIVATE_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.GPG_PASSPHRASE }}
-          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.OSSRH_USERNAME }}
-          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.OSSRH_PASSWORD }}
+          ORG_GRADLE_PROJECT_centralPortalUsername: ${{ secrets.CENTRAL_PORTAL_USERNAME }}
+          ORG_GRADLE_PROJECT_centralPortalPassword: ${{ secrets.CENTRAL_PORTAL_PASSWORD }}
diff --git a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
index 3100412a..4616df36 100644
--- a/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/publishing-conventions.gradle.kts
@@ -20,15 +20,11 @@
  * SOFTWARE.
  */
 
-import org.gradle.api.credentials.PasswordCredentials
-
 plugins {
     `maven-publish`
     signing
 }
 
-val isSnapshot = project.version.toString().contains("SNAPSHOT")
-
 // Ensure project is built successfully before publishing it
 tasks.withType<PublishToMavenRepository>().configureEach {
     dependsOn(tasks.assemble)
@@ -82,15 +78,4 @@ publishing {
             }
         }
     }
-
-    repositories {
-        maven {
-            val releasesRepoUrl = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
-            val snapshotsRepoUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
-
-            name = "ossrh"
-            url = if (isSnapshot) snapshotsRepoUrl else releasesRepoUrl
-            credentials(PasswordCredentials::class)
-        }
-    }
 }
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 38478afe..c75f183d 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -19,8 +19,20 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+plugins {
+    id("com.gradleup.nmcp.settings").version("1.4.4")
+}
+
 rootProject.name = "opendc"
 
+nmcpSettings {
+    centralPortal {
+        username = providers.gradleProperty("centralPortalUsername").orNull
+        password = providers.gradleProperty("centralPortalPassword").orNull
+        publishingType = "AUTOMATIC"
+    }
+}
+
 
 include(":opendc-common")
 include(":opendc-compute:opendc-compute-api")
-- 
cgit v1.2.3