Fix SAJ for CF

spring-cloud · Dec 20, 2018 · 5cb9b8e · 5cb9b8e
1 parent b7a7ef9
commit 5cb9b8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/cloudfoundry/init/env.properties b/cloudfoundry/init/env.properties
@@ -27,4 +27,3 @@ SCHEDULES_PLAN_NAME=standard
 SCHEDULES_INSTANCE_NAME=atscheduler
 SPRING_CLOUD_COMMON_SECURITY_ENABLED=false
 SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED=false
-SPRING_APPLICATION_JSON="'{ "maven": { "remote-repositories": { "repo1": { "url": "$MAVEN_REMOTE_REPOSITORIES_REPO1_URL" } } } }'"
diff --git a/cloudfoundry/server/create.sh b/cloudfoundry/server/create.sh
@@ -38,7 +38,6 @@ cat << EOF >> ./scdf-manifest.yml
     SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: $SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD
     SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: $SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION
     SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: $SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES
-    SPRING_APPLICATION_JSON: $SPRING_APPLICATION_JSON
     SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_API_TIMEOUT: $SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_API_TIMEOUT
     SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_API_TIMEOUT: $SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_API_TIMEOUT
     TRUST_CERTS: $TRUST_CERTS
@@ -53,6 +52,16 @@ cat << EOF >> ./scdf-manifest.yml
     SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED: $SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED
 EOF
 
+if [ -z "$SPRING_APPLICATION_JSON" ]; then
+cat << EOF >> ./scdf-manifest.yml
+    SPRING_APPLICATION_JSON:  '{ "maven": { "remote-repositories": { "repo1": { "url": "$MAVEN_REMOTE_REPOSITORIES_REPO1_URL" } } }}'
+EOF
+else
+cat << EOF >> ./scdf-manifest.yml
+    SPRING_APPLICATION_JSON: $SPRING_APPLICATION_JSON
+EOF
+fi
+
 if [ "$schedulesEnabled" ]; then
     cat << EOF >> ./scdf-manifest.yml
     SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: $SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES,$SCHEDULES_INSTANCE_NAME