From 6ce5bfd5690a812dc797aa372412d6d437cf6866 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 10:24:21 +0800 Subject: [PATCH 1/9] Make ci works with resin and ojdbc again. Try to build. --- .travis.yml | 12 ++-- apm-sniffer/apm-sdk-plugin/pom.xml | 94 ++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 540b9e8f0..c227d0a64 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,14 @@ sudo: required -services: - - docker - language: java +before_install: + - cd ci-dependencies + - curl -O https://openskywalking.github.io/skywalking-ci-assist/jar/ojdbc14-10.2.0.4.0.jar + - curl -O https://openskywalking.github.io/skywalking-ci-assist/jar/resin-3.0.9.jar + - curl -O https://openskywalking.github.io/skywalking-ci-assist/jar/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/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 0bba88f18..82262e948 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -212,6 +212,38 @@ oracle-10.x-plugin + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + install-ojdbc + false + process-resources + + exec + + + mvn + + install:install-file + -Dfile=ojdbc14-10.2.0.4.0.jar + -DgroupId=com.oracle + -DartifactId=ojdbc14 + -Dversion=10.2.0.4.0 + -Dpackaging=jar + + ${project.basedir}/ci-dependencies + + + + + + @@ -224,6 +256,37 @@ resin-3.x-plugin + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + install-ojdbc + false + process-resources + + exec + + + mvn + + install:install-file + -Dfile=resin-3.0.9.jar + -DgroupId=com.caucho + -DartifactId=resin + -Dversion=4.0.41 + -Dpackaging=jar + + ${project.basedir}/ci-dependencies + + + + + + @@ -236,6 +299,37 @@ resin-4.x-plugin + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + install-ojdbc + false + process-resources + + exec + + + mvn + + install:install-file + -Dfile=resin-4.0.41.jar + -DgroupId=com.caucho + -DartifactId=resin + -Dversion=4.0.41 + -Dpackaging=jar + + ${project.basedir}/ci-dependencies + + + + + + From 973718d94ec5f3fac9496e303aef310ce0ffd370 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 10:31:24 +0800 Subject: [PATCH 2/9] Adjust dir path. --- apm-sniffer/apm-sdk-plugin/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 82262e948..660fa1514 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -237,7 +237,7 @@ -Dversion=10.2.0.4.0 -Dpackaging=jar - ${project.basedir}/ci-dependencies + ${basedir}/../../ci-dependencies @@ -280,7 +280,7 @@ -Dversion=4.0.41 -Dpackaging=jar - ${project.basedir}/ci-dependencies + ${basedir}/../../ci-dependencies @@ -323,7 +323,7 @@ -Dversion=4.0.41 -Dpackaging=jar - ${project.basedir}/ci-dependencies + ${basedir}/../../ci-dependencies From 7b505549dbac15c7fc6d475a4a0c40b039a82e3a Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 10:41:23 +0800 Subject: [PATCH 3/9] Fix wrong url. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c227d0a64..ef09e4a44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ sudo: required language: java before_install: - cd ci-dependencies - - curl -O https://openskywalking.github.io/skywalking-ci-assist/jar/ojdbc14-10.2.0.4.0.jar - - curl -O https://openskywalking.github.io/skywalking-ci-assist/jar/resin-3.0.9.jar - - curl -O https://openskywalking.github.io/skywalking-ci-assist/jar/resin-4.0.41.jar + - 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-3.0.9.jar + - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/resin-4.0.41.jar - cd .. install: From 79579ba85ad0a4556084d066f57bc7ee49530fe5 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 12:01:45 +0800 Subject: [PATCH 4/9] Use maven repository resin 3 dependencies. --- apm-sniffer/apm-sdk-plugin/pom.xml | 31 ------------------------------ 1 file changed, 31 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 660fa1514..1ae9e03dd 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -256,37 +256,6 @@ resin-3.x-plugin - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - install-ojdbc - false - process-resources - - exec - - - mvn - - install:install-file - -Dfile=resin-3.0.9.jar - -DgroupId=com.caucho - -DartifactId=resin - -Dversion=4.0.41 - -Dpackaging=jar - - ${basedir}/../../ci-dependencies - - - - - - From 4a01c08dc45eb6066a55c14b5f6d07d7e95530c7 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 14:22:01 +0800 Subject: [PATCH 5/9] Remove an install. --- apm-sniffer/apm-sdk-plugin/pom.xml | 63 ------------------------------ pom.xml | 32 +-------------- 2 files changed, 1 insertion(+), 94 deletions(-) diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 1ae9e03dd..0bba88f18 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -212,38 +212,6 @@ oracle-10.x-plugin - - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - install-ojdbc - false - process-resources - - exec - - - mvn - - install:install-file - -Dfile=ojdbc14-10.2.0.4.0.jar - -DgroupId=com.oracle - -DartifactId=ojdbc14 - -Dversion=10.2.0.4.0 - -Dpackaging=jar - - ${basedir}/../../ci-dependencies - - - - - - @@ -268,37 +236,6 @@ resin-4.x-plugin - - - - org.codehaus.mojo - exec-maven-plugin - 1.6.0 - - - install-ojdbc - false - process-resources - - exec - - - mvn - - install:install-file - -Dfile=resin-4.0.41.jar - -DgroupId=com.caucho - -DartifactId=resin - -Dversion=4.0.41 - -Dpackaging=jar - - ${basedir}/../../ci-dependencies - - - - - - diff --git a/pom.xml b/pom.xml index 3b60d2e26..c74621824 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 - - - - - - From 3cd03a720a7319dead5725c4f6a1072dff47970d Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 14:56:34 +0800 Subject: [PATCH 6/9] Add Chinese document about building resin and ojdbc plugins. --- docs/README_ZH.md | 2 +- docs/cn/How-to-build-CN.md | 8 ++++++++ pom.xml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/README_ZH.md b/docs/README_ZH.md index 1db771371..8b612efc1 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 8159b1746..07ce42936 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 c74621824..4c88357c5 100644 --- a/pom.xml +++ b/pom.xml @@ -323,7 +323,7 @@ - + install-resin-3 From fdf4a6ea40165991c6d11c6f1d14aa72f6ed8e90 Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 15:01:48 +0800 Subject: [PATCH 7/9] Fix typo. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c88357c5..83985a493 100644 --- a/pom.xml +++ b/pom.xml @@ -323,7 +323,7 @@ - + install-resin-3 From 5da5d059dd0759debe2029cbd1ee2f30bc78efda Mon Sep 17 00:00:00 2001 From: wu-sheng Date: Fri, 12 Jan 2018 16:03:19 +0800 Subject: [PATCH 8/9] Rmove a download. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ef09e4a44..031635c67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,6 @@ 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-3.0.9.jar - curl -O https://openskywalking.github.io/skywalking-ci-assist/jars/resin-4.0.41.jar - cd .. From 18a83ce414e17c97e2bf99751fc1b9359b5e9b5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Sun, 14 Jan 2018 10:07:06 +0800 Subject: [PATCH 9/9] Update NOTICE.txt Update year to 2018 --- NOTICE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NOTICE.txt b/NOTICE.txt index 241f32e67..36ebf1d03 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/).