This is an automated email from the ASF dual-hosted git repository. wusheng pushed a commit to branch test-refactor in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 07cf2051672289ec7cd83850d397295285ca8a2d Author: Wu Sheng <[email protected]> AuthorDate: Sat Feb 8 21:04:15 2020 +0800 Set a shared submodule for e2e test project. --- .gitmodules | 4 +- apm-sniffer/apm-agent-core/pom.xml | 14 ----- test/e2e/e2e-protocol/pom.xml | 98 ++++++++++++++++++++++++++++++ test/e2e/e2e-protocol/src/main/proto | 1 + test/e2e/e2e-ttl/e2e-ttl-es/pom.xml | 55 +---------------- test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto | 1 - test/e2e/pom.xml | 1 + 7 files changed, 105 insertions(+), 69 deletions(-) diff --git a/.gitmodules b/.gitmodules index e0b0dd2..7a56fc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml index 2f154a5..386bead 100644 --- a/apm-sniffer/apm-agent-core/pom.xml +++ b/apm-sniffer/apm-agent-core/pom.xml @@ -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> @@ -78,18 +76,6 @@ <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> <version>${wiremock.version}</version> diff --git a/test/e2e/e2e-protocol/pom.xml b/test/e2e/e2e-protocol/pom.xml new file mode 100644 index 0000000..fec6948 --- /dev/null +++ b/test/e2e/e2e-protocol/pom.xml @@ -0,0 +1,98 @@ +<?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 diff --git a/test/e2e/e2e-protocol/src/main/proto b/test/e2e/e2e-protocol/src/main/proto new file mode 160000 index 0000000..a2aaec5 --- /dev/null +++ b/test/e2e/e2e-protocol/src/main/proto @@ -0,0 +1 @@ +Subproject commit a2aaec537073cd22ac62cec1b41d03ae9cf11124 diff --git a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml index 137f985..6b7765d 100644 --- a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml +++ b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml @@ -44,39 +44,15 @@ <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> <configuration> @@ -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> diff --git a/test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto b/test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto deleted file mode 160000 index 7b244ff..0000000 --- a/test/e2e/e2e-ttl/e2e-ttl-es/src/main/proto +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7b244ff7ec350910295eee85633e02d92a6f6b1c diff --git a/test/e2e/pom.xml b/test/e2e/pom.xml index 7f1f935..45c7757 100644 --- a/test/e2e/pom.xml +++ b/test/e2e/pom.xml @@ -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>
