Skip to content

Commit

Permalink
Sync the Springboot version from core Conductor (Netflix#56)
Browse files Browse the repository at this point in the history
  • Loading branch information
james-deee authored Jun 16, 2022
1 parent 545cffa commit b45fad0
Show file tree
Hide file tree
Showing 11 changed files with 985 additions and 20,578 deletions.
11 changes: 5 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ buildscript {
}
}
dependencies {
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:5.0.3'
// revElasticSearch7 in dependencies.gradle needs to be updated when spring is upgraded
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.3.12.RELEASE'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:5.+'
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.6.7'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
}
}

plugins {
id 'io.spring.dependency-management' version '1.0.9.RELEASE'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
id 'application'
id 'jacoco'
Expand Down Expand Up @@ -75,7 +74,7 @@ allprojects {

dependencyManagement {
imports {
mavenBom("org.springframework.boot:spring-boot-dependencies:2.3.12.RELEASE")
mavenBom("org.springframework.boot:spring-boot-dependencies:2.6.7")
}
}

Expand Down
2 changes: 1 addition & 1 deletion community-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jar {
}

bootJar {
mainClassName = 'com.netflix.conductor.Conductor'
mainClass = 'com.netflix.conductor.Conductor'
classifier = 'boot'
}

Expand Down
Loading

0 comments on commit b45fad0

Please sign in to comment.