Skip to content

Commit

Permalink
replace org.springframework.boot plugin with io.spring.dependency-man…
Browse files Browse the repository at this point in the history
…agement
  • Loading branch information
kozjan committed Sep 13, 2024
1 parent 25388b1 commit 7a15644
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 32 deletions.
29 changes: 14 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
}
}

Expand All @@ -19,7 +18,7 @@ plugins {
id "org.jlleitschuh.gradle.ktlint-idea" version "10.2.0"
id "io.gitlab.arturbosch.detekt" version "1.23.7"
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 {
Expand Down Expand Up @@ -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"
}
}
}
Expand Down Expand Up @@ -123,7 +122,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 {
Expand Down
4 changes: 0 additions & 4 deletions envoy-control-core/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
plugins {
id 'org.springframework.boot' apply false
}

dependencies {
api project(':envoy-control-services')

Expand Down
1 change: 0 additions & 1 deletion envoy-control-runner/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id 'application'
id 'org.springframework.boot' apply false
}

mainClassName = 'pl.allegro.tech.servicemesh.envoycontrol.EnvoyControl'
Expand Down
4 changes: 0 additions & 4 deletions envoy-control-services/build.gradle
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 0 additions & 4 deletions envoy-control-source-consul/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
plugins {
id 'org.springframework.boot' apply false
}

dependencies {
api project(':envoy-control-core')

Expand Down
4 changes: 0 additions & 4 deletions envoy-control-tests/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
plugins {
id 'org.springframework.boot' apply false
}

dependencies {
implementation project(':envoy-control-runner')

Expand Down

0 comments on commit 7a15644

Please sign in to comment.