From d378b13cc7588ca8761c6c1abdf4c3506cb378c0 Mon Sep 17 00:00:00 2001 From: Hayden Baker Date: Mon, 19 May 2025 10:57:22 -0700 Subject: [PATCH 1/4] Fix missing pom fields --- build.gradle.kts | 5 ++++ ...pi-models-aws.model-conventions.gradle.kts | 5 ++++ ...dels-aws.publishing-conventions.gradle.kts | 29 ++++++++++++++++++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index f55db01c..d795dd43 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,4 @@ +import org.gradle.internal.extensions.stdlib.capitalized import org.jreleaser.model.Active plugins { @@ -7,6 +8,10 @@ plugins { id("api-models-aws.publishing-conventions") } +description = "This module contains the smithy model (JSON AST) for all AWS services." +extra["displayName"] = "Software :: Amazon :: API :: Models" + + subprojects { afterEvaluate { apply { diff --git a/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts b/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts index e65cf91c..01a64ee2 100644 --- a/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts @@ -1,3 +1,5 @@ +import org.gradle.internal.extensions.stdlib.capitalized + plugins { `java-library` id("software.amazon.smithy.gradle.smithy-jar") @@ -12,6 +14,9 @@ repositories { //// Workaround per: https://github.com/gradle/gradle/issues/15383 val Project.libs get() = the() +description = "This module contains the smithy model (JSON AST) for ${name.capitalized()}" +extra["displayName"] = "Software :: Amazon :: API :: Models :: ${name.capitalized()}" + dependencies { implementation(libs.smithy.aws.cloudformation.traits) implementation(libs.smithy.aws.endpoints) diff --git a/buildSrc/src/main/kotlin/api-models-aws.publishing-conventions.gradle.kts b/buildSrc/src/main/kotlin/api-models-aws.publishing-conventions.gradle.kts index 57027df7..a9736216 100644 --- a/buildSrc/src/main/kotlin/api-models-aws.publishing-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/api-models-aws.publishing-conventions.gradle.kts @@ -21,6 +21,33 @@ publishing { } else { from(components["javaPlatform"]) } + + afterEvaluate { + pom { + name.set(project.ext["displayName"].toString()) + description.set(project.description) + url.set("https://github.com/aws/api-models-aws") + licenses { + license { + name.set("Apache License 2.0") + url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") + distribution.set("repo") + } + } + developers { + developer { + id.set("aws") + name.set("AWS") + organization.set("Amazon Web Services") + organizationUrl.set("https://aws.amazon.com") + roles.add("developer") + } + } + scm { + url.set("https://github.com/aws/api-models-aws.git") + } + } + } } } -} \ No newline at end of file +} From e855df518ebfc33aa26b12b46edd4fc23780da66 Mon Sep 17 00:00:00 2001 From: Hayden Baker Date: Mon, 19 May 2025 14:44:21 -0700 Subject: [PATCH 2/4] Update buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts Co-authored-by: Kevin Stich --- .../src/main/kotlin/api-models-aws.model-conventions.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts b/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts index 01a64ee2..86578c02 100644 --- a/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/api-models-aws.model-conventions.gradle.kts @@ -14,7 +14,7 @@ repositories { //// Workaround per: https://github.com/gradle/gradle/issues/15383 val Project.libs get() = the() -description = "This module contains the smithy model (JSON AST) for ${name.capitalized()}" +description = "This module contains the Smithy model (JSON AST) for ${name.capitalized()}." extra["displayName"] = "Software :: Amazon :: API :: Models :: ${name.capitalized()}" dependencies { From 9f56102a07a77af2b527e4f02a999a586db86343 Mon Sep 17 00:00:00 2001 From: Hayden Baker Date: Mon, 19 May 2025 14:44:28 -0700 Subject: [PATCH 3/4] Update build.gradle.kts Co-authored-by: Kevin Stich --- build.gradle.kts | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d795dd43..ca29a255 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,8 +10,6 @@ plugins { description = "This module contains the smithy model (JSON AST) for all AWS services." extra["displayName"] = "Software :: Amazon :: API :: Models" - - subprojects { afterEvaluate { apply { From b0f57e8255ae85c935228d964ea419cbba02a7aa Mon Sep 17 00:00:00 2001 From: Hayden Baker Date: Mon, 19 May 2025 14:44:33 -0700 Subject: [PATCH 4/4] Update build.gradle.kts Co-authored-by: Kevin Stich --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ca29a255..f6266000 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { id("api-models-aws.publishing-conventions") } -description = "This module contains the smithy model (JSON AST) for all AWS services." +description = "This module contains the Smithy model (JSON AST) for all AWS services." extra["displayName"] = "Software :: Amazon :: API :: Models" subprojects { afterEvaluate {