From a708ea4794e118a86333d0cd7ae366745113885a Mon Sep 17 00:00:00 2001
From: Toon Geens <toon.geens@xenit.eu>
Date: Tue, 4 Oct 2022 17:25:10 +0200
Subject: [PATCH] Only using xenit-conventions-signing plugin, because
 xenit-conventions-oss conflicts with xenus-publish-plugin

---
 build.gradle          | 24 ++++++++++++------------
 gradle/publish.gradle |  2 +-
 settings.gradle       |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1554372..4207f75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,18 +8,6 @@ reckon {
     snapshotFromProp()
 }
 
-nexusPublishing {
-    repositories {
-        sonatype {
-            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
-            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
-
-            username = project.findProperty('sonatype_username')
-            password = project.findProperty('sonatype_password')
-        }
-    }
-}
-
 allprojects {
     pluginManager.withPlugin('maven-publish') {
         apply from: "${rootDir}/gradle/publish.gradle"
@@ -34,4 +22,16 @@ allprojects {
             mavenCentral()
         }
     }
+}
+
+nexusPublishing {
+    repositories {
+        sonatype {
+            nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
+            snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
+
+            username = project.findProperty('sonatype_username')
+            password = project.findProperty('sonatype_password')
+        }
+    }
 }
\ No newline at end of file
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index c46bb39..e054e9c 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -1,4 +1,4 @@
-apply plugin: 'maven-publish'
+apply plugin: 'eu.xenit.enterprise-conventions.ext.signing'
 apply plugin: 'signing'
 
 publishing {
diff --git a/settings.gradle b/settings.gradle
index cf72e24..523e9d1 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "eu.xenit.enterprise-conventions.oss" version "0.2.0"
+    id "eu.xenit.enterprise-conventions.ext.signing" version "0.2.0" apply false
 }
 
 rootProject.name = 'opa-java-client'