You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by GitBox <gi...@apache.org> on 2018/04/04 02:16:15 UTC
[GitHub] wu-sheng closed pull request #1027: Update the support version of ServiceComb
wu-sheng closed pull request #1027: Update the support version of ServiceComb
URL: https://github.com/apache/incubator-skywalking/pull/1027
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
index 5052f440b..8d63d27fd 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/pom.xml
@@ -31,11 +31,7 @@
<modules>
<module>servicecomb-java-chassis-0.x-plugin</module>
- <!-- TODO: remove this submodule because of SNAPSHOT dependency. -->
- <!-- After Apache ServiceComb released, we will put it back -->
- <!--
<module>servicecomb-java-chassis-1.x-plugin</module>
- -->
</modules>
<packaging>pom</packaging>
@@ -46,4 +42,4 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<sdk.plugin.related.dir>/..</sdk.plugin.related.dir>
</properties>
-</project>
\ No newline at end of file
+</project>
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
index fdc5747a7..f7177f042 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
@@ -38,23 +38,10 @@
<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>java-chassis-core</artifactId>
- <version>1.0.0-m1-SNAPSHOT</version>
+ <version>1.0.0-m1</version>
<scope>provided</scope>
</dependency>
</dependencies>
- <!-- TODO: need to delete -->
- <repositories>
- <repository>
- <id>apache-servicecomb</id>
- <url>
- https://repository.apache.org/content/repositories/snapshots
- </url>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
<build>
<plugins>
<plugin>
@@ -74,4 +61,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/docs/Supported-list.md b/docs/Supported-list.md
index e0db31239..46717ad0c 100644
--- a/docs/Supported-list.md
+++ b/docs/Supported-list.md
@@ -5,7 +5,7 @@
* [Spring Boot](https://github.com/spring-projects/spring-boot) Web 4.x
* Spring MVC 3.x, 4.x with servlet 3.x
* [Nutz Web Framework](https://github.com/nutzam/nutz) 1.x
- * [Struts2 MVC](http://struts.apache.org/) 2.3.x -> 2.5.x
+ * [Struts2 MVC](http://struts.apache.org/) 2.3.x -> 2.5.x
* [Resin](http://www.caucho.com/resin-4.0/) 3 (Optional¹)
* [Resin](http://www.caucho.com/resin-4.0/) 4 (Optional¹)
* [Jetty Server](http://www.eclipse.org/jetty/) 9
@@ -28,7 +28,7 @@
* [Dubbox](https://github.com/dangdangdotcom/dubbox) 2.8.4
* [Motan](https://github.com/weibocom/motan) 0.2.x -> 1.1.0
* [gRPC](https://github.com/grpc/grpc-java) 1.x
- * [Apache ServiceComb Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) 0.1 -> 0.5
+ * [Apache ServiceComb Java Chassis](https://github.com/apache/incubator-servicecomb-java-chassis) 0.1 -> 0.5,1.0.x
* MQ
* [RocketMQ](https://github.com/apache/rocketmq) 4.x
* [Kafka](http://kafka.apache.org) 0.11.0.0 -> 1.0
@@ -40,7 +40,7 @@
* [Spymemcached](https://github.com/couchbase/spymemcached) 2.x
* [Xmemcached](https://github.com/killme2008/xmemcached) 2.x
* Service Discovery
- * [Netflix Eureka](https://github.com/Netflix/eureka)
+ * [Netflix Eureka](https://github.com/Netflix/eureka)
* Spring Ecosystem
* Spring Bean annotations(@Bean, @Service, @Component, @Repository) 3.x and 4.x (Optional²)
* Spring Core Async SuccessCallback/FailureCallback/ListenableFutureCallback 4.x
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services