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/incubator-servicecomb-java-chassis.git
commit d2654a42c577d0e18ada1c476f373c43b4254938
Author: laijianbin <laijian...@huawei.com>
AuthorDate: Fri Feb 2 09:48:10 2018 +0800
[SCB-325] report sdk version when register to SC
---
.../servicecomb/demo/springmvc/client/SpringmvcClient.java | 3 ---
.../foundation/common/base/ServiceCombConstants.java | 2 --
pom.xml | 12 ++++++++++++
.../serviceregistry/api/registry/MicroserviceFactory.java | 3 +--
4 files changed, 13 insertions(+), 7 deletions(-)
diff --git
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
index 71f885f..f2fc0d7 100644
---
a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
+++
b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringmvcClient.java
@@ -19,15 +19,12 @@ package org.apache.servicecomb.demo.springmvc.client;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
-
import org.apache.servicecomb.core.CseContext;
import org.apache.servicecomb.demo.DemoConst;
import org.apache.servicecomb.demo.TestMgr;
import org.apache.servicecomb.demo.controller.Controller;
import org.apache.servicecomb.demo.controller.Person;
import org.apache.servicecomb.foundation.common.utils.BeanUtils;
-import org.apache.servicecomb.foundation.common.utils.JsonUtils;
import org.apache.servicecomb.foundation.common.utils.Log4jUtils;
import org.apache.servicecomb.metrics.common.MetricsDimension;
import org.apache.servicecomb.metrics.common.MetricsPublisher;
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
index 547c172..e6613fa 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/base/ServiceCombConstants.java
@@ -59,8 +59,6 @@ public interface ServiceCombConstants {
String CONFIG_FRAMEWORK_DEFAULT_NAME = "servicecomb-java-chassis";
- String CONFIG_FRAMEWORK_DEFAULT_VERSION = "";
-
String CONFIG_DEFAULT_REGISTER_BY = "SDK";
}
diff --git a/pom.xml b/pom.xml
index 51412e5..51090e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,18 @@
</jacocoReports>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java
index fad8bf9..fc33e6f 100644
---
a/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java
+++
b/service-registry/src/main/java/org/apache/servicecomb/serviceregistry/api/registry/MicroserviceFactory.java
@@ -19,7 +19,6 @@ package org.apache.servicecomb.serviceregistry.api.registry;
import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_APPLICATION_ID_KEY;
import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_DEFAULT_REGISTER_BY;
import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_FRAMEWORK_DEFAULT_NAME;
-import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_FRAMEWORK_DEFAULT_VERSION;
import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_QUALIFIED_MICROSERVICE_DESCRIPTION_KEY;
import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_QUALIFIED_MICROSERVICE_NAME_KEY;
import static
org.apache.servicecomb.foundation.common.base.ServiceCombConstants.CONFIG_QUALIFIED_MICROSERVICE_ROLE_KEY;
@@ -71,7 +70,7 @@ public class MicroserviceFactory {
// use default values, we can add configure item in future.
Framework framework = new Framework();
framework.setName(CONFIG_FRAMEWORK_DEFAULT_NAME);
- framework.setVersion(CONFIG_FRAMEWORK_DEFAULT_VERSION);
+
framework.setVersion(MicroserviceFactory.class.getPackage().getImplementationVersion());
microservice.setFramework(framework);
microservice.setRegisterBy(CONFIG_DEFAULT_REGISTER_BY);
--
To stop receiving notification emails like this one, please contact
liu...@apache.org.
