Merge pull request #151 from xenit-eu/ALFREDOPS-849-h

ALFREDOPS-849 remove pluginManager.withPlugin from publish gradle
xenit-eu · Oct 13, 2023 · f0fbb78 · f0fbb78
2 parents 8f1a7ad + f8ab893
commit f0fbb78
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 43 deletions.
diff --git a/alfred-telemetry-platform/build.gradle b/alfred-telemetry-platform/build.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'idea'
     id 'java'
-    id 'maven-publish'
     id 'eu.xenit.alfresco' version "1.1.0"
     id 'eu.xenit.amp' version "1.1.0"
 }

diff --git a/alfred-telemetry-solr/build.gradle b/alfred-telemetry-solr/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     id 'com.github.johnrengelman.shadow' version '7.1.2' apply false
-    id 'maven-publish'
     id 'eu.xenit.alfresco' version '1.1.0' apply false
     id 'base'
     id 'idea'

diff --git a/publish.gradle b/publish.gradle
@@ -1,55 +1,54 @@
-pluginManager.withPlugin('maven-publish') {
-    apply plugin: 'signing'
+apply plugin: 'signing'
+apply plugin: 'maven-publish'
 
-    publishing {
+publishing {
 
-        repositories {
-            if ("${project.version}".endsWith('-SNAPSHOT')) {
-                sonatypeSnapshots {
-                    url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-                    credentials {
-                        username = project.findProperty('sonatype_username')
-                        password = project.findProperty('sonatype_password')
-                    }
+    repositories {
+        if ("${project.version}".endsWith('-SNAPSHOT')) {
+            sonatypeSnapshots {
+                url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+                credentials {
+                    username = project.findProperty('sonatype_username')
+                    password = project.findProperty('sonatype_password')
                 }
-            } else {
-                sonatypeMavenCentral {
-                    url = "https://s01.oss.sonatype.org/service/local/"
-                    credentials {
-                        username = project.findProperty('sonatype_username')
-                        password = project.findProperty('sonatype_password')
-                    }
+            }
+        } else {
+            sonatypeMavenCentral {
+                url = "https://s01.oss.sonatype.org/service/local/"
+                credentials {
+                    username = project.findProperty('sonatype_username')
+                    password = project.findProperty('sonatype_password')
                 }
             }
         }
-        publications {
-            all {
-                pom {
-                    url = 'https://github.com/xenit-eu/alfred-telemetry'
-                    name = "alfred-telemetry"
-                    description = project.description
+    }
+    publications {
+        all {
+            pom {
+                url = 'https://github.com/xenit-eu/alfred-telemetry'
+                name = "alfred-telemetry"
+                description = project.description
 
-                    scm {
-                        connection = 'scm:git:[email protected]:xenit-eu/alfred-telemetry.git'
-                        developerConnection = 'scm:git:[email protected]:xenit-eu/alfred-telemetry.git'
-                        url = 'https://github.com/xenit-eu/alfred-telemetry.git'
-                    }
-                    developers {
-                        developer {
-                            id = "xenit"
-                            name = "Xenit"
-                            description = "Xenit Solutions NV"
-                        }
+                scm {
+                    connection = 'scm:git:[email protected]:xenit-eu/alfred-telemetry.git'
+                    developerConnection = 'scm:git:[email protected]:xenit-eu/alfred-telemetry.git'
+                    url = 'https://github.com/xenit-eu/alfred-telemetry.git'
+                }
+                developers {
+                    developer {
+                        id = "xenit"
+                        name = "Xenit"
+                        description = "Xenit Solutions NV"
                     }
+                }
 
-                    licenses {
-                        license {
-                            name = 'GNU Lesser General Public License v3.0'
-                            url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
-                        }
+                licenses {
+                    license {
+                        name = 'GNU Lesser General Public License v3.0'
+                        url = 'https://www.gnu.org/licenses/lgpl-3.0.txt'
                     }
                 }
             }
         }
     }
-}
+}