From 8b186e652603a8ef686a201fc6cb1d3c75d4ca4d Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 7 Jan 2022 10:01:47 -0600 Subject: [PATCH] Fix isSnapshot --- gradle/artifactory.gradle | 2 +- gradle/deploy-artifacts.gradle | 2 +- gradle/finalize-deploy.gradle | 2 +- gradle/ossrh.gradle | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle/artifactory.gradle b/gradle/artifactory.gradle index 48274138..ab3381e1 100644 --- a/gradle/artifactory.gradle +++ b/gradle/artifactory.gradle @@ -1,6 +1,6 @@ apply plugin: "com.jfrog.artifactory" -def isSnapshot = version?.matches(/^.*[.-]-SNAPSHOT$/) +def isSnapshot = version?.endsWith("-SNAPSHOT") artifactory { contextUrl = 'https://repo.spring.io' diff --git a/gradle/deploy-artifacts.gradle b/gradle/deploy-artifacts.gradle index 1a36ebb1..09785bc9 100644 --- a/gradle/deploy-artifacts.gradle +++ b/gradle/deploy-artifacts.gradle @@ -1,4 +1,4 @@ -def isSnapshot = version?.matches(/^.*[.-]-SNAPSHOT$/) +def isSnapshot = version?.endsWith("-SNAPSHOT") task deployArtifacts { group = 'Deploy tasks' diff --git a/gradle/finalize-deploy.gradle b/gradle/finalize-deploy.gradle index 622d728d..6b64fb05 100644 --- a/gradle/finalize-deploy.gradle +++ b/gradle/finalize-deploy.gradle @@ -1,4 +1,4 @@ -def isSnapshot = version?.matches(/^.*[.-]-SNAPSHOT$/) +def isSnapshot = version?.endsWith("-SNAPSHOT") def isRelease = !isSnapshot task finalizeDeployArtifacts { diff --git a/gradle/ossrh.gradle b/gradle/ossrh.gradle index 238a7a4a..adf8f4be 100644 --- a/gradle/ossrh.gradle +++ b/gradle/ossrh.gradle @@ -1,4 +1,4 @@ -def isSnapshot = version?.matches(/^.*[.-]-SNAPSHOT$/) +def isSnapshot = version?.endsWith("-SNAPSHOT") def isRelease = !isSnapshot if(project.hasProperty("signing.keyId") && isRelease) {