From ea14e0a0ba7d8b172d062f362203c74f1df7b828 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 15 Feb 2018 17:27:34 -0800 Subject: [PATCH 1/2] Fix problem where plugin-maven might be published with snapshot dependencies. --- plugin-maven/build.gradle | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugin-maven/build.gradle b/plugin-maven/build.gradle index 3607cf005d..0e4e6f0a57 100644 --- a/plugin-maven/build.gradle +++ b/plugin-maven/build.gradle @@ -55,8 +55,14 @@ def mvnw(String args) { } dependencies { - compile project(":lib") - compile project(":lib-extra") + if (!project.versionMaven.endsWith('-SNAPSHOT') && project.versionLib.endsWith('-SNAPSHOT')) { + // gradle = release, lib = snapshot, therefore gradle should depend on the last stable lib + compile "com.diffplug.spotless:spotless-lib:${project.stableLib}" + compile "com.diffplug.spotless:spotless-lib-extra:${project.stableLib}" + } else { + compile project(':lib') + compile project(':lib-extra') + } compileOnly "org.apache.maven:maven-plugin-api:${VER_MAVEN_API}" compileOnly "org.apache.maven.plugin-tools:maven-plugin-annotations:${VER_MAVEN_API}" compileOnly "org.eclipse.aether:aether-api:${VER_ECLIPSE_AETHER}" From 675233e267609a93f998d4c36696a3db5523bef8 Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Thu, 15 Feb 2018 17:39:40 -0800 Subject: [PATCH 2/2] Update changelog. --- plugin-maven/CHANGES.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin-maven/CHANGES.md b/plugin-maven/CHANGES.md index 3478d94f44..69af0e893d 100644 --- a/plugin-maven/CHANGES.md +++ b/plugin-maven/CHANGES.md @@ -2,6 +2,8 @@ ### Version 1.10.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 build to ensure that published versions never have snapshot deps ([#205](https://github.com/diffplug/spotless/pull/205)). + ### Version 1.0.0.BETA1 - February 11th 2017 ([javadoc](https://diffplug.github.io/spotless/javadoc/spotless-maven-plugin/1.0.0.BETA1/), [jcenter](https://bintray.com/diffplug/opensource/spotless-maven-plugin/1.0.0.BETA1)) * Maven plugin written by [Konstantin Lutovich](https://github.com/lutovich).