Merge pull request #300 from meggarr/rmeng/update-versions

Update versions
Netflix · Nov 25, 2023 · 3c43409 · 3c43409
2 parents 991c555 + ba53059
commit 3c43409
Show file tree

Hide file tree

Showing 25 changed files with 913 additions and 785 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,3 +1,5 @@
+import org.springframework.boot.gradle.plugin.SpringBootPlugin
+
 buildscript {
     repositories {
         mavenCentral()
@@ -6,19 +8,19 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:7.0.0'
-        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.6.7'
+        classpath 'com.netflix.nebula:gradle-extra-configurations-plugin:10.0.0'
+        classpath 'org.springframework.boot:spring-boot-gradle-plugin:2.7.16'
         classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.+'
     }
 }
 
 plugins {
-    id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id 'io.spring.dependency-management' version '1.1.3'
     id 'java'
     id 'application'
     id 'jacoco'
-    id 'nebula.netflixoss' version '10.6.0'
-    id 'org.sonarqube' version '3.1.1'
+    id 'nebula.netflixoss' version '11.3.2'
+    id 'org.sonarqube' version '3.4.0.2513'
 }
 
 // Establish version and status
@@ -31,13 +33,16 @@ subprojects {
 apply from: "$rootDir/dependencies.gradle"
 
 allprojects {
-    apply plugin: 'nebula.netflixoss'
+    apply plugin: 'com.netflix.nebula.netflixoss'
     apply plugin: 'io.spring.dependency-management'
     apply plugin: 'java-library'
     apply plugin: 'project-report'
 
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    java {
+        toolchain {
+            languageVersion = JavaLanguageVersion.of(17)
+        }
+    }
 
     group = 'com.netflix.conductor'
 
@@ -74,22 +79,23 @@ allprojects {
 
     dependencyManagement {
         imports {
-            mavenBom("org.springframework.boot:spring-boot-dependencies:2.6.7")
+            // dependency versions for the BOM can be found at https://docs.spring.io/spring-boot/docs/2.7.3/reference/htmlsingle/#appendix.dependency-versions
+            mavenBom(SpringBootPlugin.BOM_COORDINATES)
         }
     }
 
     dependencies {
-        implementation "org.apache.logging.log4j:log4j-core:${revLog4J}"
-        implementation "org.apache.logging.log4j:log4j-api:${revLog4J}"
-        implementation "org.apache.logging.log4j:log4j-slf4j-impl:${revLog4J}"
-        implementation "org.apache.logging.log4j:log4j-jul:${revLog4J}"
-        implementation "org.apache.logging.log4j:log4j-web:${revLog4J}"
-
+        implementation('org.apache.logging.log4j:log4j-core')
+        implementation('org.apache.logging.log4j:log4j-api')
+        implementation('org.apache.logging.log4j:log4j-slf4j-impl')
+        implementation('org.apache.logging.log4j:log4j-jul')
+        implementation('org.apache.logging.log4j:log4j-web')
         annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 
-        testImplementation 'org.springframework.boot:spring-boot-starter-test'
-        testImplementation 'org.springframework.boot:spring-boot-starter-log4j2'
-        testImplementation 'org.junit.vintage:junit-vintage-engine'
+        testImplementation('org.springframework.boot:spring-boot-starter-test')
+        testImplementation('org.springframework.boot:spring-boot-starter-log4j2')
+        testImplementation 'junit:junit'
+        testImplementation "org.junit.vintage:junit-vintage-engine"
     }
 
     // processes additional configuration metadata json file as described here
@@ -101,6 +107,7 @@ allprojects {
         testLogging {
             events = ["SKIPPED", "FAILED"]
             exceptionFormat = "full"
+            displayGranularity = 1
             showStandardStreams = false
         }
     }
@@ -124,7 +131,6 @@ sonarqube {
 }
 
 configure(allprojects) {
-
     apply plugin: 'com.diffplug.spotless'
 
     spotless {
@@ -135,5 +141,4 @@ configure(allprojects) {
             licenseHeaderFile("$rootDir/licenseheader.txt")
         }
     }
-    build.dependsOn(spotlessApply)
 }
diff --git a/community-server/build.gradle b/community-server/build.gradle
@@ -5,8 +5,6 @@ plugins {
 ext['snakeyaml.version'] = revSnakeYaml
 
 dependencies {
-
-
     implementation "com.netflix.conductor:conductor-rest:${revConductor}"
     implementation "com.netflix.conductor:conductor-core:${revConductor}"
     implementation "com.netflix.conductor:conductor-redis-persistence:${revConductor}"
@@ -70,6 +68,10 @@ bootJar {
     classifier = 'boot'
 }
 
+// https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/#integrating-with-actuator.build-info
+// This will configure a BuildInfo task named bootBuildInfo
 springBoot {
     buildInfo()
 }
+
+compileJava.dependsOn bootBuildInfo