From cca57be780ce571d5dafbe8b10a6b2a1cc5d116e Mon Sep 17 00:00:00 2001 From: "jan.kozlowski" <jan.kozlowski@allegro.com> Date: Fri, 13 Sep 2024 14:13:09 +0200 Subject: [PATCH] replace org.springframework.boot plugin with io.spring.dependency-management --- build.gradle | 29 ++++++++++++------------ envoy-control-core/build.gradle | 4 ---- envoy-control-runner/build.gradle | 1 - envoy-control-services/build.gradle | 4 ---- envoy-control-source-consul/build.gradle | 4 ---- envoy-control-tests/build.gradle | 4 ---- 6 files changed, 14 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index a8b764ba3..2fb8898f4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,9 @@ - buildscript { repositories { mavenCentral() } dependencies { - classpath group: 'pl.allegro.tech.build', name: 'axion-release-plugin', version: '1.13.3' + classpath group: 'pl.allegro.tech.build', name: 'axion-release-plugin', version: '1.13.3' } } @@ -19,7 +18,7 @@ plugins { id "org.jlleitschuh.gradle.ktlint-idea" version "10.2.0" id "io.gitlab.arturbosch.detekt" version "1.23.6" id 'io.github.gradle-nexus.publish-plugin' version '1.0.0' - id 'org.springframework.boot' version '3.3.2' apply false + id "io.spring.dependency-management" version "1.1.6" } scmVersion { @@ -47,21 +46,21 @@ allprojects { apply plugin: 'io.spring.dependency-management' project.ext.versions = [ - java_controlplane : '1.0.45', - spring_boot : '3.3.2', - grpc : '1.48.1', - ecwid_consul : '1.4.1', - toxiproxy : '2.1.3', - consul_recipes : '0.9.1', - cglib : '3.2.9', - re2j : '1.3', - xxhash : '0.10.1', - dropwizard : '4.2.26' + java_controlplane: '1.0.45', + spring_boot : '3.3.2', + grpc : '1.48.1', + ecwid_consul : '1.4.1', + toxiproxy : '2.1.3', + consul_recipes : '0.9.1', + cglib : '3.2.9', + re2j : '1.3', + xxhash : '0.10.1', + dropwizard : '4.2.26' ] dependencyManagement { imports { - mavenBom org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES + mavenBom "org.springframework.boot:spring-boot-dependencies:3.3.2" } } } @@ -130,7 +129,7 @@ subprojects { pom { name = project.name description = 'Production-ready Control Plane for Service Mesh based on Envoy Proxy.' - url ='https://github.com/allegro/envoy-control' + url = 'https://github.com/allegro/envoy-control' inceptionYear = '2019' scm { diff --git a/envoy-control-core/build.gradle b/envoy-control-core/build.gradle index cb9cc308d..169d88d62 100644 --- a/envoy-control-core/build.gradle +++ b/envoy-control-core/build.gradle @@ -1,7 +1,3 @@ -plugins { - id 'org.springframework.boot' apply false -} - dependencies { api project(':envoy-control-services') diff --git a/envoy-control-runner/build.gradle b/envoy-control-runner/build.gradle index cee970308..fafd8f611 100644 --- a/envoy-control-runner/build.gradle +++ b/envoy-control-runner/build.gradle @@ -1,6 +1,5 @@ plugins { id 'application' - id 'org.springframework.boot' apply false } mainClassName = 'pl.allegro.tech.servicemesh.envoycontrol.EnvoyControl' diff --git a/envoy-control-services/build.gradle b/envoy-control-services/build.gradle index aeabef69a..724d8e4a2 100644 --- a/envoy-control-services/build.gradle +++ b/envoy-control-services/build.gradle @@ -1,7 +1,3 @@ -plugins { - id 'org.springframework.boot' apply false -} - dependencies { implementation group: 'org.jetbrains.kotlin', name: 'kotlin-stdlib' api group: 'io.projectreactor', name: 'reactor-core' diff --git a/envoy-control-source-consul/build.gradle b/envoy-control-source-consul/build.gradle index d15e0c31c..20c070eec 100644 --- a/envoy-control-source-consul/build.gradle +++ b/envoy-control-source-consul/build.gradle @@ -1,7 +1,3 @@ -plugins { - id 'org.springframework.boot' apply false -} - dependencies { api project(':envoy-control-core') diff --git a/envoy-control-tests/build.gradle b/envoy-control-tests/build.gradle index 1c0826c56..108965573 100644 --- a/envoy-control-tests/build.gradle +++ b/envoy-control-tests/build.gradle @@ -1,7 +1,3 @@ -plugins { - id 'org.springframework.boot' apply false -} - dependencies { implementation project(':envoy-control-runner')