From e2e76302d650d733db3d1bbc529c094272a2c61f Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Thu, 29 Oct 2020 08:11:49 +0100 Subject: [PATCH] Start using dependency management plugin again This is possible because of spring-io/nohttp#35 This reverts commit f967b11e25097eccaacf0be24d976fb81a330ee0. --- build.gradle | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/build.gradle b/build.gradle index ac6badb..64cb489 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -import io.spring.nohttp.gradle.NoHttpCheckstylePlugin - buildscript { dependencies { classpath 'io.spring.gradle:spring-build-conventions:0.0.34.RELEASE' @@ -11,7 +9,7 @@ buildscript { } } -apply plugin: NoHttpCheckstylePlugin +apply plugin: 'io.spring.convention.root' apply plugin: 'io.spring.convention.springdependencymangement' apply plugin: 'io.spring.convention.maven' apply plugin: 'io.spring.convention.artifactory' @@ -23,10 +21,6 @@ artifacts { archives file('spring-session-bom.txt') } -repositories { - mavenCentral() -} - dependencyManagement { generatedPomCustomization { enabled = true @@ -82,19 +76,11 @@ task deployArtifacts { description = 'Deploys the artifacts to either Artifactory or Maven Central' } -def finalizeDeployArtifacts = project.task("finalizeDeployArtifacts") - if (version.matches(/^.*-RELEASE$/) || version.matches(/^.*-SR\d+$/)) { - if (project.hasProperty("ossrhUsername")) { - project.ext.nexusUsername = project.ossrhUsername - project.ext.nexusPassword = project.ossrhPassword - project.getPluginManager().apply("io.codearte.nexus-staging") - finalizeDeployArtifacts.dependsOn project.tasks.closeAndReleaseRepository - project.nexusStaging.packageGroup = 'org.springframework' - } - deployArtifacts.dependsOn uploadArchives } else { deployArtifacts.dependsOn artifactoryPublish } + +sonarqube.skipProject = true