Merge branch 'master' into fixed/storage_bug

.travis.yml

 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

NOTICE.txt

 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/).

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相关介绍资料

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

pom.xml

@@ -323,43 +323,13 @@
         </profile>
         <profile>
             <!-- resin is not Apache license compatible, so it must be manually downloaded first -->
+            <!-- Use resin 3.x jar file as a beacon only -->
             <id>install-resin-3</id>
             <activation>
                 <file>
                     <exists>${basedir}/ci-dependencies/resin-3.0.9.jar</exists>
                 </file>
             </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>exec-maven-plugin</artifactId>
-                        <version>1.6.0</version>
-                        <executions>
-                            <execution>
-                                <id>install-resin-3</id>
-                                <inherited>false</inherited>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>exec</goal>
-                                </goals>
-                                <configuration>
-                                    <executable>mvn</executable>
-                                    <arguments>
-                                        <argument>install:install-file</argument>
-                                        <argument>-Dfile=resin-3.0.9.jar</argument>
-                                        <argument>-DgroupId=com.caucho</argument>
-                                        <argument>-DartifactId=resin</argument>
-                                        <argument>-Dversion=3.0.9</argument>
-                                        <argument>-Dpackaging=jar</argument>
-                                    </arguments>
-                                    <workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
         <profile>
             <!-- resin is not Apache license compatible, so it must be manually downloaded first -->