Merge pull request #2664 from Netflix/gradle_netflixoss_upgrade

Build tools upgrade

annotations-processor/build.gradle

@@ -5,20 +5,20 @@ sourceSets {
 
 dependencies {
     implementation project(':conductor-annotations')
-    compile 'com.google.guava:guava:25.1-jre'
-    compile 'com.squareup:javapoet:1.11.+'
-    compile 'com.github.jknack:handlebars:4.0.+'
-    compile 'com.google.protobuf:protobuf-java:3.5.1'
-    compile 'javax.annotation:javax.annotation-api:1.3.2'
-    compile gradleApi()
+    api 'com.google.guava:guava:25.1-jre'
+    api 'com.squareup:javapoet:1.11.+'
+    api 'com.github.jknack:handlebars:4.0.+'
+    api 'com.google.protobuf:protobuf-java:3.5.1'
+    api 'javax.annotation:javax.annotation-api:1.3.2'
+    api gradleApi()
 
-    exampleCompile sourceSets.main.output
-    exampleCompile project(':conductor-annotations')
+    exampleImplementation sourceSets.main.output
+    exampleImplementation project(':conductor-annotations')
 }
 
 task exampleJar(type: Jar) {
     archiveFileName = 'example.jar'
     from sourceSets.example.output.classesDirs
 }
 
-testClasses.finalizedBy(exampleJar)
+testClasses.finalizedBy(exampleJar)

build.gradle

@@ -18,7 +18,7 @@ plugins {
     id 'java'
     id 'application'
     id 'jacoco'
-    id 'nebula.netflixoss' version '9.2.2'
+    id 'nebula.netflixoss' version '10.4.0'
     id 'org.sonarqube' version '3.1.1'
 }
 

core/src/main/java/com/netflix/conductor/service/AdminServiceImpl.java

@@ -12,6 +12,7 @@
  */
 package com.netflix.conductor.service;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -48,13 +49,13 @@ public AdminServiceImpl(
             QueueDAO queueDAO,
             Optional<WorkflowRepairService> workflowRepairService,
             Optional<EventQueueManager> eventQueueManager,
-            BuildProperties buildProperties) {
+            Optional<BuildProperties> buildProperties) {
         this.properties = properties;
         this.executionService = executionService;
         this.queueDAO = queueDAO;
         this.workflowRepairService = workflowRepairService.orElse(null);
         this.eventQueueManager = eventQueueManager.orElse(null);
-        this.buildProperties = buildProperties;
+        this.buildProperties = buildProperties.orElse(null);
     }
 
     /**
@@ -74,6 +75,7 @@ public Map<String, Object> getAllConfig() {
      * @return all the build properties.
      */
     private Map<String, Object> getBuildProperties() {
+        if (buildProperties == null) return Collections.emptyMap();
         Map<String, Object> buildProps = new HashMap<>();
         buildProps.put("version", buildProperties.getVersion());
         buildProps.put("buildDate", buildProperties.getTime());

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists