Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
f29fc4bc
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
Star
0
Fork
0
代码
文件
提交
分支
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,发现更多精彩内容 >>
未验证
提交
f29fc4bc
编写于
2月 08, 2020
作者:
wu-sheng
提交者:
GitHub
2月 08, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Set a shared submodule for e2e test project. (#4329)
上级
f676aece
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
105 addition
and
69 deletion
+105
-69
.gitmodules
.gitmodules
+2
-2
apm-sniffer/apm-agent-core/pom.xml
apm-sniffer/apm-agent-core/pom.xml
+0
-14
test/e2e/e2e-protocol/pom.xml
test/e2e/e2e-protocol/pom.xml
+98
-0
test/e2e/e2e-protocol/src/main/proto
test/e2e/e2e-protocol/src/main/proto
+1
-0
test/e2e/e2e-ttl/e2e-ttl-es/pom.xml
test/e2e/e2e-ttl/e2e-ttl-es/pom.xml
+3
-52
test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto
test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto
+0
-1
test/e2e/pom.xml
test/e2e/pom.xml
+1
-0
未找到文件。
.gitmodules
浏览文件 @
f29fc4bc
...
...
@@ -7,6 +7,6 @@
[submodule "skywalking-ui"]
path = skywalking-ui
url = https://github.com/apache/skywalking-rocketbot-ui.git
[submodule "test/e2e/e2e-
ttl/e2e-ttl-es
/src/main/proto"]
path = test/e2e/e2e-
ttl/e2e-ttl-es
/src/main/proto
[submodule "test/e2e/e2e-
protocol
/src/main/proto"]
path = test/e2e/e2e-
protocol
/src/main/proto
url = https://github.com/apache/skywalking-data-collect-protocol.git
apm-sniffer/apm-agent-core/pom.xml
浏览文件 @
f29fc4bc
...
...
@@ -33,8 +33,6 @@
<properties>
<project.build.sourceEncoding>
UTF-8
</project.build.sourceEncoding>
<jetty.version>
9.4.2.v20170220
</jetty.version>
<grpc.version>
1.26.0
</grpc.version>
<guava.version>
20.0
</guava.version>
<bytebuddy.version>
1.10.7
</bytebuddy.version>
<wiremock.version>
2.6.0
</wiremock.version>
...
...
@@ -77,18 +75,6 @@
<version>
${bytebuddy.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-server
</artifactId>
<version>
${jetty.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-servlet
</artifactId>
<version>
${jetty.version}
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
com.github.tomakehurst
</groupId>
<artifactId>
wiremock
</artifactId>
...
...
test/e2e/e2e-protocol/pom.xml
0 → 100644
浏览文件 @
f29fc4bc
<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one or more
~ contributor license agreements. See the NOTICE file distributed with
~ this work for additional information regarding copyright ownership.
~ The ASF licenses this file to You under the Apache License, Version 2.0
~ (the "License"); you may not use this file except in compliance with
~ the License. You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
apache-skywalking-e2e
</artifactId>
<groupId>
org.apache.skywalking
</groupId>
<version>
1.0.0
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
e2e-protocol
</artifactId>
<properties>
<grpc.version>
1.14.0
</grpc.version>
<os-maven-plugin.version>
1.5.0.Final
</os-maven-plugin.version>
<protobuf-maven-plugin.version>
0.5.0
</protobuf-maven-plugin.version>
</properties>
<dependencies>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-protobuf
</artifactId>
<version>
${grpc.version}
</version>
</dependency>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-stub
</artifactId>
<version>
${grpc.version}
</version>
</dependency>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-netty
</artifactId>
<version>
${grpc.version}
</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
kr.motd.maven
</groupId>
<artifactId>
os-maven-plugin
</artifactId>
<version>
${os-maven-plugin.version}
</version>
<executions>
<execution>
<phase>
initialize
</phase>
<goals>
<goal>
detect
</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>
org.xolstice.maven.plugins
</groupId>
<artifactId>
protobuf-maven-plugin
</artifactId>
<version>
${protobuf-maven-plugin.version}
</version>
<configuration>
<!--
The version of protoc must match protobuf-java. If you don't depend on
protobuf-java directly, you will be transitively depending on the
protobuf-java version that grpc depends on.
-->
<protocArtifact>
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>
grpc-java
</pluginId>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>
compile
</goal>
<goal>
compile-custom
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
proto
@
a2aaec53
Subproject commit a2aaec537073cd22ac62cec1b41d03ae9cf11124
test/e2e/e2e-ttl/e2e-ttl-es/pom.xml
浏览文件 @
f29fc4bc
...
...
@@ -44,38 +44,14 @@
<version>
${project.version}
</version>
</dependency>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-protobuf
</artifactId>
<version>
${grpc.version}
</version>
</dependency>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-stub
</artifactId>
<version>
${grpc.version}
</version>
</dependency>
<dependency>
<groupId>
io.grpc
</groupId>
<artifactId>
grpc-netty
</artifactId>
<version>
${grpc.version}
</version>
<scope>
provided
</scope>
<groupId>
org.apache.skywalking
</groupId>
<artifactId>
e2e-protocol
</artifactId>
<version>
${project.version}
</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
kr.motd.maven
</groupId>
<artifactId>
os-maven-plugin
</artifactId>
<version>
${os-maven-plugin.version}
</version>
<executions>
<execution>
<phase>
initialize
</phase>
<goals>
<goal>
detect
</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>
io.fabric8
</groupId>
<artifactId>
docker-maven-plugin
</artifactId>
...
...
@@ -162,31 +138,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>
org.xolstice.maven.plugins
</groupId>
<artifactId>
protobuf-maven-plugin
</artifactId>
<version>
${protobuf-maven-plugin.version}
</version>
<configuration>
<!--
The version of protoc must match protobuf-java. If you don't depend on
protobuf-java directly, you will be transitively depending on the
protobuf-java version that grpc depends on.
-->
<protocArtifact>
com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>
grpc-java
</pluginId>
<pluginArtifact>
io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
</pluginArtifact>
</configuration>
<executions>
<execution>
<goals>
<goal>
compile
</goal>
<goal>
compile-custom
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
...
...
proto
@
7b244ff7
比较
7b244ff7
...
7b244ff7
Subproject commit 7b244ff7ec350910295eee85633e02d92a6f6b1c
test/e2e/pom.xml
浏览文件 @
f29fc4bc
...
...
@@ -42,6 +42,7 @@
<module>
e2e-ttl
</module>
<module>
e2e-6.x-agent-7.x-oap-compatibility
</module>
<module>
e2e-profile
</module>
<module>
e2e-protocol
</module>
</modules>
<properties>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录