Fix nexus publishing script

adimiz1 · web-flow · commit a36d11ea19f7 · 2022-05-03T12:40:26.000+03:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,9 @@
 import groovy.json.JsonSlurper
 
+plugins {
+    id 'io.github.gradle-nexus.publish-plugin' version '1.0.0'
+}
+
 allprojects {
 
     repositories {
@@ -9,6 +13,19 @@ allprojects {
     project.ext.set("publishGroupId", group)
 }
 
+nexusPublishing {
+    transitionCheckOptions {
+        maxRetries.set(150)
+        delayBetween.set(Duration.ofSeconds(5))
+    }
+    repositories {
+        sonatype {
+            username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
+            password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
+        }
+    }
+}
+
 tasks.create('createTestSubAccount') {
     doFirst {
         println("Task createTestSubAccount called with module $moduleName")
diff --git a/cloudinary-core/build.gradle b/cloudinary-core/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 task ciTest( type: Test )
@@ -87,15 +86,6 @@ if (hasProperty("ossrhPassword")) {
             }
         }
 
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")
diff --git a/cloudinary-http42/build.gradle b/cloudinary-http42/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 apply from: "../java_shared.gradle"
@@ -100,15 +99,6 @@ if (hasProperty("ossrhPassword")) {
             }
         }
 
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")
diff --git a/cloudinary-http43/build.gradle b/cloudinary-http43/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 apply from: "../java_shared.gradle"
@@ -99,15 +98,6 @@ if (hasProperty("ossrhPassword")) {
             }
         }
 
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")
diff --git a/cloudinary-http44/build.gradle b/cloudinary-http44/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 apply from: "../java_shared.gradle"
@@ -98,16 +97,7 @@ if (hasProperty("ossrhPassword")) {
                 }
             }
         }
-
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
+        
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")
diff --git a/cloudinary-http45/build.gradle b/cloudinary-http45/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 apply from: "../java_shared.gradle"
@@ -99,15 +98,6 @@ if (hasProperty("ossrhPassword")) {
             }
         }
 
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")
diff --git a/cloudinary-taglib/build.gradle b/cloudinary-taglib/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 apply from: "../java_shared.gradle"
@@ -94,15 +93,6 @@ if (hasProperty("ossrhPassword")) {
             }
         }
 
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")
diff --git a/cloudinary-test-common/build.gradle b/cloudinary-test-common/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'signing'
     id 'maven-publish'
     id 'io.codearte.nexus-staging' version '0.21.1'
-    id "de.marcphilipp.nexus-publish" version "0.4.0"
 }
 
 apply from: "../java_shared.gradle"
@@ -88,15 +87,6 @@ if (hasProperty("ossrhPassword")) {
             }
         }
 
-        nexusPublishing {
-            repositories {
-                sonatype {
-                    username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""
-                    password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""
-                }
-            }
-        }
-
         model {
             tasks.generatePomFileForMavenJavaPublication {
                 destination = file("$buildDir/generated-pom.xml")

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ plugins {`
`3`	`3`	`id 'signing'`
`4`	`4`	`id 'maven-publish'`
`5`	`5`	`id 'io.codearte.nexus-staging' version '0.21.1'`
`6`		`- id "de.marcphilipp.nexus-publish" version "0.4.0"`
`7`	`6`	`}`
`8`	`7`
`9`	`8`	`apply from: "../java_shared.gradle"`
`@@ -98,16 +97,7 @@ if (hasProperty("ossrhPassword")) {`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`	`}`
`101`		`-`
`102`		`- nexusPublishing {`
`103`		`- repositories {`
`104`		`- sonatype {`
`105`		`- username = project.hasProperty("ossrhUsername") ? project.ext["ossrhUsername"] : ""`
`106`		`- password = project.hasProperty("ossrhPassword") ? project.ext["ossrhPassword"] : ""`
`107`		`- }`
`108`		`- }`
`109`		`- }`
`110`		`-`
	`100`	`+`
`111`	`101`	`model {`
`112`	`102`	`tasks.generatePomFileForMavenJavaPublication {`
`113`	`103`	`destination = file("$buildDir/generated-pom.xml")`