You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2019/12/29 05:49:37 UTC
[skywalking] branch master updated: Fix os maven plugin issues for
Eclipse m2e (#4144)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 4211eff Fix os maven plugin issues for Eclipse m2e (#4144)
4211eff is described below
commit 4211eff558498aabc86c4d443645de072666ebfc
Author: Gao Hongtao <ha...@gmail.com>
AuthorDate: Sun Dec 29 13:49:27 2019 +0800
Fix os maven plugin issues for Eclipse m2e (#4144)
* Fix mave-os plugin issues for Eclipse m2e
* Add os-msven-plugin.version property
---
apm-protocol/apm-network/pom.xml | 14 ++++++++++++++
apm-sniffer/apm-agent-core/pom.xml | 16 +++++++++++-----
.../grpc-configuration-sync/pom.xml | 18 ++++++++++++------
oap-server/server-core/pom.xml | 18 ++++++++++++------
.../server-receiver-plugin/receiver-proto/pom.xml | 13 +++++++++++++
pom.xml | 22 +++++++++++++++-------
test/e2e/e2e-ttl/e2e-ttl-es/pom.xml | 20 +++++++++++++-------
test/plugin/scenarios/grpc-scenario/pom.xml | 19 +++++++++++++------
8 files changed, 103 insertions(+), 37 deletions(-)
diff --git a/apm-protocol/apm-network/pom.xml b/apm-protocol/apm-network/pom.xml
index 5d0300a..3221a1d 100644
--- a/apm-protocol/apm-network/pom.xml
+++ b/apm-protocol/apm-network/pom.xml
@@ -58,6 +58,19 @@
<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>
@@ -75,6 +88,7 @@
</configuration>
<executions>
<execution>
+ <id>grpc-build</id>
<goals>
<goal>compile</goal>
<goal>compile-custom</goal>
diff --git a/apm-sniffer/apm-agent-core/pom.xml b/apm-sniffer/apm-agent-core/pom.xml
index ecc36f8..8640315 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -129,14 +129,20 @@
</dependencies>
</dependencyManagement>
<build>
- <extensions>
- <extension>
+ <plugins>
+ <plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
- <plugins>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>detect</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<artifactId>maven-shade-plugin</artifactId>
<executions>
diff --git a/oap-server/server-configuration/grpc-configuration-sync/pom.xml b/oap-server/server-configuration/grpc-configuration-sync/pom.xml
index 2babab1..f509510 100644
--- a/oap-server/server-configuration/grpc-configuration-sync/pom.xml
+++ b/oap-server/server-configuration/grpc-configuration-sync/pom.xml
@@ -58,14 +58,20 @@
</dependencies>
<build>
- <extensions>
- <extension>
+ <plugins>
+ <plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.4.1.Final</version>
- </extension>
- </extensions>
- <plugins>
+ <version>${os-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>detect</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
diff --git a/oap-server/server-core/pom.xml b/oap-server/server-core/pom.xml
index 4dbd74c..c6d7ae5 100644
--- a/oap-server/server-core/pom.xml
+++ b/oap-server/server-core/pom.xml
@@ -94,14 +94,20 @@
</dependencies>
<build>
- <extensions>
- <extension>
+ <plugins>
+ <plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.4.1.Final</version>
- </extension>
- </extensions>
- <plugins>
+ <version>${os-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>detect</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
diff --git a/oap-server/server-receiver-plugin/receiver-proto/pom.xml b/oap-server/server-receiver-plugin/receiver-proto/pom.xml
index 0b70012..e504e64 100644
--- a/oap-server/server-receiver-plugin/receiver-proto/pom.xml
+++ b/oap-server/server-receiver-plugin/receiver-proto/pom.xml
@@ -30,6 +30,19 @@
<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>
diff --git a/pom.xml b/pom.xml
index 91f6db3..5ae6c16 100755
--- a/pom.xml
+++ b/pom.xml
@@ -279,13 +279,6 @@
</dependencyManagement>
<build>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
<pluginManagement>
<plugins>
<!-- mvn -N io.takari:maven:wrapper -Dmaven=3.5.4 -->
@@ -347,6 +340,19 @@
</pluginManagement>
<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>
<artifactId>maven-enforcer-plugin</artifactId>
<version>${maven-enforcer-plugin.version}</version>
<executions>
@@ -384,6 +390,8 @@
<exclude>**/.project</exclude>
<exclude>**/.settings/**</exclude>
<exclude>**/dependency-reduced-pom.xml</exclude>
+ <exclude>**/.vscode/**</exclude>
+ <exclude>**/.factorypath</exclude>
<!-- UI IDE configs -->
<exclude>**/skywalking-ui/.editorconfig</exclude>
diff --git a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml
index 30b6b84..137f985 100644
--- a/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml
+++ b/test/e2e/e2e-ttl/e2e-ttl-es/pom.xml
@@ -64,6 +64,19 @@
<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>
@@ -175,13 +188,6 @@
</executions>
</plugin>
</plugins>
- <extensions>
- <extension>
- <groupId>kr.motd.maven</groupId>
- <artifactId>os-maven-plugin</artifactId>
- <version>${os-maven-plugin.version}</version>
- </extension>
- </extensions>
</build>
</project>
\ No newline at end of file
diff --git a/test/plugin/scenarios/grpc-scenario/pom.xml b/test/plugin/scenarios/grpc-scenario/pom.xml
index d6f8a13..a70cbcc 100644
--- a/test/plugin/scenarios/grpc-scenario/pom.xml
+++ b/test/plugin/scenarios/grpc-scenario/pom.xml
@@ -30,6 +30,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.version>1.8</compiler.version>
+ <os-maven-plugin.version>1.6.2</os-maven-plugin.version>
<test.framework.version>1.6.0</test.framework.version>
@@ -76,14 +77,20 @@
<build>
<finalName>grpc-scenario</finalName>
- <extensions>
- <extension>
+ <plugins>
+ <plugin>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.5.0.Final</version>
- </extension>
- </extensions>
- <plugins>
+ <version>${os-maven-plugin.version}</version>
+ <executions>
+ <execution>
+ <phase>initialize</phase>
+ <goals>
+ <goal>detect</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>