This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git.
from d6b16c9 Merge pull request #461 from coolbeevip/SCB-1281
add bc06c44 add alpha-spring-cloud-starter-zookeeper module to
alpha/pom.xml
add 5801bc8 add GrpcStartableStartedEventListener to
alpha-spring-cloud-starter-zookeeper
add da2fb25 add pom.xml to alpha-spring-cloud-starter-zookeeper
add dd1aeb6 add spring-cloud-starter-zookeeper-discovery dependency to
alpha-server/pom.xml
add 124c36f add spring-cloud-zookeeper profile to alpha-server/pom.xml
add c8796ea add alpha-spring-cloud-starter-zookeeper dependency to pom.xml
add ea26a94 change onClass ZookeeperAutoConfiguration to
ZookeeperDiscoveryAutoConfiguration
add a3dd68f add zookeeper dependency to pom.xml
add 1197ae3 fix error pom.xml
add ae27319 change onClass ZookeeperDiscoveryAutoConfiguration to
ZookeeperAutoServiceRegistrationAutoConfiguration
add 83e18ee change
GrpcStartableStartedEventListener.listenGrpcStartableStartedEvent
add b649a1b change
GrpcStartableStartedEventListener.listenGrpcStartableStartedEvent logger
add 596f773 add omega-spring-cloud-zookeeper-starter module to
omega/pom.xml
add 436d3b8 add DiscoveryType.ZOOKEEPER to AlphaClusterDiscovery
add 26bbdfc add omega-spring-cloud-zookeeper-starter/pom.xml
add c5cb430 add OmegaSpringZookeeperAutoConfiguration
add 630c68b add OmegaSpringZookeeperConfig
add 0d9d583 add spring.factories to omega-spring-cloud-zookeeper-starter
add db5f656 change OmegaSpringZookeeperConfig
add 44bccc3 add logger to OmegaSpringZookeeperConfig
add 4dcff6c delete zookeeperDiscoveryProfoperties field to
OmegaSpringZookeeperConfig
add 243a289 change OmegaSpringZookeeperConfig.alphaClusterAddress method
add e0217bd change comment to OmegaSpringZookeeperConfig
add af57d7b change logger to OmegaSpringZookeeperConfig
add 0355a31 add acceptance-pack-spring-demo-with-zookeeper module to
acceptance-tests/pom.xml
add aca90c0 add acceptance-pack-spring-demo-with-zookeeper
add 461fe17 change spring-cloud-starter-zookeeper-discovery version
add 35995cb change spring-cloud-starter-zookeeper-discovery version to
alpha/alpha-server/pom.xml
add f6fcc51 change zookeeper.connectString to
acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
add a20f975 add omega-spring-cloud-zookeeper-starter dependency to
demo/saga-spring-demo/car/pom.xml
add 42bbdf2 add omega-spring-cloud-zookeeper-starter dependency to
demo/saga-spring-demo/booking/pom.xml
add df3203a add omega-spring-cloud-zookeeper-starter dependency to
demo/saga-spring-demo/hotel/pom.xml
add 52ee98a add omega-spring-cloud-zookeeper-starter dependency to pom.xml
add b21b626 add rxjava dependency to spring-boot-1 profile
add a2d6aa4 add spring.cloud.zookeeper.enabled = false to bootstrap.yml
add f1fbf26 add spring.cloud.zookeeper.enabled = false to
demo/saga-spring-demo/*/application.yaml
add fefc2f8 delete alpha.cluster.address to
acceptance-tests/acceptance-pack-spring-demo-with-zookeeper/pom.xml
add 6a952ba upgrade io.fabric8.docker-maven-plugin version 0.26.0 to
0.28.0
add b0dab83 delete zookeeper dependency to pom.xml
add 131c21b add zookeeper dependency to
alpha/alpha-spring-cloud-starter-zookeeper/pom.xml
add 7a04284 add zookeeper dependency to
omega/omega-spring-cloud-zookeeper-starter/pom.xml
add 196c35b add spring.cloud.starter.zookeeper.discovery2.version to
pom.xml
new e49b9e5 SCB-1298 Merge pull request #470 from
cmonkey/feature/acceptance-pack-spring-demo-with-zookeeper
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../pom.xml | 62 ++++++++++------------
.../org/apache/servicecomb/pack/PackStepdefs.java | 0
.../org/apache/servicecomb/pack/RunCucumberIT.java | 0
.../src/test/resources/booking_exception.btm | 0
.../src/test/resources/booking_timeout.btm | 0
.../src/test/resources/log4j2-test.xml | 0
.../resources/pack_compensation_scenario.feature | 0
.../pack_post_car_exception_scenario.feature | 0
.../test/resources/pack_success_scenario.feature | 0
.../test/resources/pack_timeout_scenario.feature | 0
acceptance-tests/pom.xml | 1 +
alpha/alpha-server/pom.xml | 19 +++++++
.../alpha-server/src/main/resources/bootstrap.yaml | 4 +-
.../pom.xml | 19 +++++--
.../GrpcStartableStartedEventListener.java | 29 +++++-----
alpha/pom.xml | 1 +
demo/saga-spring-demo/booking/pom.xml | 4 ++
.../booking/src/main/resources/application.yaml | 2 +
demo/saga-spring-demo/car/pom.xml | 4 ++
.../car/src/main/resources/application.yaml | 2 +
demo/saga-spring-demo/hotel/pom.xml | 4 ++
.../hotel/src/main/resources/application.yaml | 2 +
.../connector/grpc/AlphaClusterDiscovery.java | 2 +-
.../pom.xml | 13 +++--
.../OmegaSpringZookeeperAutoConfiguration.java} | 4 +-
.../spring/cloud/OmegaSpringZookeeperConfig.java} | 44 +++++++--------
.../src/main/resources/META-INF/spring.factories | 2 +-
omega/pom.xml | 1 +
pom.xml | 34 +++++++++++-
29 files changed, 165 insertions(+), 88 deletions(-)
copy acceptance-tests/{acceptance-pack-spring-demo-with-consul =>
acceptance-pack-spring-demo-with-zookeeper}/pom.xml (83%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/java/org/apache/servicecomb/pack/PackStepdefs.java
(100%)
copy acceptance-tests/{acceptance-pack-tcc-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/java/org/apache/servicecomb/pack/RunCucumberIT.java
(100%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/booking_exception.btm
(100%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/booking_timeout.btm
(100%)
copy {omega/omega-transaction =>
acceptance-tests/acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/log4j2-test.xml
(100%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/pack_compensation_scenario.feature
(100%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/pack_post_car_exception_scenario.feature
(100%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/pack_success_scenario.feature
(100%)
copy acceptance-tests/{acceptance-pack-spring-demo =>
acceptance-pack-spring-demo-with-zookeeper}/src/test/resources/pack_timeout_scenario.feature
(100%)
copy alpha/{alpha-spring-cloud-starter-eureka =>
alpha-spring-cloud-starter-zookeeper}/pom.xml (81%)
copy
alpha/{alpha-spring-cloud-starter-eureka/src/main/java/org/apache/servicecomb/pack/alpha/server/discovery/eureka
=>
alpha-spring-cloud-starter-zookeeper/src/main/java/org/apache/servicecomb/pack/alpha/server/discovery/zookeeper}/GrpcStartableStartedEventListener.java
(63%)
copy omega/{omega-spring-cloud-eureka-starter =>
omega-spring-cloud-zookeeper-starter}/pom.xml (80%)
copy
omega/{omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulAutoConfiguration.java
=>
omega-spring-cloud-zookeeper-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringZookeeperAutoConfiguration.java}
(92%)
copy
omega/{omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java
=>
omega-spring-cloud-zookeeper-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringZookeeperConfig.java}
(73%)
copy omega/{omega-spring-cloud-consul-starter =>
omega-spring-cloud-zookeeper-starter}/src/main/resources/META-INF/spring.factories
(92%)
