update lang tests

pulumi · Jan 30, 2025 · 11d2133 · 11d2133
1 parent 04bfa7b
commit 11d2133
Show file tree

Hide file tree

Showing 13 changed files with 195 additions and 182 deletions.
diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/alpha-3.0.0-alpha.1.internal/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/alpha-3.0.0-alpha.1.internal/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -123,19 +124,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -149,6 +137,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/asset-archive-5.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/asset-archive-5.0.0/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -123,19 +124,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -149,6 +137,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/config-9.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/config-9.0.0/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -124,19 +125,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -150,6 +138,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/fail_on_create-4.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/fail_on_create-4.0.0/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -123,19 +124,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -149,6 +137,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/goodbye-2.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/goodbye-2.0.0/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -128,19 +129,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -154,6 +142,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/large-4.3.2/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -123,19 +124,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -149,6 +137,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)

diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/plain-13.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/plain-13.0.0/build.gradle
@@ -5,6 +5,7 @@ plugins {
     id("signing")
     id("java-library")
     id("maven-publish")
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
 }
 
 group = "com.pulumi"
@@ -16,7 +17,7 @@ def resolvedVersion = System.getenv("PACKAGE_VERSION") ?:
 
 def signingKey = System.getenv("SIGNING_KEY")
 def signingPassword = System.getenv("SIGNING_PASSWORD")
-def publishRepoURL = System.getenv("PUBLISH_REPO_URL")
+def publishRepoURL = System.getenv("PUBLISH_REPO_URL") ?: "https://s01.oss.sonatype.org"
 def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME")
 def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD")
 
@@ -123,19 +124,6 @@ publishing {
             }
         }
     }
-
-    if (publishRepoURL) {
-        repositories {
-            maven {
-                name = "PublishRepo"
-                url = publishRepoURL
-                credentials {
-                    username = publishRepoUsername
-                    password = publishRepoPassword
-                }
-            }
-        }
-    }
 }
 
 javadoc {
@@ -149,6 +137,19 @@ jar {
     zip64 = true
 }
 
+if (publishRepoUsername) {
+    nexusPublishing {
+        repositories {
+            sonatype {
+                nexusUrl.set(uri(publishRepoURL + "/service/local/"))
+                snapshotRepositoryUrl.set(uri(publishRepoURL + "/content/repositories/snapshots/"))
+                username = publishRepoUsername
+                password = publishRepoPassword
+            }
+        }
+    }
+}
+
 if (signingKey) {
     signing {
         useInMemoryPgpKeys(signingKey, signingPassword)