diff --git a/apm-sniffer/apm-sdk-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/pom.xml index 3a26042c5d..0bba88f186 100644 --- a/apm-sniffer/apm-sdk-plugin/pom.xml +++ b/apm-sniffer/apm-sdk-plugin/pom.xml @@ -38,8 +38,6 @@ mongodb-3.x-plugin feign-default-http-9.x-plugin okhttp-3.x-plugin - resin-3.x-plugin - resin-4.x-plugin spring-plugins struts2-2.x-plugin nutz-plugins @@ -51,7 +49,6 @@ mysql-5.x-plugin h2-1.x-plugin postgresql-8.x-plugin - oracle-10.x-plugin rocketMQ-4.x-plugin elastic-job-2.x-plugin mongodb-2.x-plugin @@ -202,4 +199,43 @@ + + + + + include-ojdbc + + + ${basedir}/../../ci-dependencies/ojdbc14-10.2.0.4.0.jar + + + + oracle-10.x-plugin + + + + + include-resin-3 + + + ${basedir}/../../ci-dependencies/resin-3.0.9.jar + + + + resin-3.x-plugin + + + + + include-resin-4 + + + ${basedir}/../../ci-dependencies/resin-4.0.41.jar + + + + resin-4.x-plugin + + + diff --git a/ci-dependencies/ojdbc14-10.2.0.4.0.jar b/ci-dependencies/ojdbc14-10.2.0.4.0.jar deleted file mode 100644 index f41cf1ae9f..0000000000 Binary files a/ci-dependencies/ojdbc14-10.2.0.4.0.jar and /dev/null differ diff --git a/ci-dependencies/resin-4.0.41.jar b/ci-dependencies/resin-4.0.41.jar deleted file mode 100644 index 9e04f4ce77..0000000000 Binary files a/ci-dependencies/resin-4.0.41.jar and /dev/null differ diff --git a/docs/Supported-list.md b/docs/Supported-list.md index 54b5744dc9..c4f84c5a44 100644 --- a/docs/Supported-list.md +++ b/docs/Supported-list.md @@ -5,8 +5,8 @@ * Spring MVC 3.x, 4.x with servlet 3.x * [Nutz Web Framework](https://github.com/nutzam/nutz) 1.x * [Struts2 MVC](http://struts.apache.org/) 2.3.x -> 2.5.x - * [Resin](http://www.caucho.com/resin-4.0/) 3 - * [Resin](http://www.caucho.com/resin-4.0/) 4 + * [Resin](http://www.caucho.com/resin-4.0/) 3 (Optional¹) + * [Resin](http://www.caucho.com/resin-4.0/) 4 (Optional¹) * [Jetty Server](http://www.eclipse.org/jetty/) 9 * HTTP Client * [Feign](https://github.com/OpenFeign/feign) 9.x @@ -17,7 +17,7 @@ * [Jetty Client](http://www.eclipse.org/jetty/) 9 * JDBC * Mysql Driver 5.x, 6.x - * Oracle Driver + * Oracle Driver (Optional¹) * H2 Driver * [Sharding-JDBC](https://github.com/shardingjdbc/sharding-jdbc) 1.5.x * PostgreSQL Driver 8.x, 9.x, 42.x @@ -44,3 +44,5 @@ * OpenTracing community supported * Motan * Hprose-java + +¹Required dependencies for these components must be first manually downloaded before being built, due to license incompatibilities. For this reason these components are not by default included in the SkyWalking releases. \ No newline at end of file diff --git a/docs/en/How-to-build.md b/docs/en/How-to-build.md index b21e504f85..c6ea808e80 100644 --- a/docs/en/How-to-build.md +++ b/docs/en/How-to-build.md @@ -11,4 +11,12 @@ This document helps people to compile and build the project in your maven and ID 1. Run `mvn compile -Dmaven.test.skip=true` to compile project and generate source codes. Because we use gRPC and protobuf. 1. Set **Generated Source Codes** folders. * `grpc-java` and `java` folders in **apm-protocol/apm-network/target/generated-sources/protobuf** - * `grpc-java` and `java` folders in **apm-collector/apm-collector-remote/apm-remote-grpc-provider/target/protobuf** \ No newline at end of file + * `grpc-java` and `java` folders in **apm-collector/apm-collector-remote/apm-remote-grpc-provider/target/protobuf** + +## Building Resin-3, Resin-4, and OJDBC sdk plugins +Due to license incompatibilities/restrictions these plugins under `apm-sniffer/apm-sdk-plugin/` are not built by default. +Download them manually into the `ci-dependencies/` directory and the plugins will be included in the maven reactor and built. +The names of the artifacts downloaded and placed in the `ci-dependencies/` directory must be exact: +* resin-3.0.9.jar +* resin-4.0.41.jar +* ojdbc14-10.2.0.4.0.jar diff --git a/pom.xml b/pom.xml index 371a47c6b8..3b60d2e26e 100644 --- a/pom.xml +++ b/pom.xml @@ -130,46 +130,6 @@ ${project.basedir}/ci-dependencies - - 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 - - - - install-resin - 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 - - install-jmxri false @@ -318,4 +278,129 @@ + + + + + + install-ojdbc + + + ${basedir}/ci-dependencies/ojdbc14-10.2.0.4.0.jar + + + + + + 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 + + + + + + + + + + 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 + + + + + + + + + + install-resin-4 + + + ${basedir}/ci-dependencies/resin-4.0.41.jar + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + install-resin-4 + 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 + + + + + + + + +