Skip to content

Commit f29fc4b

Browse files
wu-shengwu-sheng
authored
Set a shared submodule for e2e test project. (#4329)
1 parent f676aec commit f29fc4b

7 files changed

Lines changed: 105 additions & 69 deletions

File tree

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
[submodule "skywalking-ui"]
88
path = skywalking-ui
99
url = https://github.com/apache/skywalking-rocketbot-ui.git
10-
[submodule "test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto"]
11-
path = test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto
10+
[submodule "test/e2e/e2e-protocol/src/main/proto"]
11+
path = test/e2e/e2e-protocol/src/main/proto
1212
url = https://github.com/apache/skywalking-data-collect-protocol.git

‎apm-sniffer/apm-agent-core/pom.xml‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
<properties>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<jetty.version>9.4.2.v20170220</jetty.version>
37-
<grpc.version>1.26.0</grpc.version>
3836
<guava.version>20.0</guava.version>
3937
<bytebuddy.version>1.10.7</bytebuddy.version>
4038
<wiremock.version>2.6.0</wiremock.version>
@@ -77,18 +75,6 @@
7775
<version>${bytebuddy.version}</version>
7876
<scope>test</scope>
7977
</dependency>
80-
<dependency>
81-
<groupId>org.eclipse.jetty</groupId>
82-
<artifactId>jetty-server</artifactId>
83-
<version>${jetty.version}</version>
84-
<scope>test</scope>
85-
</dependency>
86-
<dependency>
87-
<groupId>org.eclipse.jetty</groupId>
88-
<artifactId>jetty-servlet</artifactId>
89-
<version>${jetty.version}</version>
90-
<scope>test</scope>
91-
</dependency>
9278
<dependency>
9379
<groupId>com.github.tomakehurst</groupId>
9480
<artifactId>wiremock</artifactId>

‎test/e2e/e2e-protocol/pom.xml‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one or more
4+
~ contributor license agreements. See the NOTICE file distributed with
5+
~ this work for additional information regarding copyright ownership.
6+
~ The ASF licenses this file to You under the Apache License, Version 2.0
7+
~ (the "License"); you may not use this file except in compliance with
8+
~ the License. You may obtain a copy of the License at
9+
~
10+
~ http://www.apache.org/licenses/LICENSE-2.0
11+
~
12+
~ Unless required by applicable law or agreed to in writing, software
13+
~ distributed under the License is distributed on an "AS IS" BASIS,
14+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
~ See the License for the specific language governing permissions and
16+
~ limitations under the License.
17+
~
18+
-->
19+
20+
<project xmlns="http://maven.apache.org/POM/4.0.0"
21+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23+
<parent>
24+
<artifactId>apache-skywalking-e2e</artifactId>
25+
<groupId>org.apache.skywalking</groupId>
26+
<version>1.0.0</version>
27+
</parent>
28+
<modelVersion>4.0.0</modelVersion>
29+
30+
<artifactId>e2e-protocol</artifactId>
31+
32+
<properties>
33+
<grpc.version>1.14.0</grpc.version>
34+
<os-maven-plugin.version>1.5.0.Final</os-maven-plugin.version>
35+
<protobuf-maven-plugin.version>0.5.0</protobuf-maven-plugin.version>
36+
</properties>
37+
38+
<dependencies>
39+
<dependency>
40+
<groupId>io.grpc</groupId>
41+
<artifactId>grpc-protobuf</artifactId>
42+
<version>${grpc.version}</version>
43+
</dependency>
44+
<dependency>
45+
<groupId>io.grpc</groupId>
46+
<artifactId>grpc-stub</artifactId>
47+
<version>${grpc.version}</version>
48+
</dependency>
49+
<dependency>
50+
<groupId>io.grpc</groupId>
51+
<artifactId>grpc-netty</artifactId>
52+
<version>${grpc.version}</version>
53+
</dependency>
54+
</dependencies>
55+
56+
<build>
57+
<plugins>
58+
<plugin>
59+
<groupId>kr.motd.maven</groupId>
60+
<artifactId>os-maven-plugin</artifactId>
61+
<version>${os-maven-plugin.version}</version>
62+
<executions>
63+
<execution>
64+
<phase>initialize</phase>
65+
<goals>
66+
<goal>detect</goal>
67+
</goals>
68+
</execution>
69+
</executions>
70+
</plugin>
71+
<plugin>
72+
<groupId>org.xolstice.maven.plugins</groupId>
73+
<artifactId>protobuf-maven-plugin</artifactId>
74+
<version>${protobuf-maven-plugin.version}</version>
75+
<configuration>
76+
<!--
77+
The version of protoc must match protobuf-java. If you don't depend on
78+
protobuf-java directly, you will be transitively depending on the
79+
protobuf-java version that grpc depends on.
80+
-->
81+
<protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
82+
</protocArtifact>
83+
<pluginId>grpc-java</pluginId>
84+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
85+
</pluginArtifact>
86+
</configuration>
87+
<executions>
88+
<execution>
89+
<goals>
90+
<goal>compile</goal>
91+
<goal>compile-custom</goal>
92+
</goals>
93+
</execution>
94+
</executions>
95+
</plugin>
96+
</plugins>
97+
</build>
98+
</project>

‎test/e2e/e2e-protocol/src/main/proto‎

Submodule proto added at a2aaec5

‎test/e2e/e2e-ttl/e2e-ttl-es/pom.xml‎

Lines changed: 3 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -44,38 +44,14 @@
4444
<version>${project.version}</version>
4545
</dependency>
4646
<dependency>
47-
<groupId>io.grpc</groupId>
48-
<artifactId>grpc-protobuf</artifactId>
49-
<version>${grpc.version}</version>
50-
</dependency>
51-
<dependency>
52-
<groupId>io.grpc</groupId>
53-
<artifactId>grpc-stub</artifactId>
54-
<version>${grpc.version}</version>
55-
</dependency>
56-
<dependency>
57-
<groupId>io.grpc</groupId>
58-
<artifactId>grpc-netty</artifactId>
59-
<version>${grpc.version}</version>
60-
<scope>provided</scope>
47+
<groupId>org.apache.skywalking</groupId>
48+
<artifactId>e2e-protocol</artifactId>
49+
<version>${project.version}</version>
6150
</dependency>
6251
</dependencies>
6352

6453
<build>
6554
<plugins>
66-
<plugin>
67-
<groupId>kr.motd.maven</groupId>
68-
<artifactId>os-maven-plugin</artifactId>
69-
<version>${os-maven-plugin.version}</version>
70-
<executions>
71-
<execution>
72-
<phase>initialize</phase>
73-
<goals>
74-
<goal>detect</goal>
75-
</goals>
76-
</execution>
77-
</executions>
78-
</plugin>
7955
<plugin>
8056
<groupId>io.fabric8</groupId>
8157
<artifactId>docker-maven-plugin</artifactId>
@@ -162,31 +138,6 @@
162138
</execution>
163139
</executions>
164140
</plugin>
165-
<plugin>
166-
<groupId>org.xolstice.maven.plugins</groupId>
167-
<artifactId>protobuf-maven-plugin</artifactId>
168-
<version>${protobuf-maven-plugin.version}</version>
169-
<configuration>
170-
<!--
171-
The version of protoc must match protobuf-java. If you don't depend on
172-
protobuf-java directly, you will be transitively depending on the
173-
protobuf-java version that grpc depends on.
174-
-->
175-
<protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}
176-
</protocArtifact>
177-
<pluginId>grpc-java</pluginId>
178-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}
179-
</pluginArtifact>
180-
</configuration>
181-
<executions>
182-
<execution>
183-
<goals>
184-
<goal>compile</goal>
185-
<goal>compile-custom</goal>
186-
</goals>
187-
</execution>
188-
</executions>
189-
</plugin>
190141
</plugins>
191142
</build>
192143

‎test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎test/e2e/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<module>e2e-ttl</module>
4343
<module>e2e-6.x-agent-7.x-oap-compatibility</module>
4444
<module>e2e-profile</module>
45+
<module>e2e-protocol</module>
4546
</modules>
4647

4748
<properties>

0 commit comments

Comments
 (0)