Fixed the broken builds

spring-cloud-samples · Jan 23, 2017 · 4b532dd · 4b532dd
1 parent 3e67a7e
commit 4b532dd
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 12 deletions.
diff --git a/brewing/src/main/resources/application.yaml b/brewing/src/main/resources/application.yaml
@@ -18,5 +18,5 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 spring.cloud.stream:
   binder.rabbit.default.maxConcurrency: 5
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/build.gradle b/build.gradle
@@ -145,6 +145,8 @@ configure(subprojects) {
             if (ext.whatToTest('SCS')) mavenBom "io.pivotal.spring.cloud:spring-cloud-services-dependencies:$SCS_VERSION"
         }
     }
+
+    task allDeps(type: DependencyReportTask) {}
 }
 
 configure(subprojects - zipkinServerProject - acceptanceTestsProject - zookeeperServerProject - configServerProject) {

diff --git a/config-server/src/main/resources/application.yml b/config-server/src/main/resources/application.yml
@@ -11,5 +11,5 @@ spring:
 
 spring.zipkin.enabled: false
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/eureka/src/main/resources/application.yml b/eureka/src/main/resources/application.yml
@@ -7,5 +7,5 @@ eureka:
     registerWithEureka: false
     fetchRegistry: false
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/ingredients/src/main/resources/application.yaml b/ingredients/src/main/resources/application.yaml
@@ -16,5 +16,5 @@ logging.file: build/ingredients.log
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 spring.cloud.stream.binder.rabbit.default.maxConcurrency: 5
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/presenting/src/main/resources/application.yaml b/presenting/src/main/resources/application.yaml
@@ -16,5 +16,5 @@ logging.file: build/presenting.log
 
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/reporting/src/main/resources/application.yaml b/reporting/src/main/resources/application.yaml
@@ -18,5 +18,5 @@ hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 spring.cloud.stream:
   binder.rabbit.default.maxConcurrency: 5
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/runAcceptanceTests.sh b/runAcceptanceTests.sh
@@ -560,7 +560,7 @@ APP_BUILDING_RETRIES=3
 APP_WAIT_TIME=1
 APP_FAILED="yes"
 if [[ -z "${SKIP_BUILDING}" ]] ; then
-    PARAMS="--parallel --no-daemon --refresh-dependencies";
+    PARAMS="--no-daemon --refresh-dependencies";
     if [[ "${KAFKA}" == "yes" ]] ; then
         echo "Will use Kafka as a message broker"
         PARAMS="${PARAMS} -Pkafka"
@@ -570,8 +570,11 @@ if [[ -z "${SKIP_BUILDING}" ]] ; then
         PARAMS="${PARAMS} -PBOOT_VERSION=${BOOT_VERSION}"
     fi
     for i in $( seq 1 "${APP_BUILDING_RETRIES}" ); do
-          echo "Running the build with parameters [${PARAMS}]"
-          ./gradlew clean --parallel && ./gradlew build ${PARAMS} && APP_FAILED="no" && break
+          ./gradlew clean --parallel
+          echo -e "\n\nPrinting the dependency tree for all projects\n\n"
+          ./gradlew allDeps
+          echo -e "\n\nRunning the build with parameters [${PARAMS}]\n\n"
+          ./gradlew build ${PARAMS} --parallel && APP_FAILED="no" && break
           echo "Fail #$i/${APP_BUILDING_RETRIES}... will try again in [${APP_WAIT_TIME}] seconds"
     done
 else

diff --git a/zipkin-server/src/main/resources/application.yaml b/zipkin-server/src/main/resources/application.yaml
@@ -21,5 +21,5 @@ zipkin:
 
 logging.file: build/zipkin-server.log
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/zookeeper/src/main/resources/application.yaml b/zookeeper/src/main/resources/application.yaml
@@ -1,4 +1,4 @@
 server.port: 9999
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false
diff --git a/zuul/src/main/resources/application.yml b/zuul/src/main/resources/application.yml
@@ -20,5 +20,5 @@ zuul:
 
 hystrix.command.default.execution.isolation.thread.timeoutInMilliseconds: 60000
 
-management.security.enabled: false
+
 endpoints.health.sensitive: false