You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/01/14 14:27:44 UTC

[servicecomb-pack] 01/01: SCB-1111 Always init the table script if possible

This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch SCB-1111
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git

commit 715c8fdda658c1071d45f6216da41876d67e6391
Author: Willem Jiang <ji...@huawei.com>
AuthorDate: Mon Jan 14 22:22:53 2019 +0800

    SCB-1111 Always init the table script if possible
---
 acceptance-tests/acceptance-pack-dubbo-demo/pom.xml |  2 +-
 .../acceptance-pack-spring-demo/pom.xml             |  2 +-
 .../acceptance-pack-tcc-spring-demo/pom.xml         |  2 +-
 .../src/main/resources/application.yaml             | 21 +++++++++++++--------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
index 5d42f37..ed99630 100644
--- a/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-dubbo-demo/pom.xml
@@ -94,7 +94,7 @@
                   <run>
                     <env>
                       <JAVA_OPTS>
-                        -Dspring.profiles.active=prd,test -Dspring.datasource.initialization-mode=always
+                        -Dspring.profiles.active=prd,test
                       </JAVA_OPTS>
                     </env>
                     <links>
diff --git a/acceptance-tests/acceptance-pack-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
index f4cdc25..4283c4e 100644
--- a/acceptance-tests/acceptance-pack-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-spring-demo/pom.xml
@@ -123,7 +123,7 @@
                   <run>
                     <env>
                       <JAVA_OPTS>
-                        -Dspring.profiles.active=prd,test -Dspring.datasource.initialization-mode=always
+                        -Dspring.profiles.active=prd,test
                       </JAVA_OPTS>
                     </env>
                     <links>
diff --git a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
index 79f982e..5ae016a 100644
--- a/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
+++ b/acceptance-tests/acceptance-pack-tcc-spring-demo/pom.xml
@@ -118,7 +118,7 @@
                   <run>
                     <env>
                       <JAVA_OPTS>
-                        -Dspring.profiles.active=prd,test -Dspring.datasource.initialization-mode=always
+                        -Dspring.profiles.active=prd,test
                       </JAVA_OPTS>
                     </env>
                     <links>
diff --git a/alpha/alpha-server/src/main/resources/application.yaml b/alpha/alpha-server/src/main/resources/application.yaml
index 7efd6de..28b8c93 100644
--- a/alpha/alpha-server/src/main/resources/application.yaml
+++ b/alpha/alpha-server/src/main/resources/application.yaml
@@ -22,13 +22,10 @@ alpha:
     host: 0.0.0.0
     port: 8080
 
-# EclipseLink will attempt to create tables. If the table exists, EclipseLink will add any missing columns.
 spring:
-  jpa:
-    properties:
-      eclipselink:
-        ddl-generation: create-or-extend-tables
-
+  datasource:
+    initialization-mode: always
+    
 ---
 spring:
   profiles: ssl
@@ -49,7 +46,11 @@ spring:
     password: password
     url: jdbc:postgresql://postgresql.servicecomb.io:5432/saga?useSSL=false
     platform: postgresql
-    continue-on-error: true
+    continue-on-error: false
+  jpa:
+    properties:
+      eclipselink:
+        ddl-generation: none
 
 ---
 spring:
@@ -59,4 +60,8 @@ spring:
     password: password
     url: jdbc:mysql://mysql.servicecomb.io:3306/saga?useSSL=false
     platform: mysql
-    continue-on-error: true
+    continue-on-error: false
+  jpa:
+    properties:
+      eclipselink:
+        ddl-generation: none