From 2259d1f58045878a56ebaffb2e3e54af8fa81777 Mon Sep 17 00:00:00 2001 From: Christoph Obexer Date: Fri, 25 Oct 2019 19:05:46 +0200 Subject: [PATCH] fix project URLs in maven poms (#478) --- CHANGES.md | 1 + _ext/gradle/java-publish.gradle | 8 ++++---- gradle/java-publish.gradle | 8 ++++---- plugin-gradle/CHANGES.md | 1 + plugin-maven/CHANGES.md | 1 + 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 92cd0de430..18f971e36f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,7 @@ You might be looking for: - [plugin-maven/CHANGES.md](plugin-maven/CHANGES.md) ### Version 1.26.0-SNAPSHOT - TBD (javadoc [lib](https://diffplug.github.io/spotless/javadoc/spotless-lib/snapshot/) [lib-extra](https://diffplug.github.io/spotless/javadoc/spotless-lib-extra/snapshot/), [snapshot repo](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/)) +* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) * Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474)) * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder diff --git a/_ext/gradle/java-publish.gradle b/_ext/gradle/java-publish.gradle index 8248446ff8..0cae2aaae7 100644 --- a/_ext/gradle/java-publish.gradle +++ b/_ext/gradle/java-publish.gradle @@ -50,11 +50,11 @@ publishing { resolveStrategy = Closure.DELEGATE_FIRST name project.ext_artifactId description project.ext_description - url "https://github.com/${project.ext_org}/${project.name}" + url "https://github.com/${project.ext_org}/${rootProject.name}" scm { - url "https://github.com/${project.ext_org}/${project.name}" - connection "scm:git:git://github.com/${project.ext_org}/${project.name}" - developerConnection "scm:git:ssh:git@github.com/${project.ext_org}/${project.name}" + url "https://github.com/${project.ext_org}/${rootProject.name}" + connection "scm:git:https://github.com/${project.ext_org}/${rootProject.name}.git" + developerConnection "scm:git:ssh:git@github.com/${project.ext_org}/${rootProject.name}.git" } licenses { license { diff --git a/gradle/java-publish.gradle b/gradle/java-publish.gradle index 2ebf42cd7e..8c351db043 100644 --- a/gradle/java-publish.gradle +++ b/gradle/java-publish.gradle @@ -86,11 +86,11 @@ model { resolveStrategy = Closure.DELEGATE_FIRST name project.ext.artifactId description project.description - url "https://github.com/${project.org}/${project.name}" + url "https://github.com/${project.org}/${rootProject.name}" scm { - url "https://github.com/${project.org}/${project.name}" - connection "scm:git:git://github.com/${project.org}/${project.name}" - developerConnection "scm:git:ssh:git@github.com/${project.org}/${project.name}" + url "https://github.com/${project.org}/${rootProject.name}" + connection "scm:git:https://github.com/${project.org}/${rootProject.name}.git" + developerConnection "scm:git:ssh:git@github.com/${project.org}/${rootProject.name}.git" } licenses { license { diff --git a/plugin-gradle/CHANGES.md b/plugin-gradle/CHANGES.md index 2a5185aec3..dc034781d0 100644 --- a/plugin-gradle/CHANGES.md +++ b/plugin-gradle/CHANGES.md @@ -1,6 +1,7 @@ # spotless-plugin-gradle releases ### Version 3.26.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-plugin-gradle/)) +* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) * Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474)) * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index bd84ee469e..16e2617644 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -1,6 +1,7 @@ # spotless-plugin-maven releases ### Version 1.26.0-SNAPSHOT - TBD ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/snapshot/), [snapshot](https://oss.sonatype.org/content/repositories/snapshots/com/diffplug/spotless/spotless-maven-plugin/)) +* Fix project URLs in poms. ([#478](https://github.com/diffplug/spotless/pull/478)) * Fix `ImportSorter` crashing with empty files. ([#474](https://github.com/diffplug/spotless/pull/474)) * Fixes [#305](https://github.com/diffplug/spotless/issues/305) StringIndexOutOfBoundsException for empty Groovy file when performing importOrder