diff --git a/.travis.yml b/.travis.yml index 540b9e8f06d036516b3bb85fe963faa3219923ea..031635c6705d30db80f191e00d0b8e513ef46b07 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,13 @@ sudo: required -services: - - docker - language: java +before_install: + - cd ci-dependencies + - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/ojdbc14-10.2.0.4.0.jar + - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/resin-4.0.41.jar + - cd .. + install: - jdk_switcher use oraclejdk8 - mvn clean install --quiet jacoco:report coveralls:report -after_success: - - bash ./travis/push_image.sh diff --git a/NOTICE.txt b/NOTICE.txt index 241f32e673567d787042ecfdbc4cba0e3e68e3c0..36ebf1d03a703d36ff1739c5168924c791d290f3 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache SkyWalking -Copyright 2015-2017 The Apache Software Foundation +Copyright 2015-2018 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). diff --git a/docs/README_ZH.md b/docs/README_ZH.md index 1db771371b8e7a3257602346a3598d20872bfb6e..8b612efc16716106e51657a8ab774cb0fe9635e7 100644 --- a/docs/README_ZH.md +++ b/docs/README_ZH.md @@ -3,7 +3,7 @@ * [项目简介](/README_ZH.md) * [快速入门](cn/Quick-start-CN.md) - * [部署Collector镜像](cn/Deploy-docker-image.CN.md) + * [部署Collector镜像](cn/Deploy-docker-image-CN.md) * [中间件,框架与类库支持列表](Supported-list.md) * [如何关闭特定插件](cn/How-to-disable-plugin-CN.md) * APM相关介绍资料 diff --git a/docs/cn/How-to-build-CN.md b/docs/cn/How-to-build-CN.md index 8159b1746476dd10b1df43a2fea265350ad92531..07ce429368ee919cb3f48e0ea9d8369aa8a9b937 100644 --- a/docs/cn/How-to-build-CN.md +++ b/docs/cn/How-to-build-CN.md @@ -16,3 +16,11 @@ - **apm-protocol/apm-network/target/generated-sources/protobuf**目录下的`grpc-java`和`java`目录 - **apm-collector/apm-collector-remote/apm-remote-grpc-provider/target/protobuf**目录下的`grpc-java`和`java`目录 +## 编译Resin-3, Resin-4 和 Oracle JDBC 驱动插件 +为了遵守Apache关于协议(License)的相关要求,不符合Apache相关要求的类库所对应的Plugin不会自动编译。如需编译对应的插件, +需要手动下载驱动或类库,并将文件拷贝到`ci-dependencies/`中,运行`mvn package`进行编译。 + +`ci-dependencies/`下对应的类库文件名为: +* resin-3.0.9.jar +* resin-4.0.41.jar +* ojdbc14-10.2.0.4.0.jar \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3b60d2e26ed44e42b56338d050d46093e03b29c0..83985a4939a426a537623d5b454ff33b7c0440b1 100644 --- a/pom.xml +++ b/pom.xml @@ -323,43 +323,13 @@ + install-resin-3 ${basedir}/ci-dependencies/resin-3.0.9.jar - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - install-resin-3 - false - process-resources - - exec - - - mvn - - install:install-file - -Dfile=resin-3.0.9.jar - -DgroupId=com.caucho - -DartifactId=resin - -Dversion=3.0.9 - -Dpackaging=jar - - ${project.basedir}/ci-dependencies - - - - - -