ccctechcenter · dependabot · Jun 21, 2018 · Jun 21, 2018 · Jun 22, 2018 · Jun 22, 2018
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/grpc-client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/grpc-client/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -1 +1 @@
-mock-maker-inline
+mock-maker-inline
diff --git a/server/build.gradle b/server/build.gradle
@@ -59,6 +59,9 @@ jar {
 bootJar {
     mainClass = 'com.netflix.conductor.Conductor'
     classifier = 'boot'
+    manifest {
+        attributes 'Main-Class': 'org.springframework.boot.loader.PropertiesLauncher'
+    }
 }
 
 springBoot {

diff --git a/server/src/main/java/com/netflix/conductor/Conductor.java b/server/src/main/java/com/netflix/conductor/Conductor.java
@@ -26,7 +26,9 @@
 // Prevents from the datasource beans to be loaded, AS they are needed only for specific databases.
 // In case that SQL database is selected this class will be imported back in the appropriate
 // database persistence module.
-@SpringBootApplication(exclude = DataSourceAutoConfiguration.class)
+@SpringBootApplication(
+        exclude = DataSourceAutoConfiguration.class,
+        scanBasePackages = {"com.netflix.conductor", "org.ccctech.apigateway.conductor"})
 public class Conductor {
 
     private static final Logger log = LoggerFactory.getLogger(Conductor.class);

diff --git a/settings.gradle b/settings.gradle
@@ -12,7 +12,7 @@
  */
 
 plugins {
-    id "com.gradle.enterprise" version "3.11.1"
+    id "com.gradle.enterprise" version "3.17.5"
 }
 
 gradleEnterprise {