From b6726a781d9b15ec1a764cae10baf1916c1df187 Mon Sep 17 00:00:00 2001 From: ytian90 Date: Sat, 11 Nov 2017 21:29:04 -0800 Subject: [PATCH 1/4] update heroku-maven-plugin version to avoid build failure --- livelessons-cloud/livelessons-cloud-heroku/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livelessons-cloud/livelessons-cloud-heroku/pom.xml b/livelessons-cloud/livelessons-cloud-heroku/pom.xml index 3d3d6f5..c039a2d 100644 --- a/livelessons-cloud/livelessons-cloud-heroku/pom.xml +++ b/livelessons-cloud/livelessons-cloud-heroku/pom.xml @@ -26,7 +26,7 @@ com.heroku.sdk heroku-maven-plugin - 0.3.4-SNAPSHOT + 2.0.0 false From 6a84142849b9c7863292963a133f5df6fa9c1918 Mon Sep 17 00:00:00 2001 From: ytian90 Date: Sat, 11 Nov 2017 23:22:34 -0800 Subject: [PATCH 2/4] update FROM oracle java 8 new directory to fetch JAR --- livelessons-cloud/livelessons-cloud-docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livelessons-cloud/livelessons-cloud-docker/Dockerfile b/livelessons-cloud/livelessons-cloud-docker/Dockerfile index 6e5c080..15c7ef5 100644 --- a/livelessons-cloud/livelessons-cloud-docker/Dockerfile +++ b/livelessons-cloud/livelessons-cloud-docker/Dockerfile @@ -1,4 +1,4 @@ -FROM dockerfile/java:oracle-java8 +FROM java:8 EXPOSE 8080 CMD java -jar /livelessons-cloud-docker.jar ADD target/livelessons-cloud-docker-1.0.0-SNAPSHOT.jar /livelessons-cloud-docker.jar From 713b4db38977e71de555979a5f35a7ceac18c3ee Mon Sep 17 00:00:00 2001 From: ytian90 Date: Tue, 21 Nov 2017 23:55:40 -0800 Subject: [PATCH 3/4] add app prop file for producer to change port avoid conflicts --- .../src/main/resources/application.properties | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 livelessons-integration/livelessons-integration-producer/src/main/resources/application.properties diff --git a/livelessons-integration/livelessons-integration-producer/src/main/resources/application.properties b/livelessons-integration/livelessons-integration-producer/src/main/resources/application.properties new file mode 100644 index 0000000..d9f9bfb --- /dev/null +++ b/livelessons-integration/livelessons-integration-producer/src/main/resources/application.properties @@ -0,0 +1,3 @@ +server.port=8081 + +spring.cloud.stream.bindings.output.destination = greetings \ No newline at end of file From 5b7bb5c5c9d3cd00773fe619bb2c55f31abac158 Mon Sep 17 00:00:00 2001 From: ytian90 Date: Sun, 26 Nov 2017 18:46:14 -0800 Subject: [PATCH 4/4] update correct prop name for account & password --- .../src/main/resources/application.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/livelessons-operations/livelessons-operations-actuator/src/main/resources/application.properties b/livelessons-operations/livelessons-operations-actuator/src/main/resources/application.properties index 34a79c7..af300df 100644 --- a/livelessons-operations/livelessons-operations-actuator/src/main/resources/application.properties +++ b/livelessons-operations/livelessons-operations-actuator/src/main/resources/application.properties @@ -1,2 +1,2 @@ -shell.auth.simple.user.name=livelessons -shell.auth.simple.user.password=livelessons +management.shell.auth.simple.user.name=livelessons +management.shell.auth.simple.user.password=livelessons