Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
9453c8c4
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
9453c8c4
编写于
1月 12, 2018
作者:
wu-sheng
提交者:
GitHub
1月 12, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into master-5.0
上级
b954a0b3
195cc2a6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
178 addition
and
47 deletion
+178
-47
apm-sniffer/apm-sdk-plugin/pom.xml
apm-sniffer/apm-sdk-plugin/pom.xml
+39
-3
ci-dependencies/ojdbc14-10.2.0.4.0.jar
ci-dependencies/ojdbc14-10.2.0.4.0.jar
+0
-0
ci-dependencies/resin-4.0.41.jar
ci-dependencies/resin-4.0.41.jar
+0
-0
docs/Supported-list.md
docs/Supported-list.md
+5
-3
docs/en/How-to-build.md
docs/en/How-to-build.md
+9
-1
pom.xml
pom.xml
+125
-40
未找到文件。
apm-sniffer/apm-sdk-plugin/pom.xml
浏览文件 @
9453c8c4
...
...
@@ -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>
ci-dependencies/ojdbc14-10.2.0.4.0.jar
已删除
100644 → 0
浏览文件 @
b954a0b3
文件已删除
ci-dependencies/resin-4.0.41.jar
已删除
100644 → 0
浏览文件 @
b954a0b3
文件已删除
docs/Supported-list.md
浏览文件 @
9453c8c4
...
...
@@ -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
docs/en/How-to-build.md
浏览文件 @
9453c8c4
...
...
@@ -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
pom.xml
浏览文件 @
9453c8c4
...
...
@@ -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>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录