升级对应版本

JThink · Nov 23, 2017 · f00a8d5 · f00a8d5
1 parent 0780dc9
commit f00a8d5
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -79,12 +79,12 @@
 
 ### dubbox
 
-由于使用dubbox，为了能够采集到dubbox里面的rpc数据，需要修改dubbox的源码，见我修改的dubbox项目：[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.2.0)，该项目主要实现了rpc跟踪的具体实现，需要单独打包。
+由于使用dubbox，为了能够采集到dubbox里面的rpc数据，需要修改dubbox的源码，见我修改的dubbox项目：[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.3.0)，该项目主要实现了rpc跟踪的具体实现，需要单独打包。
 
 ```shell
 git clone https://github.com/JThink/dubbox.git
 cd dubbox
-git checkout skyeye-trace-1.2.0
+git checkout skyeye-trace-1.3.0
 修改相关pom中的私服地址
 mvn clean install deploy -Dmaven.test.skip=true
 ```
@@ -532,7 +532,7 @@ nohup bin/skyeye-web &
 gradle或者pom中加入skyeye-client的依赖
 
 ``` xml
-compile "skyeye:skyeye-client-logback:1.2.0"
+compile "skyeye:skyeye-client-logback:1.3.0"
 ```
 ### 配置
 在logback.xml中加入一个kafkaAppender，并在properties中配置好相关的值，如下（rpc这个项目前支持none和dubbo，所以如果项目中有dubbo服务的配置成dubbo，没有dubbo服务的配置成none，以后会支持其他的rpc框架，如：thrift、spring cloud等）：
@@ -564,7 +564,7 @@ compile "skyeye:skyeye-client-logback:1.2.0"
 gradle或者pom中加入skyeye-client的依赖
 
 ``` xml
-compile "skyeye:skyeye-client-log4j:1.2.0"
+compile "skyeye:skyeye-client-log4j:1.3.0"
 ```
 ### 配置
 在log4j.xml中加入一个kafkaAppender，并在properties中配置好相关的值，如下（rpc这个项目前支持none和dubbo，所以如果项目中有dubbo服务的配置成dubbo，没有dubbo服务的配置成none，以后会支持其他的rpc框架，如：thrift、spring cloud等）：
@@ -593,7 +593,7 @@ compile "skyeye:skyeye-client-log4j:1.2.0"
 gradle或者pom中加入skyeye-client的依赖
 
 ``` xml
-compile "skyeye:skyeye-client-log4j2:1.2.0"
+compile "skyeye:skyeye-client-log4j2:1.3.0"
 ```
 
 ### 配置
@@ -620,11 +620,11 @@ compile "skyeye:skyeye-client-log4j2:1.2.0"
 ### log4j
 由于log4j本身的appender比较复杂难写，所以在稳定性和性能上没有logback支持得好，应用能使用logback请尽量使用logback
 ### rpc trace
-使用自己打包的dubbox（[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.2.0)），在soa中间件dubbox中封装了rpc的跟踪
+使用自己打包的dubbox（[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.3.0)），在soa中间件dubbox中封装了rpc的跟踪
 
 ``` shell
 compile "com.101tec:zkclient:0.10"
-compile ("com.alibaba:dubbo:2.8.4-skyeye-trace-1.2.0") {
+compile ("com.alibaba:dubbo:2.8.4-skyeye-trace-1.3.0") {
   exclude group: 'org.springframework', module: 'spring'
 }
 ```

diff --git a/skyeye-benchmark/dubbo-service/build.gradle b/skyeye-benchmark/dubbo-service/build.gradle
@@ -3,7 +3,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.2.0'
+  version = '1.3.0'
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
@@ -36,9 +36,9 @@ subprojects {
 
   ext {
     slf4jVersion = '1.7.25'
-    dubboVersion = '2.8.4-skyeye-trace-1.2.0'
-    dataVersion = '1.2.0'
-    clientVersion = '1.2.0'
+    dubboVersion = '2.8.4-skyeye-trace-1.3.0'
+    dataVersion = '1.3.0'
+    clientVersion = '1.3.0'
     zookeeperVerison = '3.4.6'
     zkClientVersion = '0.10'
   }

diff --git a/skyeye-benchmark/hi-log/build.gradle b/skyeye-benchmark/hi-log/build.gradle
@@ -3,7 +3,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.2.0'
+  version = '1.3.0'
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
@@ -35,7 +35,7 @@ subprojects {
   apply plugin: 'eclipse'
 
   ext {
-    clientVersion = '1.2.0'
+    clientVersion = '1.3.0'
   }
 
   [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

diff --git a/skyeye-benchmark/log-generater/build.gradle b/skyeye-benchmark/log-generater/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'log-generater'
-version = '1.2.0'
+version = '1.3.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -21,7 +21,7 @@ repositories {
 }
 
 ext {
-  clientVersion = '1.2.0'
+  clientVersion = '1.3.0'
 }
 
 dependencies {

diff --git a/skyeye-benchmark/spring-cloud-service/build.gradle b/skyeye-benchmark/spring-cloud-service/build.gradle
@@ -3,7 +3,7 @@ allprojects {
   apply plugin: 'eclipse'
 
   group = 'skyeye'
-  version = '1.2.0'
+  version = '1.3.0'
   sourceCompatibility = 1.8
   targetCompatibility = 1.8
   compileJava.options.encoding = 'UTF-8'
@@ -35,7 +35,7 @@ subprojects {
   apply plugin: 'eclipse'
 
   ext {
-    clientVersion = '1.2.0'
+    clientVersion = '1.3.0'
   }
 
   [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

diff --git a/skyeye-client/README.md b/skyeye-client/README.md
@@ -11,7 +11,7 @@
 gradle或者pom中加入skyeye-client的依赖
 
 ``` xml
-compile "skyeye:skyeye-client-logback:1.2.0"
+compile "skyeye:skyeye-client-logback:1.3.0"
 ```
 ### 配置
 在logback.xml中加入一个kafkaAppender，并在properties中配置好相关的值，如下（rpc这个项目前支持none和dubbo，所以如果项目中有dubbo服务的配置成dubbo，没有dubbo服务的配置成none，以后会支持其他的rpc框架，如：thrift、spring cloud等）：
@@ -43,7 +43,7 @@ compile "skyeye:skyeye-client-logback:1.2.0"
 gradle或者pom中加入skyeye-client的依赖
 
 ``` xml
-compile "skyeye:skyeye-client-log4j:1.2.0"
+compile "skyeye:skyeye-client-log4j:1.3.0"
 ```
 ### 配置
 在log4j.xml中加入一个kafkaAppender，并在properties中配置好相关的值，如下（rpc这个项目前支持none和dubbo，所以如果项目中有dubbo服务的配置成dubbo，没有dubbo服务的配置成none，以后会支持其他的rpc框架，如：thrift、spring cloud等）：
@@ -72,7 +72,7 @@ compile "skyeye:skyeye-client-log4j:1.2.0"
 gradle或者pom中加入skyeye-client的依赖
 
 ``` xml
-compile "skyeye:skyeye-client-log4j2:1.2.0"
+compile "skyeye:skyeye-client-log4j2:1.3.0"
 ```
 
 ### 配置
@@ -99,11 +99,11 @@ compile "skyeye:skyeye-client-log4j2:1.2.0"
 ### log4j
 由于log4j本身的appender比较复杂难写，所以在稳定性和性能上没有logback支持得好，应用能使用logback请尽量使用logback
 ### rpc trace
-使用自己打包的dubbox（[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.2.0)），在soa中间件dubbox中封装了rpc的跟踪
+使用自己打包的dubbox（[dubbox](https://github.com/JThink/dubbox/tree/skyeye-trace-1.3.0)），在soa中间件dubbox中封装了rpc的跟踪
 
 ``` shell
 compile "com.101tec:zkclient:0.10"
-compile ("com.alibaba:dubbo:2.8.4-skyeye-trace-1.2.0") {
+compile ("com.alibaba:dubbo:2.8.4-skyeye-trace-1.3.0") {
   exclude group: 'org.springframework', module: 'spring'
 }
 ```

diff --git a/skyeye-statistics/build.gradle b/skyeye-statistics/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'application'
 
 group = 'skyeye'
 applicationName = 'skyeye-statistics'
-version = '1.2.0'
+version = '1.3.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -27,7 +27,7 @@ ext {
   scalaVersion = '2.10.4'
   scalaBinaryVersion = '2.10'
   sparkVersion = '1.3.0-cdh5.4.0'
-  baseVersion = '1.2.0'
+  baseVersion = '1.3.0'
   fastjsonVersion = '1.2.35'
   zkClientVersion = '0.10'
 }

diff --git a/skyeye-statistics/pom.xml b/skyeye-statistics/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>skyeye</groupId>
   <artifactId>skyeye-statistics</artifactId>
-  <version>1.2.0</version>
+  <version>1.3.0</version>
   <packaging>jar</packaging>
   <url>http://maven.apache.org</url>
 
@@ -14,15 +14,15 @@
     <java.version>1.8</java.version>
     <scala.version>2.10.4</scala.version>
     <scala.binary.version>2.10</scala.binary.version>
-    <spark.version>1.3.0-cdh5.4.0</spark.version>
-    <base.version>1.2.0</base.version>
+    <spark.version>1.3.0-cdh5.4.4</spark.version>
+    <base.version>1.3.0</base.version>
     <fastjson.version>1.2.35</fastjson.version>
   </properties>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>1.5.4.RELEASE</version>
+    <version>1.5.6.RELEASE</version>
     <relativePath />
   </parent>