From 422f130036ee28622436f43b053b50b6b53433b4 Mon Sep 17 00:00:00 2001 From: wusheng Date: Wed, 3 Feb 2016 11:18:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7JVM=E5=88=B01.7=202.?= =?UTF-8?q?=E5=9C=A8=E5=AE=A2=E6=88=B7=E7=AB=AFAPI=E4=B8=ADprovided?= =?UTF-8?q?=E4=BE=9D=E8=B5=96log4j2=EF=BC=8C=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E6=89=80=E9=9C=80=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 +++++++ skywalking-alarm/pom.xml | 4 ++-- skywalking-analysis/pom.xml | 4 ++-- skywalking-api/pom.xml | 18 ++++++++++++++++-- skywalking-log/log4j-1.x-plugin/pom.xml | 4 ++-- skywalking-log/log4j-2.x-plugin/pom.xml | 4 ++-- skywalking-log/pom.xml | 4 ++-- skywalking-protocol/pom.xml | 4 ++-- skywalking-sdk-plugin/dubbo-plugin/pom.xml | 4 ++-- .../httpclient-4.2.x-plugin/pom.xml | 4 ++-- .../httpclient-4.3.x-plugin/pom.xml | 4 ++-- skywalking-sdk-plugin/jdbc-plugin/pom.xml | 4 ++-- skywalking-sdk-plugin/pom.xml | 4 ++-- skywalking-sdk-plugin/spring-plugin/pom.xml | 4 ++-- skywalking-sdk-plugin/web-plugin/pom.xml | 4 ++-- skywalking-webui/pom.xml | 4 ++-- 16 files changed, 51 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 2643829e8..8a616b0dc 100644 --- a/README.md +++ b/README.md @@ -37,6 +37,7 @@ Mail: wu.sheng@foxmail.com # Quick Start ## 编译与部署 ### 部署第三方软件 +- JDK 1.7 - 安装zookeeper 3.4.6 - 安装apache hbase 1.1.2 - 安装mysql @@ -148,6 +149,12 @@ INSERT INTO `system_config` (`config_id`,`conf_key`,`conf_value`,`val_type`,`val ## 根据所需的监控点，引入maven依赖 暂不存在公网仓库，需要本地编译并发布 ```xml + + + org.apache.logging.log4j + log4j-core + 2.4.1 + com.ai.cloud diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml index ef378e190..41c3063bc 100644 --- a/skywalking-alarm/pom.xml +++ b/skywalking-alarm/pom.xml @@ -162,8 +162,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-analysis/pom.xml b/skywalking-analysis/pom.xml index 064db08a7..6dac489cb 100644 --- a/skywalking-analysis/pom.xml +++ b/skywalking-analysis/pom.xml @@ -67,8 +67,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-api/pom.xml b/skywalking-api/pom.xml index efd231662..fcf5ce51e 100644 --- a/skywalking-api/pom.xml +++ b/skywalking-api/pom.xml @@ -20,6 +20,13 @@ skywalking-protocol 1.0-SNAPSHOT + + + org.apache.logging.log4j + log4j-core + 2.4.1 + provided + com.jcraft @@ -42,6 +49,13 @@ compile + + org.osgi + org.osgi.core + 4.3.1 + provided + + log4j log4j @@ -87,8 +101,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-log/log4j-1.x-plugin/pom.xml b/skywalking-log/log4j-1.x-plugin/pom.xml index 6dd4b64d7..c8bdd966e 100644 --- a/skywalking-log/log4j-1.x-plugin/pom.xml +++ b/skywalking-log/log4j-1.x-plugin/pom.xml @@ -41,8 +41,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-log/log4j-2.x-plugin/pom.xml b/skywalking-log/log4j-2.x-plugin/pom.xml index a18e479d2..a1b1ac884 100644 --- a/skywalking-log/log4j-2.x-plugin/pom.xml +++ b/skywalking-log/log4j-2.x-plugin/pom.xml @@ -40,8 +40,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-log/pom.xml b/skywalking-log/pom.xml index 74a2bc7f2..7385babfa 100644 --- a/skywalking-log/pom.xml +++ b/skywalking-log/pom.xml @@ -34,8 +34,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-protocol/pom.xml b/skywalking-protocol/pom.xml index 7bb28ea1f..0fcfbd0c0 100644 --- a/skywalking-protocol/pom.xml +++ b/skywalking-protocol/pom.xml @@ -27,8 +27,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-sdk-plugin/dubbo-plugin/pom.xml index 1adf4e225..752835599 100644 --- a/skywalking-sdk-plugin/dubbo-plugin/pom.xml +++ b/skywalking-sdk-plugin/dubbo-plugin/pom.xml @@ -123,8 +123,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml index c909ebaf2..aec102bfe 100644 --- a/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml +++ b/skywalking-sdk-plugin/httpclient-4.2.x-plugin/pom.xml @@ -35,8 +35,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml index 253a9ca38..5784905ba 100644 --- a/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml +++ b/skywalking-sdk-plugin/httpclient-4.3.x-plugin/pom.xml @@ -40,8 +40,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/jdbc-plugin/pom.xml b/skywalking-sdk-plugin/jdbc-plugin/pom.xml index ece3dcddd..04ed251e3 100644 --- a/skywalking-sdk-plugin/jdbc-plugin/pom.xml +++ b/skywalking-sdk-plugin/jdbc-plugin/pom.xml @@ -36,8 +36,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/pom.xml b/skywalking-sdk-plugin/pom.xml index fffd93e23..7ff5b4bc7 100644 --- a/skywalking-sdk-plugin/pom.xml +++ b/skywalking-sdk-plugin/pom.xml @@ -36,8 +36,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/spring-plugin/pom.xml b/skywalking-sdk-plugin/spring-plugin/pom.xml index 42a0b26d6..ad5900add 100644 --- a/skywalking-sdk-plugin/spring-plugin/pom.xml +++ b/skywalking-sdk-plugin/spring-plugin/pom.xml @@ -80,8 +80,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-sdk-plugin/web-plugin/pom.xml b/skywalking-sdk-plugin/web-plugin/pom.xml index 8f305c6b2..c610d70ca 100644 --- a/skywalking-sdk-plugin/web-plugin/pom.xml +++ b/skywalking-sdk-plugin/web-plugin/pom.xml @@ -42,8 +42,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding} diff --git a/skywalking-webui/pom.xml b/skywalking-webui/pom.xml index e6209d612..cd1e9baf8 100644 --- a/skywalking-webui/pom.xml +++ b/skywalking-webui/pom.xml @@ -17,8 +17,8 @@ maven-compiler-plugin - 1.6 - 1.6 + 1.7 + 1.7 ${project.build.sourceEncoding}