clean up

edjdc · Jun 7, 2019 · 3e34824 · 3e34824
1 parent 42c185c
commit 3e34824
Show file tree

Hide file tree

Showing 12 changed files with 11 additions and 27 deletions.
diff --git a/docker-compose-mysql-schema-per-service.yml b/docker-compose-mysql-schema-per-service.yml
@@ -1,13 +1,11 @@
 version: '3'
 services:
   zookeeper:
-    image: test-eventuate-zookeeper
+    image: eventuateio/eventuate-zookeeper:0.4.0.RELEASE
     ports:
       - 2181:2181
-      - 2888:2888
-      - 3888:3888
   kafka:
-    image: test-eventuate-kafka
+    image: eventuateio/eventuate-kafka:0.3.0.RELEASE
     ports:
       - 9092:9092
     depends_on:
@@ -25,7 +23,7 @@ services:
       - MYSQL_USER=mysqluser
       - MYSQL_PASSWORD=mysqlpw
   cdc-service:
-    image: test-eventuate-cdc-service
+    image: eventuateio/eventuate-cdc-service:0.2.0.RELEASE
     ports:
       - "8099:8080"
     depends_on:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,13 +1,11 @@
 version: '3'
 services:
   zookeeper:
-    image: test-eventuate-zookeeper
+    image: eventuateio/eventuate-zookeeper:0.4.0.RELEASE
     ports:
       - 2181:2181
-      - 2888:2888
-      - 3888:3888
   kafka:
-    image: test-eventuate-kafka
+    image: eventuateio/eventuate-kafka:0.3.0.RELEASE
     ports:
       - 9092:9092
     depends_on:
@@ -25,7 +23,7 @@ services:
       - MYSQL_USER=mysqluser
       - MYSQL_PASSWORD=mysqlpw
   cdc-service:
-    image: test-eventuate-cdc-service
+    image: eventuateio/eventuate-cdc-service:0.2.0.RELEASE
     ports:
       - "8099:8080"
     depends_on:

diff --git a/ftgo-accounting-service/src/main/resources/application.properties b/ftgo-accounting-service/src/main/resources/application.properties
@@ -1,7 +1,5 @@
 spring.application.name=ftgo-accounting-service
 
-management.health.jms.enabled=false
-management.health.redis.enabled=false
 management.endpoint.health.show-details=always
 
 spring.jpa.generate-ddl=true

diff --git a/ftgo-consumer-service/src/main/resources/application.properties b/ftgo-consumer-service/src/main/resources/application.properties
@@ -1,7 +1,5 @@
 spring.application.name=ftgo-consumer-service
 
-management.health.jms.enabled=false
-management.health.redis.enabled=false
 management.endpoint.health.show-details=always
 
 spring.jpa.generate-ddl=true

diff --git a/ftgo-kitchen-service/src/main/resources/application.properties b/ftgo-kitchen-service/src/main/resources/application.properties
@@ -1,7 +1,5 @@
 spring.application.name=ftgo-kitchen-service
 
-management.health.jms.enabled=false
-management.health.redis.enabled=false
 management.endpoint.health.show-details=always
 
 spring.jpa.generate-ddl=true

diff --git a/ftgo-order-history-service/src/main/resources/application.properties b/ftgo-order-history-service/src/main/resources/application.properties
@@ -1,7 +1,5 @@
 spring.application.name=ftgo-order-history-service
 
-management.health.jms.enabled=false
-management.health.redis.enabled=false
 management.endpoint.health.show-details=always
 
 logging.level.io.eventuate=DEBUG

diff --git a/ftgo-order-service/src/main/resources/application.properties b/ftgo-order-service/src/main/resources/application.properties
@@ -1,6 +1,4 @@
 spring.application.name=ftgo-order-service
-management.health.jms.enabled=false
-management.health.redis.enabled=false
 management.endpoint.health.show-details=always
 spring.sleuth.sampler.probability=1.0
 

diff --git a/ftgo-restaurant-service/src/main/resources/application.properties b/ftgo-restaurant-service/src/main/resources/application.properties
@@ -1,7 +1,5 @@
 spring.application.name=ftgo-restaurant-service
 
-management.health.jms.enabled=false
-management.health.redis.enabled=false
 management.endpoint.health.show-details=always
 
 spring.jpa.generate-ddl=true

diff --git a/gradle.properties b/gradle.properties
@@ -13,11 +13,11 @@ springDependencyManagementPluginVersion=1.0.3.RELEASE
 eventuateClientVersion=0.20.0-SNAPSHOT
 eventuateLocalVersion=0.15.0-SNAPSHOT
 
-eventuateTramVersion=0.20.0.REDIS-SNAPSHOT
+eventuateTramVersion=0.21.0-SNAPSHOT
 eventuateTramSagasVersion=0.11.0-SNAPSHOT
 eventuateUtilVersion=0.2.0.RELEASE
 eventuateCommonVersion=0.4.0.RELEASE
-eventuateMessagingKafkaVersion=0.1.0-SNAPSHOT
+eventuateMessagingKafkaVersion=0.2.0.RELEASE
 
 #dockerComposePluginVersion=0.4.5
 dockerComposePluginVersion=0.6.6

diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
@@ -1,3 +1,3 @@
-FROM test-eventuate-mariadb
+FROM eventuateio/eventuate-mariadb:0.4.0.RELEASE
 
 COPY *.sql /docker-entrypoint-initdb.d/
diff --git a/mysql-schema-per-service/Dockerfile b/mysql-schema-per-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM test-eventuate-mysql
+FROM eventuateio/eventuate-mysql:0.4.0.RELEASE
 
 COPY common-schema.sql /docker-entrypoint-initdb.d/3.common-schema.sql
 COPY compile-schema-per-service.sh /docker-entrypoint-initdb.d/4.compile-schema-per-service.sh

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
@@ -1,2 +1,2 @@
-FROM test-eventuate-mysql
+FROM eventuateio/eventuate-mysql:0.4.0.RELEASE
 COPY eventuate-local-schema-mysql.sql /docker-entrypoint-initdb.d/z-eventuate-local-schema-mysql.sql