This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-samples.git
The following commit(s) were added to refs/heads/master by this push:
new 9c10119 update versions to 2.1.2
9c10119 is described below
commit 9c10119054b0cc9c3a8e0a4bf5f5ca27ea029192
Author: liubao <[email protected]>
AuthorDate: Wed Oct 28 15:10:40 2020 +0800
update versions to 2.1.2
---
porter_lightweight/api/common/endpoint/pom.xml | 2 +-
porter_lightweight/api/common/pom.xml | 2 +-
porter_lightweight/api/common/service/pom.xml | 2 +-
porter_lightweight/api/file-service/endpoint/pom.xml | 2 +-
porter_lightweight/api/file-service/pom.xml | 2 +-
porter_lightweight/api/file-service/service/pom.xml | 2 +-
porter_lightweight/api/pom.xml | 2 +-
porter_lightweight/api/user-service/endpoint/pom.xml | 2 +-
porter_lightweight/api/user-service/pom.xml | 2 +-
porter_lightweight/api/user-service/service/pom.xml | 2 +-
porter_lightweight/file-service/pom.xml | 2 +-
.../file-service/src/main/resources/microservice.yaml | 9 +++------
porter_lightweight/gateway-service/pom.xml | 2 +-
.../src/main/resources/microservice.yaml | 9 ++++-----
porter_lightweight/pom.xml | 19 ++++++++++++++++++-
porter_lightweight/user-service/pom.xml | 2 +-
.../user-service/src/main/resources/microservice.yaml | 9 ++++-----
.../file-service/src/main/resources/application.yml | 9 +++------
.../src/main/resources/application.yml | 8 +++-----
porter_springboot/pom.xml | 3 +--
.../user-service/src/main/resources/application.yml | 8 +++-----
.../website/src/main/resources/application.yml | 8 +++-----
22 files changed, 55 insertions(+), 53 deletions(-)
diff --git a/porter_lightweight/api/common/endpoint/pom.xml
b/porter_lightweight/api/common/endpoint/pom.xml
index a20b7de..94a11c9 100644
--- a/porter_lightweight/api/common/endpoint/pom.xml
+++ b/porter_lightweight/api/common/endpoint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>common-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>common-api-endpoint</artifactId>
diff --git a/porter_lightweight/api/common/pom.xml
b/porter_lightweight/api/common/pom.xml
index ad74433..e074489 100644
--- a/porter_lightweight/api/common/pom.xml
+++ b/porter_lightweight/api/common/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>common-api</artifactId>
diff --git a/porter_lightweight/api/common/service/pom.xml
b/porter_lightweight/api/common/service/pom.xml
index 4693b7f..d3855f3 100644
--- a/porter_lightweight/api/common/service/pom.xml
+++ b/porter_lightweight/api/common/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>common-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>common-api-service</artifactId>
diff --git a/porter_lightweight/api/file-service/endpoint/pom.xml
b/porter_lightweight/api/file-service/endpoint/pom.xml
index dbd99de..07c7b48 100644
--- a/porter_lightweight/api/file-service/endpoint/pom.xml
+++ b/porter_lightweight/api/file-service/endpoint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>file-service-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>file-service-api-endpoint</artifactId>
diff --git a/porter_lightweight/api/file-service/pom.xml
b/porter_lightweight/api/file-service/pom.xml
index e50911d..4439b21 100644
--- a/porter_lightweight/api/file-service/pom.xml
+++ b/porter_lightweight/api/file-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>file-service-api</artifactId>
diff --git a/porter_lightweight/api/file-service/service/pom.xml
b/porter_lightweight/api/file-service/service/pom.xml
index 3426ee7..eb32a66 100644
--- a/porter_lightweight/api/file-service/service/pom.xml
+++ b/porter_lightweight/api/file-service/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>file-service-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>file-service-api-service</artifactId>
diff --git a/porter_lightweight/api/pom.xml b/porter_lightweight/api/pom.xml
index 6c064b8..7e9a56c 100644
--- a/porter_lightweight/api/pom.xml
+++ b/porter_lightweight/api/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>porter-api</artifactId>
diff --git a/porter_lightweight/api/user-service/endpoint/pom.xml
b/porter_lightweight/api/user-service/endpoint/pom.xml
index ab720b4..0857fcd 100644
--- a/porter_lightweight/api/user-service/endpoint/pom.xml
+++ b/porter_lightweight/api/user-service/endpoint/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>user-service-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>user-service-api-endpoint</artifactId>
diff --git a/porter_lightweight/api/user-service/pom.xml
b/porter_lightweight/api/user-service/pom.xml
index ec25a31..cffc60e 100644
--- a/porter_lightweight/api/user-service/pom.xml
+++ b/porter_lightweight/api/user-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>user-service-api</artifactId>
diff --git a/porter_lightweight/api/user-service/service/pom.xml
b/porter_lightweight/api/user-service/service/pom.xml
index a332428..c668361 100644
--- a/porter_lightweight/api/user-service/service/pom.xml
+++ b/porter_lightweight/api/user-service/service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>user-service-api</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>user-service-api-service</artifactId>
diff --git a/porter_lightweight/file-service/pom.xml
b/porter_lightweight/file-service/pom.xml
index 543c5c3..0c2bb66 100644
--- a/porter_lightweight/file-service/pom.xml
+++ b/porter_lightweight/file-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>porter-file-service</artifactId>
diff --git
a/porter_lightweight/file-service/src/main/resources/microservice.yaml
b/porter_lightweight/file-service/src/main/resources/microservice.yaml
index f473dbe..6416655 100644
--- a/porter_lightweight/file-service/src/main/resources/microservice.yaml
+++ b/porter_lightweight/file-service/src/main/resources/microservice.yaml
@@ -19,14 +19,11 @@
# override common configurations in common module
servicecomb-config-order: 10
-APPLICATION_ID: porter-application
-
-service_description:
- version: 0.0.1
- name: file-service
-
servicecomb:
service:
+ application: porter-application
+ name: file-service
+ version: 0.0.1
registry:
address: http://localhost:30100
instance:
diff --git a/porter_lightweight/gateway-service/pom.xml
b/porter_lightweight/gateway-service/pom.xml
index 88dadc3..b6a59ae 100644
--- a/porter_lightweight/gateway-service/pom.xml
+++ b/porter_lightweight/gateway-service/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>porter-gateway-service</artifactId>
diff --git
a/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
b/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
index 58a668a..3981921 100644
--- a/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
+++ b/porter_lightweight/gateway-service/src/main/resources/microservice.yaml
@@ -19,13 +19,12 @@
# override common configurations in common module
servicecomb-config-order: 100
-APPLICATION_ID: porter-application
-service_description:
- version: 0.0.1
- name: gateway-service
-
servicecomb:
service:
+ application: porter-application
+ name: gateway-service
+ version: 0.0.1
+
registry:
address: http://localhost:30100
instance:
diff --git a/porter_lightweight/pom.xml b/porter_lightweight/pom.xml
index e238822..a42ec14 100644
--- a/porter_lightweight/pom.xml
+++ b/porter_lightweight/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
<packaging>pom</packaging>
<properties>
@@ -62,6 +62,23 @@
<groupId>org.apache.servicecomb</groupId>
<artifactId>solution-basic</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicecomb</groupId>
+ <artifactId>registry-service-center</artifactId>
+ </dependency>
+ <!-- using log4j2 -->
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
</dependencies>
<modules>
diff --git a/porter_lightweight/user-service/pom.xml
b/porter_lightweight/user-service/pom.xml
index 0fbfe6a..944173a 100644
--- a/porter_lightweight/user-service/pom.xml
+++ b/porter_lightweight/user-service/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicecomb.samples.porter</groupId>
<artifactId>porter-application</artifactId>
- <version>2.0.0</version>
+ <version>2.1.2</version>
</parent>
<artifactId>porter-user-service</artifactId>
diff --git
a/porter_lightweight/user-service/src/main/resources/microservice.yaml
b/porter_lightweight/user-service/src/main/resources/microservice.yaml
index af37379..9af2b37 100644
--- a/porter_lightweight/user-service/src/main/resources/microservice.yaml
+++ b/porter_lightweight/user-service/src/main/resources/microservice.yaml
@@ -19,13 +19,12 @@
# override common configurations in common module
servicecomb-config-order: 10
-APPLICATION_ID: porter-application
-service_description:
- version: 0.0.1
- name: user-service
-
servicecomb:
service:
+ application: porter-application
+ name: user-service
+ version: 0.0.1
+
registry:
address: http://localhost:30100
instance:
diff --git a/porter_springboot/file-service/src/main/resources/application.yml
b/porter_springboot/file-service/src/main/resources/application.yml
index 72868ee..7d03d71 100644
--- a/porter_springboot/file-service/src/main/resources/application.yml
+++ b/porter_springboot/file-service/src/main/resources/application.yml
@@ -22,14 +22,11 @@ server:
# override common configurations in common module
servicecomb-config-order: 10
-APPLICATION_ID: porter-application
-
-service_description:
- version: 0.0.1
- name: file-service
-
servicecomb:
service:
+ application: porter-application
+ name: file-service
+ version: 0.0.1
registry:
address: http://localhost:30100
instance:
diff --git
a/porter_springboot/gateway-service/src/main/resources/application.yml
b/porter_springboot/gateway-service/src/main/resources/application.yml
index 1c305c5..5f10ff7 100644
--- a/porter_springboot/gateway-service/src/main/resources/application.yml
+++ b/porter_springboot/gateway-service/src/main/resources/application.yml
@@ -19,13 +19,11 @@
# override common configurations in common module
servicecomb-config-order: 100
-APPLICATION_ID: porter-application
-service_description:
- version: 0.0.1
- name: gateway-service
-
servicecomb:
service:
+ application: porter-application
+ name: gateway-service
+ version: 0.0.1
registry:
address: http://localhost:30100
instance:
diff --git a/porter_springboot/pom.xml b/porter_springboot/pom.xml
index 1257d6d..6c0d98a 100644
--- a/porter_springboot/pom.xml
+++ b/porter_springboot/pom.xml
@@ -27,7 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <servicecomb.version>2.1.1</servicecomb.version>
+ <servicecomb.version>2.1.2</servicecomb.version>
</properties>
<dependencyManagement>
@@ -47,7 +47,6 @@
<artifactId>mysql-connector-java</artifactId>
<version>5.1.46</version>
</dependency>
- <!-- need to compile lastest java-chassis code -->
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-dependencies</artifactId>
diff --git a/porter_springboot/user-service/src/main/resources/application.yml
b/porter_springboot/user-service/src/main/resources/application.yml
index e489c55..fbc0337 100644
--- a/porter_springboot/user-service/src/main/resources/application.yml
+++ b/porter_springboot/user-service/src/main/resources/application.yml
@@ -22,13 +22,11 @@ server:
# override common configurations in common module
servicecomb-config-order: 10
-APPLICATION_ID: porter-application
-service_description:
- version: 0.0.1
- name: user-service
-
servicecomb:
service:
+ application: porter-application
+ name: user-service
+ version: 0.0.1
registry:
address: http://localhost:30100
instance:
diff --git a/porter_springboot/website/src/main/resources/application.yml
b/porter_springboot/website/src/main/resources/application.yml
index 01d7218..f9228c7 100644
--- a/porter_springboot/website/src/main/resources/application.yml
+++ b/porter_springboot/website/src/main/resources/application.yml
@@ -3,13 +3,11 @@ server:
port: 9091
# servlet.path: /
-APPLICATION_ID: porter-application
-service_description:
- version: 0.0.1
- name: website
-
servicecomb:
service:
+ application: porter-application
+ name: website
+ version: 0.0.1
registry:
address: http://localhost:30100
instance:
