Skip to content
This repository was archived by the owner on Dec 13, 2023. It is now read-only.

Commit 3c43409

Browse files
authored
Merge pull request #300 from meggarr/rmeng/update-versions
Update versions
2 parents 991c555 + ba53059 commit 3c43409

File tree

25 files changed

+913
-785
lines changed

25 files changed

+913
-785
lines changed

build.gradle

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.springframework.boot.gradle.plugin.SpringBootPlugin
2+
13
buildscript {
24
repositories {
35
mavenCentral()
@@ -6,19 +8,19 @@ buildscript {
68
}
79
}
810
dependencies {
9-
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
10-
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.6.7'
11+
classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0'
12+
classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.16'
1113
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
1214
}
1315
}
1416

1517
plugins {
16-
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
18+
id 'io.spring.dependency-management' version '1.1.3'
1719
id 'java'
1820
id 'application'
1921
id 'jacoco'
20-
id 'nebula.netflixoss' version '10.6.0'
21-
id 'org.sonarqube' version '3.1.1'
22+
id 'nebula.netflixoss' version '11.3.2'
23+
id 'org.sonarqube' version '3.4.0.2513'
2224
}
2325

2426
// Establish version and status
@@ -31,13 +33,16 @@ subprojects {
3133
apply from: "$rootDir/dependencies.gradle"
3234

3335
allprojects {
34-
apply plugin: 'nebula.netflixoss'
36+
apply plugin: 'com.netflix.nebula.netflixoss'
3537
apply plugin: 'io.spring.dependency-management'
3638
apply plugin: 'java-library'
3739
apply plugin: 'project-report'
3840

39-
sourceCompatibility = JavaVersion.VERSION_17
40-
targetCompatibility = JavaVersion.VERSION_17
41+
java {
42+
toolchain {
43+
languageVersion = JavaLanguageVersion.of(17)
44+
}
45+
}
4146

4247
group = 'com.netflix.conductor'
4348

@@ -74,22 +79,23 @@ allprojects {
7479

7580
dependencyManagement {
7681
imports {
77-
mavenBom("org.springframework.boot:spring-boot-dependencies:2.6.7")
82+
// dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/2.7.3/reference/htmlsingle/#appendix.dependency-versions
83+
mavenBom(SpringBootPlugin.BOM_COORDINATES)
7884
}
7985
}
8086

8187
dependencies {
82-
implementation "org.apache.logging.log4j:log4j-core:${revLog4J}"
83-
implementation "org.apache.logging.log4j:log4j-api:${revLog4J}"
84-
implementation "org.apache.logging.log4j:log4j-slf4j-impl:${revLog4J}"
85-
implementation "org.apache.logging.log4j:log4j-jul:${revLog4J}"
86-
implementation "org.apache.logging.log4j:log4j-web:${revLog4J}"
87-
88+
implementation('org.apache.logging.log4j:log4j-core')
89+
implementation('org.apache.logging.log4j:log4j-api')
90+
implementation('org.apache.logging.log4j:log4j-slf4j-impl')
91+
implementation('org.apache.logging.log4j:log4j-jul')
92+
implementation('org.apache.logging.log4j:log4j-web')
8893
annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
8994

90-
testImplementation 'org.springframework.boot:spring-boot-starter-test'
91-
testImplementation 'org.springframework.boot:spring-boot-starter-log4j2'
92-
testImplementation 'org.junit.vintage:junit-vintage-engine'
95+
testImplementation('org.springframework.boot:spring-boot-starter-test')
96+
testImplementation('org.springframework.boot:spring-boot-starter-log4j2')
97+
testImplementation 'junit:junit'
98+
testImplementation "org.junit.vintage:junit-vintage-engine"
9399
}
94100

95101
// processes additional configuration metadata json file as described here
@@ -101,6 +107,7 @@ allprojects {
101107
testLogging {
102108
events = ["SKIPPED", "FAILED"]
103109
exceptionFormat = "full"
110+
displayGranularity = 1
104111
showStandardStreams = false
105112
}
106113
}
@@ -124,7 +131,6 @@ sonarqube {
124131
}
125132

126133
configure(allprojects) {
127-
128134
apply plugin: 'com.diffplug.spotless'
129135

130136
spotless {
@@ -135,5 +141,4 @@ configure(allprojects) {
135141
licenseHeaderFile("$rootDir/licenseheader.txt")
136142
}
137143
}
138-
build.dependsOn(spotlessApply)
139144
}

community-server/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ plugins {
55
ext['snakeyaml.version'] = revSnakeYaml
66

77
dependencies {
8-
9-
108
implementation "com.netflix.conductor:conductor-rest:${revConductor}"
119
implementation "com.netflix.conductor:conductor-core:${revConductor}"
1210
implementation "com.netflix.conductor:conductor-redis-persistence:${revConductor}"
@@ -70,6 +68,10 @@ bootJar {
7068
classifier = 'boot'
7169
}
7270

71+
// https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#integrating-with-actuator.build-info
72+
// This will configure a BuildInfo task named bootBuildInfo
7373
springBoot {
7474
buildInfo()
7575
}
76+
77+
compileJava.dependsOn bootBuildInfo

0 commit comments

Comments
 (0)