diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 5ecddce9258..4e2853d3c47 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -1,3 +1,5 @@ ### Improvements +- Default to using Gradle with the Nexus publishing plugin when using `gen-sdk` + ### Bug Fixes diff --git a/pkg/cmd/pulumi-java-gen/generate.go b/pkg/cmd/pulumi-java-gen/generate.go index 8ba1511862f..c9437ca0bf4 100644 --- a/pkg/cmd/pulumi-java-gen/generate.go +++ b/pkg/cmd/pulumi-java-gen/generate.go @@ -91,6 +91,7 @@ func generateJava(cfg generateJavaOptions) error { extraFiles, nil, /*localDependencies*/ cfg.Local, + true, /*legacyBuildFiles*/ ) if err != nil { return err diff --git a/pkg/cmd/pulumi-language-java/main.go b/pkg/cmd/pulumi-language-java/main.go index 0da112f0c55..39d93d8633a 100644 --- a/pkg/cmd/pulumi-language-java/main.go +++ b/pkg/cmd/pulumi-language-java/main.go @@ -749,6 +749,7 @@ func (host *javaLanguageHost) GeneratePackage( req.ExtraFiles, req.LocalDependencies, req.Local, + false, /*legacyBuildFiles*/ ) if err != nil { return nil, err 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 index 10e858fdda2..c0db7b78214 100644 --- 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 index 431fe7a7f9e..e22d6f38a52 100644 --- 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 index 6a94da4683b..41b41ba1a34 100644 --- 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 index 2a2d880b018..f275ff1dd71 100644 --- 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 index c52b3b5ab03..201ae27f21e 100644 --- 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 index 834536c50c1..b85f27fe28d 100644 --- 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 index 561ec5d93f6..97c0203b7bc 100644 --- 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) diff --git a/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-7.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-7.0.0/build.gradle index 4b1f33e7a1b..e78b0e83f6d 100644 --- a/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-7.0.0/build.gradle +++ b/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-7.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/primitive-ref-11.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-ref-11.0.0/build.gradle index 27715ed5ac2..6d5e7d52bf9 100644 --- a/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-ref-11.0.0/build.gradle +++ b/pkg/cmd/pulumi-language-java/testdata/sdks/primitive-ref-11.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/ref-ref-12.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/ref-ref-12.0.0/build.gradle index 622dc455555..5065c14c2c8 100644 --- a/pkg/cmd/pulumi-language-java/testdata/sdks/ref-ref-12.0.0/build.gradle +++ b/pkg/cmd/pulumi-language-java/testdata/sdks/ref-ref-12.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/simple-2.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/simple-2.0.0/build.gradle index f48b100bd18..30ce80b4967 100644 --- a/pkg/cmd/pulumi-language-java/testdata/sdks/simple-2.0.0/build.gradle +++ b/pkg/cmd/pulumi-language-java/testdata/sdks/simple-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") @@ -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/simple-invoke-10.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/simple-invoke-10.0.0/build.gradle index 2f6b20fa3f9..68c4e53b913 100644 --- a/pkg/cmd/pulumi-language-java/testdata/sdks/simple-invoke-10.0.0/build.gradle +++ b/pkg/cmd/pulumi-language-java/testdata/sdks/simple-invoke-10.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/subpackage-2.0.0/build.gradle b/pkg/cmd/pulumi-language-java/testdata/sdks/subpackage-2.0.0/build.gradle index 6a60a88d9bb..80f425e84c6 100644 --- a/pkg/cmd/pulumi-language-java/testdata/sdks/subpackage-2.0.0/build.gradle +++ b/pkg/cmd/pulumi-language-java/testdata/sdks/subpackage-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/codegen/java/gen.go b/pkg/codegen/java/gen.go index d4ebcea1ace..d9337451575 100644 --- a/pkg/codegen/java/gen.go +++ b/pkg/codegen/java/gen.go @@ -2052,14 +2052,6 @@ func generateModuleContextMap(tool string, pkg *schema.Package) (map[string]*mod WithDefaultDependencies(). WithJavaSdkDependencyDefault(DefaultSdkVersion) - // All packages that SupportPack (which in some sense reflects the latest version of the schema) should use - // Gradle if no build system has been explicitly specified. - if p.SupportPack() { - if javaInfo.BuildFiles == "" { - javaInfo.BuildFiles = "gradle" - } - } - info = &javaInfo infos[def] = info } @@ -2239,6 +2231,7 @@ func GeneratePackage( extraFiles map[string][]byte, localDependencies map[string]string, local bool, + legacyBuildFiles bool, ) (map[string][]byte, error) { // Presently, Gradle is the primary build system we support for generated SDKs. Later on, when we validate the // package in order to produce build system artifacts, we'll need a description and repository. To this end, we @@ -2308,38 +2301,48 @@ func GeneratePackage( } } + var useGradle bool + if local { + // Local packages do not use gradle. + useGradle = false + } else { + // `legacyBuildFiles is set by `pulumi-java-gen`. When we remove the + // deprecated `pulumi-java-gen` executable, we can remove the + // legacyBuildFiles flag. + if legacyBuildFiles { + // The default for legacy invocations is "none", so we need to see an explicit "gradle" setting. + useGradle = info.BuildFiles == "gradle" + } else { + // The default for new invocations is to use gradle, unless "none" is specified explicitly. + useGradle = info.BuildFiles != "none" + } + } + // Currently, packages come bundled with a version.txt resource that is used by generated code to report a version. // When a build tool is configured, we defer the generation of this file to the build process so that e.g. CI // processes can set the version to be used when releasing or publishing a package, as opposed to when the code for // that package is generated. In the case that we are generating a package without a build tool, or a local package // to be incorporated into a program with an existing build process, we need to emit the version.txt file explicitly // as part of code generation. - if info.BuildFiles == "" || local { - pkgName := fmt.Sprintf("%s%s", info.BasePackageOrDefault(), pkg.Name) - pkgPath := strings.ReplaceAll(pkgName, ".", "/") - - var version string - if pkg.Version != nil { - version = pkg.Version.String() - } else { - version = "0.0.1" + if useGradle { + if err := genGradleProject(pkg, info, files, legacyBuildFiles); err != nil { + return nil, err } - - files.add("src/main/resources/"+pkgPath+"/version.txt", []byte(version)) return files, nil } - // If we are emitting a publishable package with a configured build system, emit those files now. - switch info.BuildFiles { - case "gradle": - if err := genGradleProject(pkg, info, files); err != nil { - return nil, err - } - return files, nil - default: - return nil, fmt.Errorf("Only `gradle` value currently supported for the `buildFiles` setting, given `%s`", - info.BuildFiles) + pkgName := fmt.Sprintf("%s%s", info.BasePackageOrDefault(), pkg.Name) + pkgPath := strings.ReplaceAll(pkgName, ".", "/") + + var version string + if pkg.Version != nil { + version = pkg.Version.String() + } else { + version = "0.0.1" } + + files.add("src/main/resources/"+pkgPath+"/version.txt", []byte(version)) + return files, nil } func isInputType(t schema.Type) bool { diff --git a/pkg/codegen/java/gen_test.go b/pkg/codegen/java/gen_test.go index 9e9047fcf42..ec393005437 100644 --- a/pkg/codegen/java/gen_test.go +++ b/pkg/codegen/java/gen_test.go @@ -81,6 +81,24 @@ func javaSpecificTests(keyDeps map[string]string) []generatePackageTestConfig { Directory: "parameterized", Description: "Tests for parameterized providers", }), + newGeneratePackageTestConfig(&test.SDKTest{ + Directory: "build-files/none", + Description: "Tests for build-files = none", + // We don't generate a gradle file, so we can't compile. + SkipCompileCheck: codegen.NewStringSet("java"), + }), + newGeneratePackageTestConfig(&test.SDKTest{ + Directory: "build-files/gradle", + Description: "Tests for build-files = gradle", + }), + newGeneratePackageTestConfig(&test.SDKTest{ + Directory: "build-files/gradle-nexus", + Description: "Tests for build-files = gradle-nexus", + }), + newGeneratePackageTestConfig(&test.SDKTest{ + Directory: "build-files/unspecified", + Description: "Tests for build-files not set", + }), } } @@ -224,10 +242,20 @@ func TestGeneratePackage(t *testing.T) { ) (map[string][]byte, error) { pkg.Description = "test description" pkg.Repository = "https://github.com/pulumi/pulumi-java" - pkg.Language = map[string]interface{}{ - "java": testCase.packageInfo, + + if pkg.Language == nil { + pkg.Language = map[string]interface{}{} } - return GeneratePackage(tool, pkg, extraFiles, nil, false) + if pkg.Language["java"] == nil { + pkg.Language["java"] = testCase.packageInfo + } else { + if err := pkg.ImportLanguages(map[string]schema.Language{"java": Importer}); err != nil { + panic(err) + } + info := pkg.Language["java"].(PackageInfo) + pkg.Language["java"] = info.With(testCase.packageInfo) + } + return GeneratePackage(tool, pkg, extraFiles, nil, false /*local*/, false /*legacyBuildFiles*/) }, Language: "java", TestCases: []*test.SDKTest{testCase.sdkTest}, @@ -239,7 +267,6 @@ func TestGeneratePackage(t *testing.T) { // Minimal test config that verifies code generation and compilation. func newGeneratePackageTestConfig(test *test.SDKTest) generatePackageTestConfig { packageInfo := PackageInfo{ - BuildFiles: "gradle", Dependencies: map[string]string{ "com.pulumi:pulumi": "0.0.1", }, diff --git a/pkg/codegen/java/templates_gradle.go b/pkg/codegen/java/templates_gradle.go index 10c303347ab..a33e596cf87 100644 --- a/pkg/codegen/java/templates_gradle.go +++ b/pkg/codegen/java/templates_gradle.go @@ -14,16 +14,19 @@ import ( "github.com/pulumi/pulumi/pkg/v3/codegen/schema" ) +const DefaultGradleNexusPublishPluginVersion = "2.0.0" + func genGradleProject( pkg *schema.Package, packageInfo *PackageInfo, files fs, + legacyBuildFiles bool, ) error { if err := gradleValidatePackage(pkg); err != nil { return err } - ctx := newGradleTemplateContext(pkg, packageInfo) + ctx := newGradleTemplateContext(pkg, packageInfo, legacyBuildFiles) templates := map[string]string{ "build.gradle": buildGradleTemplate, "settings.gradle": settingsGradleTemplate, @@ -99,6 +102,7 @@ type gradleTemplateParameterization struct { func newGradleTemplateContext( pkg *schema.Package, packageInfo *PackageInfo, + legacyBuildFiles bool, ) gradleTemplateContext { ctx := gradleTemplateContext{ Name: pkg.Name, @@ -126,7 +130,58 @@ func newGradleTemplateContext( ctx.Version = pkg.Parameterization.BaseProvider.Version.String() } - if packageInfo.GradleNexusPublishPluginVersion != "" { + /* + For `legacyBuildFiles == true` we have the following behavior + + |-----------------------------------------|--------------------------------------| + | PackageInfo | Behaviour | + |-----------------------------------------|--------------------------------------| + | | no gradle file, default | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle | gradle file without nexus plugin | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle, | gradle file with nexus plugin, using | + | gradleNexusPublishPluginVersion: 2.0.0 | default version of the plugin | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle, | gradle file with nexus plugin, using | + | gradleNexusPublishPluginVersion: $VER | specified version of the plugin | + |-----------------------------------------|--------------------------------------| + + For `legacyBuildFiles == false` we have the following behavior, with the default + being `buildFiles: gradle-nexus`: + + |-----------------------------------------|--------------------------------------| + | PackageInfo | Behaviour | + |-----------------------------------------|--------------------------------------| + | buildFiles: none | no gradle file | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle-nexus | gradle file with nexus plugin, using | + | | the default version 2.0.0 | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle-nexus, | gradle file with nexus plugin, using | + | gradleNexusPublishPluginVersion: $VER | version $VER | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle | gradle file without nexus plugin | + |-----------------------------------------|--------------------------------------| + | buildFiles: gradle | gradle file with nexus plugin, using | + | gradleNexusPublishPluginVersion: $VER | specified version of the plugin | + |-----------------------------------------|--------------------------------------| + + */ + if legacyBuildFiles { + // In legacy mode, we require the user to provide the Gradle Nexus Publish Plugin version. + if packageInfo.GradleNexusPublishPluginVersion != "" { + ctx.GradleNexusPublishPluginEnabled = true + ctx.GradleNexusPublishPluginVersion = packageInfo.GradleNexusPublishPluginVersion + } + } else if packageInfo.BuildFiles == "" || packageInfo.BuildFiles == "gradle-nexus" { + version := DefaultGradleNexusPublishPluginVersion + if packageInfo.GradleNexusPublishPluginVersion != "" { + version = packageInfo.GradleNexusPublishPluginVersion + } + ctx.GradleNexusPublishPluginEnabled = true + ctx.GradleNexusPublishPluginVersion = version + } else if packageInfo.BuildFiles == "gradle" && packageInfo.GradleNexusPublishPluginVersion != "" { ctx.GradleNexusPublishPluginEnabled = true ctx.GradleNexusPublishPluginVersion = packageInfo.GradleNexusPublishPluginVersion } diff --git a/pkg/codegen/java/templates_gradle_test.go b/pkg/codegen/java/templates_gradle_test.go index e66a52eb569..658d7e435ad 100644 --- a/pkg/codegen/java/templates_gradle_test.go +++ b/pkg/codegen/java/templates_gradle_test.go @@ -3,17 +3,41 @@ package java import ( + "os" + "path/filepath" "testing" "github.com/blang/semver" "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/pulumi/pulumi/pkg/v3/codegen/schema" ) +func TestNewGradleTemplateContextLegacy(t *testing.T) { + pkg, info := eksExample() + tctx := newGradleTemplateContext(pkg, info, true /*legacyBuildFiles*/) + assert.Equal(t, "0.37.1", tctx.Version) + assert.Equal(t, "com.pulumi", tctx.GroupID) + assert.Equal(t, "eks", tctx.Name) + assert.Equal(t, "https://github.com/pulumi/pulumi-eks", tctx.ProjectURL) + assert.Equal(t, "git@github.com/pulumi/pulumi-eks.git", tctx.ProjectGitURL) + assert.Equal(t, "Pulumi Amazon Web Services (AWS) EKS Components.", tctx.ProjectDescription) + assert.Equal(t, "2022", tctx.ProjectInceptionYear) + assert.Equal(t, "com.pulumi.eks", tctx.RootProjectName) + assert.Equal(t, "pulumi-eks", tctx.ProjectName) + assert.Equal(t, "pulumi", tctx.DeveloperID) + assert.Equal(t, "support@pulumi.com", tctx.DeveloperEmail) + assert.Equal(t, "The Apache License, Version 2.0", tctx.LicenceName) + assert.Equal(t, "http://www.apache.org/licenses/LICENSE-2.0.txt", tctx.LicenceURL) + assert.Equal(t, info.Dependencies, tctx.Dependencies) + assert.Equal(t, "", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, false, tctx.GradleNexusPublishPluginEnabled) +} + func TestNewGradleTemplateContext(t *testing.T) { pkg, info := eksExample() - tctx := newGradleTemplateContext(pkg, info) + tctx := newGradleTemplateContext(pkg, info, false /*legacyBuildFiles*/) assert.Equal(t, "0.37.1", tctx.Version) assert.Equal(t, "com.pulumi", tctx.GroupID) assert.Equal(t, "eks", tctx.Name) @@ -28,15 +52,83 @@ func TestNewGradleTemplateContext(t *testing.T) { assert.Equal(t, "The Apache License, Version 2.0", tctx.LicenceName) assert.Equal(t, "http://www.apache.org/licenses/LICENSE-2.0.txt", tctx.LicenceURL) assert.Equal(t, info.Dependencies, tctx.Dependencies) + assert.Equal(t, "2.0.0", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, true, tctx.GradleNexusPublishPluginEnabled) +} + +func TestNewGradleTemplateContextBuildFiles(t *testing.T) { + pkg, _ := eksExample() + + // Legacy build files: false + + // We default to the behavior of `gradle-nexus`. + info := &PackageInfo{BuildFiles: ""} + tctx := newGradleTemplateContext(pkg, info, false /*legacyBuildFiles*/) + assert.Equal(t, "2.0.0", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, true, tctx.GradleNexusPublishPluginEnabled) + + info = &PackageInfo{BuildFiles: "gradle-nexus"} + tctx = newGradleTemplateContext(pkg, info, false /*legacyBuildFiles*/) + assert.Equal(t, "2.0.0", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, true, tctx.GradleNexusPublishPluginEnabled) + + info = &PackageInfo{BuildFiles: "gradle-nexus", GradleNexusPublishPluginVersion: "1.2.3"} + tctx = newGradleTemplateContext(pkg, info, false /*legacyBuildFiles*/) + assert.Equal(t, "1.2.3", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, true, tctx.GradleNexusPublishPluginEnabled) + + info = &PackageInfo{BuildFiles: "gradle"} + tctx = newGradleTemplateContext(pkg, info, false /*legacyBuildFiles*/) + assert.Equal(t, "", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, false, tctx.GradleNexusPublishPluginEnabled) + + info = &PackageInfo{BuildFiles: "gradle", GradleNexusPublishPluginVersion: "1.2.3"} + tctx = newGradleTemplateContext(pkg, info, false /*legacyBuildFiles*/) + assert.Equal(t, "1.2.3", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, true, tctx.GradleNexusPublishPluginEnabled) + + // Legacy build files: true + + info = &PackageInfo{BuildFiles: ""} + tctx = newGradleTemplateContext(pkg, info, true /*legacyBuildFiles*/) + assert.Equal(t, "", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, false, tctx.GradleNexusPublishPluginEnabled) + + info = &PackageInfo{BuildFiles: "gradle"} + tctx = newGradleTemplateContext(pkg, info, true /*legacyBuildFiles*/) + assert.Equal(t, "", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, false, tctx.GradleNexusPublishPluginEnabled) + + info = &PackageInfo{BuildFiles: "gradle", GradleNexusPublishPluginVersion: "1.2.3"} + tctx = newGradleTemplateContext(pkg, info, true /*legacyBuildFiles*/) + assert.Equal(t, "1.2.3", tctx.GradleNexusPublishPluginVersion) + assert.Equal(t, true, tctx.GradleNexusPublishPluginEnabled) +} + +func TestGenGradleProjectLegacyTrue(t *testing.T) { + pkg, info := eksExample() + files := fs{} + err := genGradleProject(pkg, info, files, true /*legacyBuildFiles*/) + if err != nil { + t.Error(err) + } + gradleFile := files["build.gradle"] + snapshot, err := os.ReadFile(filepath.Join("testdata", "gen-gradle-project-legacy-true", "build.gradle")) + require.NoError(t, err) + require.Equal(t, string(snapshot), string(gradleFile)) } -func TestGenGradleProject(t *testing.T) { +func TestGenGradleProjectLegacyFalse(t *testing.T) { pkg, info := eksExample() files := fs{} - err := genGradleProject(pkg, info, files) + err := genGradleProject(pkg, info, files, false /*legacyBuildFiles*/) if err != nil { t.Error(err) } + gradleFile := files["build.gradle"] + snapshot, err := os.ReadFile(filepath.Join("testdata", "gen-gradle-project-legacy-false", "build.gradle")) + require.NoError(t, err) + require.Equal(t, string(snapshot), string(gradleFile)) } func eksExample() (*schema.Package, *PackageInfo) { diff --git a/pkg/codegen/java/testdata/gen-gradle-project-legacy-false/build.gradle b/pkg/codegen/java/testdata/gen-gradle-project-legacy-false/build.gradle new file mode 100644 index 00000000000..66839f16b8c --- /dev/null +++ b/pkg/codegen/java/testdata/gen-gradle-project-legacy-false/build.gradle @@ -0,0 +1,155 @@ +// *** WARNING: this file was generated by pulumi-java-gen *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +plugins { + id("signing") + id("java-library") + id("maven-publish") + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" +} + +group = "com.pulumi" + +def resolvedVersion = System.getenv("PACKAGE_VERSION") ?: + (project.version == "unspecified" + ? "0.37.1" + : project.version) + +def signingKey = System.getenv("SIGNING_KEY") +def signingPassword = System.getenv("SIGNING_PASSWORD") +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") + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +compileJava { + options.fork = true + options.forkOptions.jvmArgs.addAll(["-Xmx16g"]) + options.encoding = "UTF-8" +} + +repositories { + mavenLocal() + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + mavenCentral() +} + +dependencies { + implementation("com.pulumi:aws:5.4.0") + implementation("com.pulumi:kubernetes:3.19.1") + implementation("com.pulumi:pulumi:0.1.0") +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + archiveClassifier.set('sources') +} + +task javadocJar(type: Jar) { + from javadoc + archiveClassifier.set('javadoc') + zip64 = true +} + +def genPulumiResources = tasks.register('genPulumiResources') { + doLast { + def resourcesDir = sourceSets.main.output.resourcesDir + def subDir = project.name.replace(".", "/") + def outDir = file("$resourcesDir/$subDir") + outDir.mkdirs() + new File(outDir, "version.txt").text = resolvedVersion + def builder = new groovy.json.JsonBuilder() + builder { + resource true + name "eks" + version resolvedVersion + } + def infoJson = builder.toPrettyString() + new File(outDir, "plugin.json").text = infoJson + } +} + +jar.configure { + dependsOn genPulumiResources +} + +publishing { + publications { + mainPublication(MavenPublication) { + groupId = "com.pulumi" + artifactId = "eks" + version = resolvedVersion + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + inceptionYear = "2022" + name = "pulumi-eks" + packaging = "jar" + description = "Pulumi Amazon Web Services (AWS) EKS Components." + + url = "https://github.com/pulumi/pulumi-eks" + + scm { + connection = "git@github.com/pulumi/pulumi-eks.git" + developerConnection = "git@github.com/pulumi/pulumi-eks.git" + url = "https://github.com/pulumi/pulumi-eks" + } + + licenses { + license { + name = "The Apache License, Version 2.0" + url = "http://www.apache.org/licenses/LICENSE-2.0.txt" + } + } + + developers { + developer { + id = "pulumi" + name = "Pulumi" + email = "support@pulumi.com" + } + } + } + } + } +} + +javadoc { + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options.jFlags("-Xmx8g", "-Xms512m") +} + +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) + sign publishing.publications.mainPublication + } +} \ No newline at end of file diff --git a/pkg/codegen/java/testdata/gen-gradle-project-legacy-true/build.gradle b/pkg/codegen/java/testdata/gen-gradle-project-legacy-true/build.gradle new file mode 100644 index 00000000000..c4abfcb1487 --- /dev/null +++ b/pkg/codegen/java/testdata/gen-gradle-project-legacy-true/build.gradle @@ -0,0 +1,154 @@ +// *** WARNING: this file was generated by pulumi-java-gen *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +plugins { + id("signing") + id("java-library") + id("maven-publish") +} + +group = "com.pulumi" + +def resolvedVersion = System.getenv("PACKAGE_VERSION") ?: + (project.version == "unspecified" + ? "0.37.1" + : project.version) + +def signingKey = System.getenv("SIGNING_KEY") +def signingPassword = System.getenv("SIGNING_PASSWORD") +def publishRepoURL = System.getenv("PUBLISH_REPO_URL") +def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME") +def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD") + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +compileJava { + options.fork = true + options.forkOptions.jvmArgs.addAll(["-Xmx16g"]) + options.encoding = "UTF-8" +} + +repositories { + mavenLocal() + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + mavenCentral() +} + +dependencies { + implementation("com.pulumi:aws:5.4.0") + implementation("com.pulumi:kubernetes:3.19.1") + implementation("com.pulumi:pulumi:0.1.0") +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + archiveClassifier.set('sources') +} + +task javadocJar(type: Jar) { + from javadoc + archiveClassifier.set('javadoc') + zip64 = true +} + +def genPulumiResources = tasks.register('genPulumiResources') { + doLast { + def resourcesDir = sourceSets.main.output.resourcesDir + def subDir = project.name.replace(".", "/") + def outDir = file("$resourcesDir/$subDir") + outDir.mkdirs() + new File(outDir, "version.txt").text = resolvedVersion + def builder = new groovy.json.JsonBuilder() + builder { + resource true + name "eks" + version resolvedVersion + } + def infoJson = builder.toPrettyString() + new File(outDir, "plugin.json").text = infoJson + } +} + +jar.configure { + dependsOn genPulumiResources +} + +publishing { + publications { + mainPublication(MavenPublication) { + groupId = "com.pulumi" + artifactId = "eks" + version = resolvedVersion + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + inceptionYear = "2022" + name = "pulumi-eks" + packaging = "jar" + description = "Pulumi Amazon Web Services (AWS) EKS Components." + + url = "https://github.com/pulumi/pulumi-eks" + + scm { + connection = "git@github.com/pulumi/pulumi-eks.git" + developerConnection = "git@github.com/pulumi/pulumi-eks.git" + url = "https://github.com/pulumi/pulumi-eks" + } + + licenses { + license { + name = "The Apache License, Version 2.0" + url = "http://www.apache.org/licenses/LICENSE-2.0.txt" + } + } + + developers { + developer { + id = "pulumi" + name = "Pulumi" + email = "support@pulumi.com" + } + } + } + } + } + + if (publishRepoURL) { + repositories { + maven { + name = "PublishRepo" + url = publishRepoURL + credentials { + username = publishRepoUsername + password = publishRepoPassword + } + } + } + } +} + +javadoc { + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options.jFlags("-Xmx8g", "-Xms512m") +} + +jar { + zip64 = true +} + +if (signingKey) { + signing { + useInMemoryPgpKeys(signingKey, signingPassword) + sign publishing.publications.mainPublication + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/akamai/java/build.gradle b/pkg/codegen/testing/test/testdata/akamai/java/build.gradle index fc0ce46828a..b745ed97aa6 100644 --- a/pkg/codegen/testing/test/testdata/akamai/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/akamai/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/assets-and-archives/java/build.gradle b/pkg/codegen/testing/test/testdata/assets-and-archives/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/assets-and-archives/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/assets-and-archives/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/azure-native-nested-types/java/build.gradle b/pkg/codegen/testing/test/testdata/azure-native-nested-types/java/build.gradle index da979ac0d75..984532801d3 100644 --- a/pkg/codegen/testing/test/testdata/azure-native-nested-types/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/azure-native-nested-types/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/build-files/gradle-nexus/java/README.md b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/README.md new file mode 100644 index 00000000000..6b0d347bb27 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/README.md @@ -0,0 +1 @@ +test description diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/build.gradle b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/build.gradle new file mode 100644 index 00000000000..f7d8729b951 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/build.gradle @@ -0,0 +1,155 @@ +// *** WARNING: this file was generated by pulumi-java-gen *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +plugins { + id("signing") + id("java-library") + id("maven-publish") + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" +} + +group = "com.pulumi" + +def resolvedVersion = System.getenv("PACKAGE_VERSION") ?: + (project.version == "unspecified" + ? "0.0.1" + : project.version) + +def signingKey = System.getenv("SIGNING_KEY") +def signingPassword = System.getenv("SIGNING_PASSWORD") +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") + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +compileJava { + options.fork = true + options.forkOptions.jvmArgs.addAll(["-Xmx16g"]) + options.encoding = "UTF-8" +} + +repositories { + mavenLocal() + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + mavenCentral() +} + +dependencies { + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.google.code.gson:gson:2.8.9") + implementation("com.pulumi:pulumi:0.0.1") +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + archiveClassifier.set('sources') +} + +task javadocJar(type: Jar) { + from javadoc + archiveClassifier.set('javadoc') + zip64 = true +} + +def genPulumiResources = tasks.register('genPulumiResources') { + doLast { + def resourcesDir = sourceSets.main.output.resourcesDir + def subDir = project.name.replace(".", "/") + def outDir = file("$resourcesDir/$subDir") + outDir.mkdirs() + new File(outDir, "version.txt").text = resolvedVersion + def builder = new groovy.json.JsonBuilder() + builder { + resource true + name "example" + version resolvedVersion + } + def infoJson = builder.toPrettyString() + new File(outDir, "plugin.json").text = infoJson + } +} + +jar.configure { + dependsOn genPulumiResources +} + +publishing { + publications { + mainPublication(MavenPublication) { + groupId = "com.pulumi" + artifactId = "example" + version = resolvedVersion + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + inceptionYear = "2022" + name = "pulumi-example" + packaging = "jar" + description = "test description" + + url = "https://github.com/pulumi/pulumi-java" + + scm { + connection = "git@github.com/pulumi/pulumi-java.git" + developerConnection = "git@github.com/pulumi/pulumi-java.git" + url = "https://github.com/pulumi/pulumi-java" + } + + licenses { + license { + name = "" + url = "" + } + } + + developers { + developer { + id = "pulumi" + name = "Pulumi" + email = "support@pulumi.com" + } + } + } + } + } +} + +javadoc { + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options.jFlags("-Xmx8g", "-Xms512m") +} + +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) + sign publishing.publications.mainPublication + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/codegen-manifest.json b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/codegen-manifest.json new file mode 100644 index 00000000000..d73a9826d6c --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/codegen-manifest.json @@ -0,0 +1,10 @@ +{ + "emittedFiles": [ + "README.md", + "build.gradle", + "settings.gradle", + "src/main/java/com/pulumi/example/Provider.java", + "src/main/java/com/pulumi/example/ProviderArgs.java", + "src/main/java/com/pulumi/example/Utilities.java" + ] +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/settings.gradle b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/settings.gradle new file mode 100644 index 00000000000..a5ad86818fe --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/settings.gradle @@ -0,0 +1,14 @@ +// *** WARNING: this file was generated by pulumi-java-gen. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +pluginManagement { + repositories { + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + gradlePluginPortal() + } +} + +rootProject.name = "com.pulumi.example" +include("lib") diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/Provider.java b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/Provider.java new file mode 100644 index 00000000000..a76332ced95 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/Provider.java @@ -0,0 +1,54 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + +import com.pulumi.core.Output; +import com.pulumi.core.annotations.ResourceType; +import com.pulumi.core.internal.Codegen; +import com.pulumi.example.ProviderArgs; +import com.pulumi.example.Utilities; +import javax.annotation.Nullable; + +@ResourceType(type="pulumi:providers:example") +public class Provider extends com.pulumi.resources.ProviderResource { + /** + * + * @param name The _unique_ name of the resulting resource. + */ + public Provider(java.lang.String name) { + this(name, ProviderArgs.Empty); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args) { + this(name, args, null); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + * @param options A bag of options that control this resource's behavior. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("example", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); + } + + private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ProviderArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() + .version(Utilities.getVersion()) + .build(); + return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id); + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/ProviderArgs.java b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/ProviderArgs.java new file mode 100644 index 00000000000..e07bfe9857d --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/ProviderArgs.java @@ -0,0 +1,28 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + +public final class ProviderArgs extends com.pulumi.resources.ResourceArgs { + + public static final ProviderArgs Empty = new ProviderArgs(); + + public static Builder builder() { + return new Builder(); + } + + public static final class Builder { + private ProviderArgs $; + + public Builder() { + $ = new ProviderArgs(); + } + public ProviderArgs build() { + return $; + } + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/Utilities.java b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/Utilities.java new file mode 100644 index 00000000000..f248a63d2b3 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/java/src/main/java/com/pulumi/example/Utilities.java @@ -0,0 +1,102 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Optional; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import com.pulumi.core.internal.Environment; +import com.pulumi.deployment.InvokeOptions; +import com.pulumi.deployment.InvokeOutputOptions; + +public class Utilities { + + public static Optional getEnv(java.lang.String... names) { + for (var n : names) { + var value = Environment.getEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvBoolean(java.lang.String... names) { + for (var n : names) { + var value = Environment.getBooleanEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvInteger(java.lang.String... names) { + for (var n : names) { + var value = Environment.getIntegerEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvDouble(java.lang.String... names) { + for (var n : names) { + var value = Environment.getDoubleEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static InvokeOptions withVersion(@Nullable InvokeOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion() + ); + } + + public static InvokeOutputOptions withVersion(@Nullable InvokeOutputOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOutputOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion(), + options == null ? null : options.getDependsOn() + ); + } + + private static final java.lang.String version; + public static java.lang.String getVersion() { + return version; + } + + static { + var resourceName = "com/pulumi/example/version.txt"; + var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName); + if (versionFile == null) { + throw new IllegalStateException( + java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName) + ); + } + version = new BufferedReader(new InputStreamReader(versionFile)) + .lines() + .collect(Collectors.joining("\n")) + .trim(); + } +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/schema.json b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/schema.json new file mode 100644 index 00000000000..57a25392bba --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle-nexus/schema.json @@ -0,0 +1,21 @@ +{ + "version": "0.0.1", + "name": "example", + "keywords": [ + "Testing", + "Pulumipus" + ], + "description": "Test the none setting for build-files", + "license": "MIT", + "types": {}, + "readme": "hello this is the readme body.", + "homepage": "https://pulumi.com", + "repository": "https://github.com/pulumi/pulumi", + "resources": {}, + "functions": {}, + "language": { + "java": { + "buildFiles": "gradle-nexus" + } + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/README.md b/pkg/codegen/testing/test/testdata/build-files/gradle/java/README.md new file mode 100644 index 00000000000..6b0d347bb27 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/README.md @@ -0,0 +1 @@ +test description diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/build.gradle b/pkg/codegen/testing/test/testdata/build-files/gradle/java/build.gradle new file mode 100644 index 00000000000..8e038efaba3 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/build.gradle @@ -0,0 +1,154 @@ +// *** WARNING: this file was generated by pulumi-java-gen *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +plugins { + id("signing") + id("java-library") + id("maven-publish") +} + +group = "com.pulumi" + +def resolvedVersion = System.getenv("PACKAGE_VERSION") ?: + (project.version == "unspecified" + ? "0.0.1" + : project.version) + +def signingKey = System.getenv("SIGNING_KEY") +def signingPassword = System.getenv("SIGNING_PASSWORD") +def publishRepoURL = System.getenv("PUBLISH_REPO_URL") +def publishRepoUsername = System.getenv("PUBLISH_REPO_USERNAME") +def publishRepoPassword = System.getenv("PUBLISH_REPO_PASSWORD") + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +compileJava { + options.fork = true + options.forkOptions.jvmArgs.addAll(["-Xmx16g"]) + options.encoding = "UTF-8" +} + +repositories { + mavenLocal() + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + mavenCentral() +} + +dependencies { + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.google.code.gson:gson:2.8.9") + implementation("com.pulumi:pulumi:0.0.1") +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + archiveClassifier.set('sources') +} + +task javadocJar(type: Jar) { + from javadoc + archiveClassifier.set('javadoc') + zip64 = true +} + +def genPulumiResources = tasks.register('genPulumiResources') { + doLast { + def resourcesDir = sourceSets.main.output.resourcesDir + def subDir = project.name.replace(".", "/") + def outDir = file("$resourcesDir/$subDir") + outDir.mkdirs() + new File(outDir, "version.txt").text = resolvedVersion + def builder = new groovy.json.JsonBuilder() + builder { + resource true + name "example" + version resolvedVersion + } + def infoJson = builder.toPrettyString() + new File(outDir, "plugin.json").text = infoJson + } +} + +jar.configure { + dependsOn genPulumiResources +} + +publishing { + publications { + mainPublication(MavenPublication) { + groupId = "com.pulumi" + artifactId = "example" + version = resolvedVersion + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + inceptionYear = "2022" + name = "pulumi-example" + packaging = "jar" + description = "test description" + + url = "https://github.com/pulumi/pulumi-java" + + scm { + connection = "git@github.com/pulumi/pulumi-java.git" + developerConnection = "git@github.com/pulumi/pulumi-java.git" + url = "https://github.com/pulumi/pulumi-java" + } + + licenses { + license { + name = "" + url = "" + } + } + + developers { + developer { + id = "pulumi" + name = "Pulumi" + email = "support@pulumi.com" + } + } + } + } + } + + if (publishRepoURL) { + repositories { + maven { + name = "PublishRepo" + url = publishRepoURL + credentials { + username = publishRepoUsername + password = publishRepoPassword + } + } + } + } +} + +javadoc { + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options.jFlags("-Xmx8g", "-Xms512m") +} + +jar { + zip64 = true +} + +if (signingKey) { + signing { + useInMemoryPgpKeys(signingKey, signingPassword) + sign publishing.publications.mainPublication + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/codegen-manifest.json b/pkg/codegen/testing/test/testdata/build-files/gradle/java/codegen-manifest.json new file mode 100644 index 00000000000..d73a9826d6c --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/codegen-manifest.json @@ -0,0 +1,10 @@ +{ + "emittedFiles": [ + "README.md", + "build.gradle", + "settings.gradle", + "src/main/java/com/pulumi/example/Provider.java", + "src/main/java/com/pulumi/example/ProviderArgs.java", + "src/main/java/com/pulumi/example/Utilities.java" + ] +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/settings.gradle b/pkg/codegen/testing/test/testdata/build-files/gradle/java/settings.gradle new file mode 100644 index 00000000000..a5ad86818fe --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/settings.gradle @@ -0,0 +1,14 @@ +// *** WARNING: this file was generated by pulumi-java-gen. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +pluginManagement { + repositories { + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + gradlePluginPortal() + } +} + +rootProject.name = "com.pulumi.example" +include("lib") diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/Provider.java b/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/Provider.java new file mode 100644 index 00000000000..a76332ced95 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/Provider.java @@ -0,0 +1,54 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + +import com.pulumi.core.Output; +import com.pulumi.core.annotations.ResourceType; +import com.pulumi.core.internal.Codegen; +import com.pulumi.example.ProviderArgs; +import com.pulumi.example.Utilities; +import javax.annotation.Nullable; + +@ResourceType(type="pulumi:providers:example") +public class Provider extends com.pulumi.resources.ProviderResource { + /** + * + * @param name The _unique_ name of the resulting resource. + */ + public Provider(java.lang.String name) { + this(name, ProviderArgs.Empty); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args) { + this(name, args, null); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + * @param options A bag of options that control this resource's behavior. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("example", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); + } + + private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ProviderArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() + .version(Utilities.getVersion()) + .build(); + return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id); + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/ProviderArgs.java b/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/ProviderArgs.java new file mode 100644 index 00000000000..e07bfe9857d --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/ProviderArgs.java @@ -0,0 +1,28 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + +public final class ProviderArgs extends com.pulumi.resources.ResourceArgs { + + public static final ProviderArgs Empty = new ProviderArgs(); + + public static Builder builder() { + return new Builder(); + } + + public static final class Builder { + private ProviderArgs $; + + public Builder() { + $ = new ProviderArgs(); + } + public ProviderArgs build() { + return $; + } + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/Utilities.java b/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/Utilities.java new file mode 100644 index 00000000000..f248a63d2b3 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/java/src/main/java/com/pulumi/example/Utilities.java @@ -0,0 +1,102 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Optional; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import com.pulumi.core.internal.Environment; +import com.pulumi.deployment.InvokeOptions; +import com.pulumi.deployment.InvokeOutputOptions; + +public class Utilities { + + public static Optional getEnv(java.lang.String... names) { + for (var n : names) { + var value = Environment.getEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvBoolean(java.lang.String... names) { + for (var n : names) { + var value = Environment.getBooleanEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvInteger(java.lang.String... names) { + for (var n : names) { + var value = Environment.getIntegerEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvDouble(java.lang.String... names) { + for (var n : names) { + var value = Environment.getDoubleEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static InvokeOptions withVersion(@Nullable InvokeOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion() + ); + } + + public static InvokeOutputOptions withVersion(@Nullable InvokeOutputOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOutputOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion(), + options == null ? null : options.getDependsOn() + ); + } + + private static final java.lang.String version; + public static java.lang.String getVersion() { + return version; + } + + static { + var resourceName = "com/pulumi/example/version.txt"; + var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName); + if (versionFile == null) { + throw new IllegalStateException( + java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName) + ); + } + version = new BufferedReader(new InputStreamReader(versionFile)) + .lines() + .collect(Collectors.joining("\n")) + .trim(); + } +} diff --git a/pkg/codegen/testing/test/testdata/build-files/gradle/schema.json b/pkg/codegen/testing/test/testdata/build-files/gradle/schema.json new file mode 100644 index 00000000000..7e786066dd0 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/gradle/schema.json @@ -0,0 +1,21 @@ +{ + "version": "0.0.1", + "name": "example", + "keywords": [ + "Testing", + "Pulumipus" + ], + "description": "Test the none setting for build-files", + "license": "MIT", + "types": {}, + "readme": "hello this is the readme body.", + "homepage": "https://pulumi.com", + "repository": "https://github.com/pulumi/pulumi", + "resources": {}, + "functions": {}, + "language": { + "java": { + "buildFiles": "gradle" + } + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/none/java/README.md b/pkg/codegen/testing/test/testdata/build-files/none/java/README.md new file mode 100644 index 00000000000..6b0d347bb27 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/java/README.md @@ -0,0 +1 @@ +test description diff --git a/pkg/codegen/testing/test/testdata/build-files/none/java/codegen-manifest.json b/pkg/codegen/testing/test/testdata/build-files/none/java/codegen-manifest.json new file mode 100644 index 00000000000..3f41fd4d816 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/java/codegen-manifest.json @@ -0,0 +1,9 @@ +{ + "emittedFiles": [ + "README.md", + "src/main/java/com/pulumi/example/Provider.java", + "src/main/java/com/pulumi/example/ProviderArgs.java", + "src/main/java/com/pulumi/example/Utilities.java", + "src/main/resources/com/pulumi/example/version.txt" + ] +} diff --git a/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/Provider.java b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/Provider.java new file mode 100644 index 00000000000..a76332ced95 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/Provider.java @@ -0,0 +1,54 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + +import com.pulumi.core.Output; +import com.pulumi.core.annotations.ResourceType; +import com.pulumi.core.internal.Codegen; +import com.pulumi.example.ProviderArgs; +import com.pulumi.example.Utilities; +import javax.annotation.Nullable; + +@ResourceType(type="pulumi:providers:example") +public class Provider extends com.pulumi.resources.ProviderResource { + /** + * + * @param name The _unique_ name of the resulting resource. + */ + public Provider(java.lang.String name) { + this(name, ProviderArgs.Empty); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args) { + this(name, args, null); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + * @param options A bag of options that control this resource's behavior. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("example", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); + } + + private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ProviderArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() + .version(Utilities.getVersion()) + .build(); + return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id); + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/ProviderArgs.java b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/ProviderArgs.java new file mode 100644 index 00000000000..e07bfe9857d --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/ProviderArgs.java @@ -0,0 +1,28 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + +public final class ProviderArgs extends com.pulumi.resources.ResourceArgs { + + public static final ProviderArgs Empty = new ProviderArgs(); + + public static Builder builder() { + return new Builder(); + } + + public static final class Builder { + private ProviderArgs $; + + public Builder() { + $ = new ProviderArgs(); + } + public ProviderArgs build() { + return $; + } + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/Utilities.java b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/Utilities.java new file mode 100644 index 00000000000..f248a63d2b3 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/java/com/pulumi/example/Utilities.java @@ -0,0 +1,102 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Optional; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import com.pulumi.core.internal.Environment; +import com.pulumi.deployment.InvokeOptions; +import com.pulumi.deployment.InvokeOutputOptions; + +public class Utilities { + + public static Optional getEnv(java.lang.String... names) { + for (var n : names) { + var value = Environment.getEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvBoolean(java.lang.String... names) { + for (var n : names) { + var value = Environment.getBooleanEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvInteger(java.lang.String... names) { + for (var n : names) { + var value = Environment.getIntegerEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvDouble(java.lang.String... names) { + for (var n : names) { + var value = Environment.getDoubleEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static InvokeOptions withVersion(@Nullable InvokeOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion() + ); + } + + public static InvokeOutputOptions withVersion(@Nullable InvokeOutputOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOutputOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion(), + options == null ? null : options.getDependsOn() + ); + } + + private static final java.lang.String version; + public static java.lang.String getVersion() { + return version; + } + + static { + var resourceName = "com/pulumi/example/version.txt"; + var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName); + if (versionFile == null) { + throw new IllegalStateException( + java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName) + ); + } + version = new BufferedReader(new InputStreamReader(versionFile)) + .lines() + .collect(Collectors.joining("\n")) + .trim(); + } +} diff --git a/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/resources/com/pulumi/example/version.txt b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/resources/com/pulumi/example/version.txt new file mode 100644 index 00000000000..8a9ecc2ea99 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/java/src/main/resources/com/pulumi/example/version.txt @@ -0,0 +1 @@ +0.0.1 \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/none/schema.json b/pkg/codegen/testing/test/testdata/build-files/none/schema.json new file mode 100644 index 00000000000..d5d4b9c2257 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/none/schema.json @@ -0,0 +1,21 @@ +{ + "version": "0.0.1", + "name": "example", + "keywords": [ + "Testing", + "Pulumipus" + ], + "description": "Test the none setting for build-files", + "license": "MIT", + "types": {}, + "readme": "hello this is the readme body.", + "homepage": "https://pulumi.com", + "repository": "https://github.com/pulumi/pulumi", + "resources": {}, + "functions": {}, + "language": { + "java": { + "buildFiles": "none" + } + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/README.md b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/README.md new file mode 100644 index 00000000000..6b0d347bb27 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/README.md @@ -0,0 +1 @@ +test description diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/build.gradle b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/build.gradle new file mode 100644 index 00000000000..f7d8729b951 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/build.gradle @@ -0,0 +1,155 @@ +// *** WARNING: this file was generated by pulumi-java-gen *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +plugins { + id("signing") + id("java-library") + id("maven-publish") + id("io.github.gradle-nexus.publish-plugin") version "2.0.0" +} + +group = "com.pulumi" + +def resolvedVersion = System.getenv("PACKAGE_VERSION") ?: + (project.version == "unspecified" + ? "0.0.1" + : project.version) + +def signingKey = System.getenv("SIGNING_KEY") +def signingPassword = System.getenv("SIGNING_PASSWORD") +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") + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(11) + } +} + +compileJava { + options.fork = true + options.forkOptions.jvmArgs.addAll(["-Xmx16g"]) + options.encoding = "UTF-8" +} + +repositories { + mavenLocal() + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + mavenCentral() +} + +dependencies { + implementation("com.google.code.findbugs:jsr305:3.0.2") + implementation("com.google.code.gson:gson:2.8.9") + implementation("com.pulumi:pulumi:0.0.1") +} + +task sourcesJar(type: Jar) { + from sourceSets.main.allJava + archiveClassifier.set('sources') +} + +task javadocJar(type: Jar) { + from javadoc + archiveClassifier.set('javadoc') + zip64 = true +} + +def genPulumiResources = tasks.register('genPulumiResources') { + doLast { + def resourcesDir = sourceSets.main.output.resourcesDir + def subDir = project.name.replace(".", "/") + def outDir = file("$resourcesDir/$subDir") + outDir.mkdirs() + new File(outDir, "version.txt").text = resolvedVersion + def builder = new groovy.json.JsonBuilder() + builder { + resource true + name "example" + version resolvedVersion + } + def infoJson = builder.toPrettyString() + new File(outDir, "plugin.json").text = infoJson + } +} + +jar.configure { + dependsOn genPulumiResources +} + +publishing { + publications { + mainPublication(MavenPublication) { + groupId = "com.pulumi" + artifactId = "example" + version = resolvedVersion + from components.java + artifact sourcesJar + artifact javadocJar + + pom { + inceptionYear = "2022" + name = "pulumi-example" + packaging = "jar" + description = "test description" + + url = "https://github.com/pulumi/pulumi-java" + + scm { + connection = "git@github.com/pulumi/pulumi-java.git" + developerConnection = "git@github.com/pulumi/pulumi-java.git" + url = "https://github.com/pulumi/pulumi-java" + } + + licenses { + license { + name = "" + url = "" + } + } + + developers { + developer { + id = "pulumi" + name = "Pulumi" + email = "support@pulumi.com" + } + } + } + } + } +} + +javadoc { + if (JavaVersion.current().isJava9Compatible()) { + options.addBooleanOption('html5', true) + } + options.jFlags("-Xmx8g", "-Xms512m") +} + +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) + sign publishing.publications.mainPublication + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/codegen-manifest.json b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/codegen-manifest.json new file mode 100644 index 00000000000..d73a9826d6c --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/codegen-manifest.json @@ -0,0 +1,10 @@ +{ + "emittedFiles": [ + "README.md", + "build.gradle", + "settings.gradle", + "src/main/java/com/pulumi/example/Provider.java", + "src/main/java/com/pulumi/example/ProviderArgs.java", + "src/main/java/com/pulumi/example/Utilities.java" + ] +} diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/settings.gradle b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/settings.gradle new file mode 100644 index 00000000000..a5ad86818fe --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/settings.gradle @@ -0,0 +1,14 @@ +// *** WARNING: this file was generated by pulumi-java-gen. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +pluginManagement { + repositories { + maven { // The google mirror is less flaky than mavenCentral() + url("https://maven-central.storage-download.googleapis.com/maven2/") + } + gradlePluginPortal() + } +} + +rootProject.name = "com.pulumi.example" +include("lib") diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/Provider.java b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/Provider.java new file mode 100644 index 00000000000..a76332ced95 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/Provider.java @@ -0,0 +1,54 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + +import com.pulumi.core.Output; +import com.pulumi.core.annotations.ResourceType; +import com.pulumi.core.internal.Codegen; +import com.pulumi.example.ProviderArgs; +import com.pulumi.example.Utilities; +import javax.annotation.Nullable; + +@ResourceType(type="pulumi:providers:example") +public class Provider extends com.pulumi.resources.ProviderResource { + /** + * + * @param name The _unique_ name of the resulting resource. + */ + public Provider(java.lang.String name) { + this(name, ProviderArgs.Empty); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args) { + this(name, args, null); + } + /** + * + * @param name The _unique_ name of the resulting resource. + * @param args The arguments to use to populate this resource's properties. + * @param options A bag of options that control this resource's behavior. + */ + public Provider(java.lang.String name, @Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + super("example", name, makeArgs(args, options), makeResourceOptions(options, Codegen.empty()), false); + } + + private static ProviderArgs makeArgs(@Nullable ProviderArgs args, @Nullable com.pulumi.resources.CustomResourceOptions options) { + if (options != null && options.getUrn().isPresent()) { + return null; + } + return args == null ? ProviderArgs.Empty : args; + } + + private static com.pulumi.resources.CustomResourceOptions makeResourceOptions(@Nullable com.pulumi.resources.CustomResourceOptions options, @Nullable Output id) { + var defaultOptions = com.pulumi.resources.CustomResourceOptions.builder() + .version(Utilities.getVersion()) + .build(); + return com.pulumi.resources.CustomResourceOptions.merge(defaultOptions, options, id); + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/ProviderArgs.java b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/ProviderArgs.java new file mode 100644 index 00000000000..e07bfe9857d --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/ProviderArgs.java @@ -0,0 +1,28 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + +public final class ProviderArgs extends com.pulumi.resources.ResourceArgs { + + public static final ProviderArgs Empty = new ProviderArgs(); + + public static Builder builder() { + return new Builder(); + } + + public static final class Builder { + private ProviderArgs $; + + public Builder() { + $ = new ProviderArgs(); + } + public ProviderArgs build() { + return $; + } + } + +} diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/Utilities.java b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/Utilities.java new file mode 100644 index 00000000000..f248a63d2b3 --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/java/src/main/java/com/pulumi/example/Utilities.java @@ -0,0 +1,102 @@ +// *** WARNING: this file was generated by test. *** +// *** Do not edit by hand unless you're certain you know what you are doing! *** + +package com.pulumi.example; + + + + + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.Optional; +import java.util.stream.Collectors; +import javax.annotation.Nullable; +import com.pulumi.core.internal.Environment; +import com.pulumi.deployment.InvokeOptions; +import com.pulumi.deployment.InvokeOutputOptions; + +public class Utilities { + + public static Optional getEnv(java.lang.String... names) { + for (var n : names) { + var value = Environment.getEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvBoolean(java.lang.String... names) { + for (var n : names) { + var value = Environment.getBooleanEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvInteger(java.lang.String... names) { + for (var n : names) { + var value = Environment.getIntegerEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static Optional getEnvDouble(java.lang.String... names) { + for (var n : names) { + var value = Environment.getDoubleEnvironmentVariable(n); + if (value.isValue()) { + return Optional.of(value.value()); + } + } + return Optional.empty(); + } + + public static InvokeOptions withVersion(@Nullable InvokeOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion() + ); + } + + public static InvokeOutputOptions withVersion(@Nullable InvokeOutputOptions options) { + if (options != null && options.getVersion().isPresent()) { + return options; + } + return new InvokeOutputOptions( + options == null ? null : options.getParent().orElse(null), + options == null ? null : options.getProvider().orElse(null), + getVersion(), + options == null ? null : options.getDependsOn() + ); + } + + private static final java.lang.String version; + public static java.lang.String getVersion() { + return version; + } + + static { + var resourceName = "com/pulumi/example/version.txt"; + var versionFile = Utilities.class.getClassLoader().getResourceAsStream(resourceName); + if (versionFile == null) { + throw new IllegalStateException( + java.lang.String.format("expected resource '%s' on Classpath, not found", resourceName) + ); + } + version = new BufferedReader(new InputStreamReader(versionFile)) + .lines() + .collect(Collectors.joining("\n")) + .trim(); + } +} diff --git a/pkg/codegen/testing/test/testdata/build-files/unspecified/schema.json b/pkg/codegen/testing/test/testdata/build-files/unspecified/schema.json new file mode 100644 index 00000000000..d0c2bfad0cd --- /dev/null +++ b/pkg/codegen/testing/test/testdata/build-files/unspecified/schema.json @@ -0,0 +1,19 @@ +{ + "version": "0.0.1", + "name": "example", + "keywords": [ + "Testing", + "Pulumipus" + ], + "description": "Test the none setting for build-files", + "license": "MIT", + "types": {}, + "readme": "hello this is the readme body.", + "homepage": "https://pulumi.com", + "repository": "https://github.com/pulumi/pulumi", + "resources": {}, + "functions": {}, + "language": { + "java": {} + } +} \ No newline at end of file diff --git a/pkg/codegen/testing/test/testdata/config-variables/java/build.gradle b/pkg/codegen/testing/test/testdata/config-variables/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/config-variables/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/config-variables/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/cyclic-types/java/build.gradle b/pkg/codegen/testing/test/testdata/cyclic-types/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/cyclic-types/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/cyclic-types/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/dash-named-schema/java/build.gradle b/pkg/codegen/testing/test/testdata/dash-named-schema/java/build.gradle index 3f424680d49..85a9c15123c 100644 --- a/pkg/codegen/testing/test/testdata/dash-named-schema/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/dash-named-schema/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/dashed-import-schema/java/build.gradle b/pkg/codegen/testing/test/testdata/dashed-import-schema/java/build.gradle index 41e089f3f43..ffa26289160 100644 --- a/pkg/codegen/testing/test/testdata/dashed-import-schema/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/dashed-import-schema/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/functions-secrets/java/build.gradle b/pkg/codegen/testing/test/testdata/functions-secrets/java/build.gradle index 9ec23122545..97bbebaded9 100644 --- a/pkg/codegen/testing/test/testdata/functions-secrets/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/functions-secrets/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/hyphenated-symbols/java/build.gradle b/pkg/codegen/testing/test/testdata/hyphenated-symbols/java/build.gradle index 0336910f012..1cf2089a0d5 100644 --- a/pkg/codegen/testing/test/testdata/hyphenated-symbols/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/hyphenated-symbols/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/kubernetes20/java/build.gradle b/pkg/codegen/testing/test/testdata/kubernetes20/java/build.gradle index 663048118c2..8dc9eaee6de 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/kubernetes20/java/codegen-manifest.json b/pkg/codegen/testing/test/testdata/kubernetes20/java/codegen-manifest.json index 3ac085dc244..d680966114a 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/codegen-manifest.json +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/codegen-manifest.json @@ -7,23 +7,23 @@ "src/main/java/com/pulumi/kubernetes/Provider.java", "src/main/java/com/pulumi/kubernetes/ProviderArgs.java", "src/main/java/com/pulumi/kubernetes/Utilities.java", - "src/main/java/com/pulumi/kubernetes/core_v1/ConfigMap.java", - "src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapArgs.java", - "src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapList.java", - "src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapListArgs.java", - "src/main/java/com/pulumi/kubernetes/core_v1/inputs/ConfigMapArgs.java", - "src/main/java/com/pulumi/kubernetes/core_v1/outputs/ConfigMap.java", - "src/main/java/com/pulumi/kubernetes/helm/sh_v3/Release.java", - "src/main/java/com/pulumi/kubernetes/helm/sh_v3/ReleaseArgs.java", + "src/main/java/com/pulumi/kubernetes/core/v1/ConfigMap.java", + "src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapArgs.java", + "src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapList.java", + "src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapListArgs.java", + "src/main/java/com/pulumi/kubernetes/core/v1/inputs/ConfigMapArgs.java", + "src/main/java/com/pulumi/kubernetes/core/v1/outputs/ConfigMap.java", + "src/main/java/com/pulumi/kubernetes/helm/v3/Release.java", + "src/main/java/com/pulumi/kubernetes/helm/v3/ReleaseArgs.java", "src/main/java/com/pulumi/kubernetes/inputs/KubeClientSettingsArgs.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ListMetaArgs.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ManagedFieldsEntryArgs.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ObjectMetaArgs.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/inputs/OwnerReferenceArgs.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ListMeta.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ManagedFieldsEntry.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ObjectMeta.java", - "src/main/java/com/pulumi/kubernetes/meta_v1/outputs/OwnerReference.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ListMetaArgs.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ManagedFieldsEntryArgs.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ObjectMetaArgs.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/inputs/OwnerReferenceArgs.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ListMeta.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ManagedFieldsEntry.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ObjectMeta.java", + "src/main/java/com/pulumi/kubernetes/meta/v1/outputs/OwnerReference.java", "src/main/java/com/pulumi/kubernetes/yaml_v2/ConfigGroup.java", "src/main/java/com/pulumi/kubernetes/yaml_v2/ConfigGroupArgs.java" ] diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMap.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMap.java similarity index 98% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMap.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMap.java index c42b3bc055d..eca2e93085b 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMap.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMap.java @@ -1,15 +1,15 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.core_v1; +package com.pulumi.kubernetes.core.v1; import com.pulumi.core.Output; import com.pulumi.core.annotations.Export; import com.pulumi.core.annotations.ResourceType; import com.pulumi.core.internal.Codegen; import com.pulumi.kubernetes.Utilities; -import com.pulumi.kubernetes.core_v1.ConfigMapArgs; -import com.pulumi.kubernetes.meta_v1.outputs.ObjectMeta; +import com.pulumi.kubernetes.core.v1.ConfigMapArgs; +import com.pulumi.kubernetes.meta.v1.outputs.ObjectMeta; import java.lang.Boolean; import java.lang.String; import java.util.Map; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapArgs.java index a69323ae49e..9f00de7329f 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapArgs.java @@ -1,12 +1,12 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.core_v1; +package com.pulumi.kubernetes.core.v1; import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import com.pulumi.core.internal.Codegen; -import com.pulumi.kubernetes.meta_v1.inputs.ObjectMetaArgs; +import com.pulumi.kubernetes.meta.v1.inputs.ObjectMetaArgs; import java.lang.Boolean; import java.lang.String; import java.util.Map; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapList.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapList.java similarity index 96% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapList.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapList.java index 2b701f707c8..ec3f416c53c 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapList.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapList.java @@ -1,16 +1,16 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.core_v1; +package com.pulumi.kubernetes.core.v1; import com.pulumi.core.Output; import com.pulumi.core.annotations.Export; import com.pulumi.core.annotations.ResourceType; import com.pulumi.core.internal.Codegen; import com.pulumi.kubernetes.Utilities; -import com.pulumi.kubernetes.core_v1.ConfigMapListArgs; -import com.pulumi.kubernetes.core_v1.outputs.ConfigMap; -import com.pulumi.kubernetes.meta_v1.outputs.ListMeta; +import com.pulumi.kubernetes.core.v1.ConfigMapListArgs; +import com.pulumi.kubernetes.core.v1.outputs.ConfigMap; +import com.pulumi.kubernetes.meta.v1.outputs.ListMeta; import java.lang.String; import java.util.List; import javax.annotation.Nullable; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapListArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapListArgs.java similarity index 98% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapListArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapListArgs.java index d4b162a54f1..eb7f3ebb815 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/ConfigMapListArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/ConfigMapListArgs.java @@ -1,14 +1,14 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.core_v1; +package com.pulumi.kubernetes.core.v1; import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import com.pulumi.core.internal.Codegen; import com.pulumi.exceptions.MissingRequiredPropertyException; -import com.pulumi.kubernetes.core_v1.inputs.ConfigMapArgs; -import com.pulumi.kubernetes.meta_v1.inputs.ListMetaArgs; +import com.pulumi.kubernetes.core.v1.inputs.ConfigMapArgs; +import com.pulumi.kubernetes.meta.v1.inputs.ListMetaArgs; import java.lang.String; import java.util.List; import java.util.Objects; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/inputs/ConfigMapArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/inputs/ConfigMapArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/inputs/ConfigMapArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/inputs/ConfigMapArgs.java index 9eb09b36574..532e88962a0 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/inputs/ConfigMapArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/inputs/ConfigMapArgs.java @@ -1,12 +1,12 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.core_v1.inputs; +package com.pulumi.kubernetes.core.v1.inputs; import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; import com.pulumi.core.internal.Codegen; -import com.pulumi.kubernetes.meta_v1.inputs.ObjectMetaArgs; +import com.pulumi.kubernetes.meta.v1.inputs.ObjectMetaArgs; import java.lang.Boolean; import java.lang.String; import java.util.Map; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/outputs/ConfigMap.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/outputs/ConfigMap.java similarity index 98% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/outputs/ConfigMap.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/outputs/ConfigMap.java index 6858a59c130..9a96fb1b6c1 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core_v1/outputs/ConfigMap.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/core/v1/outputs/ConfigMap.java @@ -1,10 +1,10 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.core_v1.outputs; +package com.pulumi.kubernetes.core.v1.outputs; import com.pulumi.core.annotations.CustomType; -import com.pulumi.kubernetes.meta_v1.outputs.ObjectMeta; +import com.pulumi.kubernetes.meta.v1.outputs.ObjectMeta; import java.lang.Boolean; import java.lang.String; import java.util.Map; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/sh_v3/Release.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/v3/Release.java similarity index 97% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/sh_v3/Release.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/v3/Release.java index 2ed7d3d261b..2fcb5ece6fd 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/sh_v3/Release.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/v3/Release.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.helm.sh_v3; +package com.pulumi.kubernetes.helm.v3; import com.pulumi.asset.AssetOrArchive; import com.pulumi.core.Output; @@ -9,7 +9,7 @@ import com.pulumi.core.annotations.ResourceType; import com.pulumi.core.internal.Codegen; import com.pulumi.kubernetes.Utilities; -import com.pulumi.kubernetes.helm.sh_v3.ReleaseArgs; +import com.pulumi.kubernetes.helm.v3.ReleaseArgs; import java.lang.Object; import java.lang.String; import java.util.List; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/sh_v3/ReleaseArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/v3/ReleaseArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/sh_v3/ReleaseArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/v3/ReleaseArgs.java index dbf2e5d13f4..74e565f1983 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/sh_v3/ReleaseArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/helm/v3/ReleaseArgs.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.helm.sh_v3; +package com.pulumi.kubernetes.helm.v3; import com.pulumi.asset.AssetOrArchive; import com.pulumi.core.Output; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ListMetaArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ListMetaArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ListMetaArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ListMetaArgs.java index b5de47d54fc..63d692bbdd6 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ListMetaArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ListMetaArgs.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.inputs; +package com.pulumi.kubernetes.meta.v1.inputs; import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ManagedFieldsEntryArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ManagedFieldsEntryArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ManagedFieldsEntryArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ManagedFieldsEntryArgs.java index af9d196d4e7..87cd0cf175f 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ManagedFieldsEntryArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ManagedFieldsEntryArgs.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.inputs; +package com.pulumi.kubernetes.meta.v1.inputs; import com.google.gson.JsonElement; import com.pulumi.core.Output; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ObjectMetaArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ObjectMetaArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ObjectMetaArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ObjectMetaArgs.java index 88b08e9010b..19da07d362a 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/ObjectMetaArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/ObjectMetaArgs.java @@ -1,12 +1,12 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.inputs; +package com.pulumi.kubernetes.meta.v1.inputs; import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; -import com.pulumi.kubernetes.meta_v1.inputs.ManagedFieldsEntryArgs; -import com.pulumi.kubernetes.meta_v1.inputs.OwnerReferenceArgs; +import com.pulumi.kubernetes.meta.v1.inputs.ManagedFieldsEntryArgs; +import com.pulumi.kubernetes.meta.v1.inputs.OwnerReferenceArgs; import java.lang.Integer; import java.lang.String; import java.util.List; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/OwnerReferenceArgs.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/OwnerReferenceArgs.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/OwnerReferenceArgs.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/OwnerReferenceArgs.java index f1f39b0aeb9..eada303f1a5 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/inputs/OwnerReferenceArgs.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/inputs/OwnerReferenceArgs.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.inputs; +package com.pulumi.kubernetes.meta.v1.inputs; import com.pulumi.core.Output; import com.pulumi.core.annotations.Import; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ListMeta.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ListMeta.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ListMeta.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ListMeta.java index 3d7fc77558b..19bda50451f 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ListMeta.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ListMeta.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.outputs; +package com.pulumi.kubernetes.meta.v1.outputs; import com.pulumi.core.annotations.CustomType; import java.lang.Integer; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ManagedFieldsEntry.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ManagedFieldsEntry.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ManagedFieldsEntry.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ManagedFieldsEntry.java index bafd97b6daf..ad8ae10d4f1 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ManagedFieldsEntry.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ManagedFieldsEntry.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.outputs; +package com.pulumi.kubernetes.meta.v1.outputs; import com.google.gson.JsonElement; import com.pulumi.core.annotations.CustomType; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ObjectMeta.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ObjectMeta.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ObjectMeta.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ObjectMeta.java index dc013e5d964..c069f4f4a1b 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/ObjectMeta.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/ObjectMeta.java @@ -1,11 +1,11 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.outputs; +package com.pulumi.kubernetes.meta.v1.outputs; import com.pulumi.core.annotations.CustomType; -import com.pulumi.kubernetes.meta_v1.outputs.ManagedFieldsEntry; -import com.pulumi.kubernetes.meta_v1.outputs.OwnerReference; +import com.pulumi.kubernetes.meta.v1.outputs.ManagedFieldsEntry; +import com.pulumi.kubernetes.meta.v1.outputs.OwnerReference; import java.lang.Integer; import java.lang.String; import java.util.List; diff --git a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/OwnerReference.java b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/OwnerReference.java similarity index 99% rename from pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/OwnerReference.java rename to pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/OwnerReference.java index ffc1150e321..ca3ccf1ecf8 100644 --- a/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta_v1/outputs/OwnerReference.java +++ b/pkg/codegen/testing/test/testdata/kubernetes20/java/src/main/java/com/pulumi/kubernetes/meta/v1/outputs/OwnerReference.java @@ -1,7 +1,7 @@ // *** WARNING: this file was generated by test. *** // *** Do not edit by hand unless you're certain you know what you are doing! *** -package com.pulumi.kubernetes.meta_v1.outputs; +package com.pulumi.kubernetes.meta.v1.outputs; import com.pulumi.core.annotations.CustomType; import com.pulumi.exceptions.MissingRequiredPropertyException; diff --git a/pkg/codegen/testing/test/testdata/legacy-names/java/build.gradle b/pkg/codegen/testing/test/testdata/legacy-names/java/build.gradle index a45112b3639..07cfc6efe72 100644 --- a/pkg/codegen/testing/test/testdata/legacy-names/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/legacy-names/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/mini-awsnative/java/build.gradle b/pkg/codegen/testing/test/testdata/mini-awsnative/java/build.gradle index 6eb72db4ab3..e705ca5ce88 100644 --- a/pkg/codegen/testing/test/testdata/mini-awsnative/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/mini-awsnative/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/mini-awsx/java/build.gradle b/pkg/codegen/testing/test/testdata/mini-awsx/java/build.gradle index 70c0221b585..bf3b2a5c1b8 100644 --- a/pkg/codegen/testing/test/testdata/mini-awsx/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/mini-awsx/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/mini-azuread/java/build.gradle b/pkg/codegen/testing/test/testdata/mini-azuread/java/build.gradle index 00b204c50a7..e48b7351078 100644 --- a/pkg/codegen/testing/test/testdata/mini-azuread/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/mini-azuread/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/mini-azurenative/java/build.gradle b/pkg/codegen/testing/test/testdata/mini-azurenative/java/build.gradle index c084a7bda6a..69bf45d7aed 100644 --- a/pkg/codegen/testing/test/testdata/mini-azurenative/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/mini-azurenative/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/nested-module-thirdparty/java/build.gradle b/pkg/codegen/testing/test/testdata/nested-module-thirdparty/java/build.gradle index 3f424680d49..85a9c15123c 100644 --- a/pkg/codegen/testing/test/testdata/nested-module-thirdparty/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/nested-module-thirdparty/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/nested-module/java/build.gradle b/pkg/codegen/testing/test/testdata/nested-module/java/build.gradle index 49dd7678e77..f66dc07152f 100644 --- a/pkg/codegen/testing/test/testdata/nested-module/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/nested-module/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/other-owned/java/build.gradle b/pkg/codegen/testing/test/testdata/other-owned/java/build.gradle index 360111ff95f..77564718286 100644 --- a/pkg/codegen/testing/test/testdata/other-owned/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/other-owned/java/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") @@ -121,19 +122,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -147,6 +135,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/codegen/testing/test/testdata/output-funcs-edgeorder/java/build.gradle b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/java/build.gradle index f692a157cf7..2a3c814e461 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/output-funcs-edgeorder/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/output-funcs-tfbridge20/java/build.gradle b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/java/build.gradle index 9ec23122545..97bbebaded9 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/output-funcs-tfbridge20/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/output-funcs/java/build.gradle b/pkg/codegen/testing/test/testdata/output-funcs/java/build.gradle index 9ec23122545..97bbebaded9 100644 --- a/pkg/codegen/testing/test/testdata/output-funcs/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/output-funcs/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/parameterized/java/build.gradle b/pkg/codegen/testing/test/testdata/parameterized/java/build.gradle index d6e9db3598c..95137b5e66a 100644 --- a/pkg/codegen/testing/test/testdata/parameterized/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/parameterized/java/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") @@ -125,19 +126,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -151,6 +139,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/codegen/testing/test/testdata/plain-and-default/java/build.gradle b/pkg/codegen/testing/test/testdata/plain-and-default/java/build.gradle index ea3cbb92387..c817513cdf9 100644 --- a/pkg/codegen/testing/test/testdata/plain-and-default/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/plain-and-default/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/regress-go-10527/java/build.gradle b/pkg/codegen/testing/test/testdata/regress-go-10527/java/build.gradle index f4b7a5086ec..319bc93b740 100644 --- a/pkg/codegen/testing/test/testdata/regress-go-10527/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/regress-go-10527/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/regress-go-12971/java/build.gradle b/pkg/codegen/testing/test/testdata/regress-go-12971/java/build.gradle index f4b7a5086ec..319bc93b740 100644 --- a/pkg/codegen/testing/test/testdata/regress-go-12971/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/regress-go-12971/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/regress-go-15478/java/build.gradle b/pkg/codegen/testing/test/testdata/regress-go-15478/java/build.gradle index 48faa82ef4d..c532118c2e3 100644 --- a/pkg/codegen/testing/test/testdata/regress-go-15478/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/regress-go-15478/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/regress-py-12980/java/build.gradle b/pkg/codegen/testing/test/testdata/regress-py-12980/java/build.gradle index d221b95ccc0..58c0c3225cb 100644 --- a/pkg/codegen/testing/test/testdata/regress-py-12980/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/regress-py-12980/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/regress-py-tfbridge-611/java/build.gradle b/pkg/codegen/testing/test/testdata/regress-py-tfbridge-611/java/build.gradle index 073093716a1..f8619ef9088 100644 --- a/pkg/codegen/testing/test/testdata/regress-py-tfbridge-611/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/regress-py-tfbridge-611/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/replace-on-change/java/build.gradle b/pkg/codegen/testing/test/testdata/replace-on-change/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/replace-on-change/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/replace-on-change/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/resource-args-python-case-insensitive/java/build.gradle b/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/resource-args-python-case-insensitive/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/resource-args-python/java/build.gradle b/pkg/codegen/testing/test/testdata/resource-args-python/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/resource-args-python/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/resource-args-python/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/resource-property-overlap/java/build.gradle b/pkg/codegen/testing/test/testdata/resource-property-overlap/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/resource-property-overlap/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/resource-property-overlap/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/secrets/java/build.gradle b/pkg/codegen/testing/test/testdata/secrets/java/build.gradle index 9ec23122545..97bbebaded9 100644 --- a/pkg/codegen/testing/test/testdata/secrets/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/secrets/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/simple-plain-schema-with-root-package/java/build.gradle b/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/simple-plain-schema-with-root-package/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/java/build.gradle b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema-custom-pypackage-name/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/simple-resource-schema/java/build.gradle b/pkg/codegen/testing/test/testdata/simple-resource-schema/java/build.gradle index d072b8fb96d..820a6c99082 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-schema/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/simple-resource-schema/java/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") @@ -121,19 +122,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -147,6 +135,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/codegen/testing/test/testdata/simple-resource-with-aliases/java/build.gradle b/pkg/codegen/testing/test/testdata/simple-resource-with-aliases/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/simple-resource-with-aliases/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/simple-resource-with-aliases/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/simple-schema-pyproject/java/build.gradle b/pkg/codegen/testing/test/testdata/simple-schema-pyproject/java/build.gradle index 8e038efaba3..f7d8729b951 100644 --- a/pkg/codegen/testing/test/testdata/simple-schema-pyproject/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/simple-schema-pyproject/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/simple-yaml-schema/java/build.gradle b/pkg/codegen/testing/test/testdata/simple-yaml-schema/java/build.gradle index b042f4737ad..6e85e285198 100644 --- a/pkg/codegen/testing/test/testdata/simple-yaml-schema/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/simple-yaml-schema/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/unions-inline/java/build.gradle b/pkg/codegen/testing/test/testdata/unions-inline/java/build.gradle index 59744d8a917..1e59db213f8 100644 --- a/pkg/codegen/testing/test/testdata/unions-inline/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/unions-inline/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/unions-inside-arrays/java/build.gradle b/pkg/codegen/testing/test/testdata/unions-inside-arrays/java/build.gradle index 59744d8a917..1e59db213f8 100644 --- a/pkg/codegen/testing/test/testdata/unions-inside-arrays/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/unions-inside-arrays/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/urn-id-properties/java/build.gradle b/pkg/codegen/testing/test/testdata/urn-id-properties/java/build.gradle index b1bcc910428..10d1dc2db48 100644 --- a/pkg/codegen/testing/test/testdata/urn-id-properties/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/urn-id-properties/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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/codegen/testing/test/testdata/using-shared-types-in-config/java/build.gradle b/pkg/codegen/testing/test/testdata/using-shared-types-in-config/java/build.gradle index 37b59c2a90f..e1ade5fc6c4 100644 --- a/pkg/codegen/testing/test/testdata/using-shared-types-in-config/java/build.gradle +++ b/pkg/codegen/testing/test/testdata/using-shared-types-in-config/java/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") @@ -120,19 +121,6 @@ publishing { } } } - - if (publishRepoURL) { - repositories { - maven { - name = "PublishRepo" - url = publishRepoURL - credentials { - username = publishRepoUsername - password = publishRepoPassword - } - } - } - } } javadoc { @@ -146,6 +134,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)