Merge pull request #737 from michaelsembwever/mck/manually-download-apache-incompatible-dependencies
Remove OJDBC and resin artifacts from ci-dependencies driectory as they as not Apache license compatible
This commit is contained in:
mck
GitHub
commit
195cc2a6a1
|
|
@ -38,8 +38,6 @@
|
|||
<module>mongodb-3.x-plugin</module>
|
||||
<module>feign-default-http-9.x-plugin</module>
|
||||
<module>okhttp-3.x-plugin</module>
|
||||
<module>resin-3.x-plugin</module>
|
||||
<module>resin-4.x-plugin</module>
|
||||
<module>spring-plugins</module>
|
||||
<module>struts2-2.x-plugin</module>
|
||||
<module>nutz-plugins</module>
|
||||
|
|
@ -51,7 +49,6 @@
|
|||
<module>mysql-5.x-plugin</module>
|
||||
<module>h2-1.x-plugin</module>
|
||||
<module>postgresql-8.x-plugin</module>
|
||||
<module>oracle-10.x-plugin</module>
|
||||
<module>rocketMQ-4.x-plugin</module>
|
||||
<module>elastic-job-2.x-plugin</module>
|
||||
<module>mongodb-2.x-plugin</module>
|
||||
|
|
@ -202,4 +199,43 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<!-- ojdbc is not Apache license compatible, so it must be manually downloaded first -->
|
||||
<id>include-ojdbc</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>${basedir}/../../ci-dependencies/ojdbc14-10.2.0.4.0.jar</exists>
|
||||
</file>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>oracle-10.x-plugin</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<!-- resin-3 is not Apache license compatible, so it must be manually downloaded first -->
|
||||
<id>include-resin-3</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>${basedir}/../../ci-dependencies/resin-3.0.9.jar</exists>
|
||||
</file>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>resin-3.x-plugin</module>
|
||||
</modules>
|
||||
</profile>
|
||||
<profile>
|
||||
<!-- resin-4 is not Apache license compatible, so it must be manually downloaded first -->
|
||||
<id>include-resin-4</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>${basedir}/../../ci-dependencies/resin-4.0.41.jar</exists>
|
||||
</file>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>resin-4.x-plugin</module>
|
||||
</modules>
|
||||
</profile>
|
||||
</profiles>
|
||||
</project>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -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.
|
||||
|
|
@ -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**
|
||||
* `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
|
||||
|
|
|
|||
165
pom.xml
165
pom.xml
|
|
@ -130,46 +130,6 @@
|
|||
<workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>install-ojdbc</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=ojdbc14-10.2.0.4.0.jar</argument>
|
||||
<argument>-DgroupId=com.oracle</argument>
|
||||
<argument>-DartifactId=ojdbc14</argument>
|
||||
<argument>-Dversion=10.2.0.4.0</argument>
|
||||
<argument>-Dpackaging=jar</argument>
|
||||
</arguments>
|
||||
<workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>install-resin</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-4.0.41.jar</argument>
|
||||
<argument>-DgroupId=com.caucho</argument>
|
||||
<argument>-DartifactId=resin</argument>
|
||||
<argument>-Dversion=4.0.41</argument>
|
||||
<argument>-Dpackaging=jar</argument>
|
||||
</arguments>
|
||||
<workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>install-jmxri</id>
|
||||
<inherited>false</inherited>
|
||||
|
|
@ -318,4 +278,129 @@
|
|||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<!-- ojdbc is not Apache license compatible, so it must be manually downloaded first -->
|
||||
<id>install-ojdbc</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>${basedir}/ci-dependencies/ojdbc14-10.2.0.4.0.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-ojdbc</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=ojdbc14-10.2.0.4.0.jar</argument>
|
||||
<argument>-DgroupId=com.oracle</argument>
|
||||
<argument>-DartifactId=ojdbc14</argument>
|
||||
<argument>-Dversion=10.2.0.4.0</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 -->
|
||||
<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 -->
|
||||
<id>install-resin-4</id>
|
||||
<activation>
|
||||
<file>
|
||||
<exists>${basedir}/ci-dependencies/resin-4.0.41.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-4</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-4.0.41.jar</argument>
|
||||
<argument>-DgroupId=com.caucho</argument>
|
||||
<argument>-DartifactId=resin</argument>
|
||||
<argument>-Dversion=4.0.41</argument>
|
||||
<argument>-Dpackaging=jar</argument>
|
||||
</arguments>
|
||||
<workingDirectory>${project.basedir}/ci-dependencies</workingDirectory>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue