This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch oal-deactive
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/oal-deactive by this push:
new a482eaf 1. Fixed the warning of 'parent.relativePath' points issue
when running the mvn package command. (#2404)
new 8e06ae0 Merge branch 'master' into oal-deactive
a482eaf is described below
commit a482eaf37fc96dca54646f4a4d5008b604bb5a35
Author: 彭勇升 pengys <8082...@qq.com>
AuthorDate: Tue Mar 26 20:10:12 2019 +0800
1. Fixed the warning of 'parent.relativePath' points issue when running the
mvn package command. (#2404)
2. Fixed the warning of duplicate declaration of plugin issue when running
the mvn package command.
3. Fixed the warning of duplicate declaration of mysql connector jar when
running the mvn package command, because of provided scope include test scope.
4. Fixed the warning of expression ${artifactId} is deprecated issue when
running the mvn package command.
5. Fixed the warning of expression ${version} is deprecated issue when
running the mvn package command.
---
apm-checkstyle/pom.xml | 1 +
apm-commons/apm-util/pom.xml | 3 ++-
apm-sniffer/apm-agent-core/pom.xml | 4 ++--
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml | 9 ++-------
apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml | 9 ++-------
apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml | 9 ++-------
oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml | 7 ++-----
pom.xml | 7 ++-----
8 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/apm-checkstyle/pom.xml b/apm-checkstyle/pom.xml
index 9015463..7b19433 100644
--- a/apm-checkstyle/pom.xml
+++ b/apm-checkstyle/pom.xml
@@ -22,6 +22,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>19</version>
+ <relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/apm-commons/apm-util/pom.xml b/apm-commons/apm-util/pom.xml
index 3aec7b6..7c0a175 100644
--- a/apm-commons/apm-util/pom.xml
+++ b/apm-commons/apm-util/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<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";>
+<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>apm-commons</artifactId>
<groupId>org.apache.skywalking</groupId>
diff --git a/apm-sniffer/apm-agent-core/pom.xml
b/apm-sniffer/apm-agent-core/pom.xml
index 5ee6327..5c68d0c 100644
--- a/apm-sniffer/apm-agent-core/pom.xml
+++ b/apm-sniffer/apm-agent-core/pom.xml
@@ -246,13 +246,13 @@
<configuration>
<target>
<echo message="unjar" />
- <unzip
src="${project.build.directory}/${artifactId}-${version}.jar"
dest="${project.build.directory}/unpacked/" />
+ <unzip
src="${project.build.directory}/${project.artifactId}-${project.version}.jar"
dest="${project.build.directory}/unpacked/" />
<echo message="rename service providers in
META-INF/services" />
<move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_osx_x86_64.jnilib"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_osx_x86_64.jnilib"
/>
<move
file="${project.build.directory}/unpacked/META-INF/native/libnetty_tcnative_linux_x86_64.so"
tofile="${project.build.directory}/unpacked/META-INF/native/liborg_apache_skywalking_apm_dependencies_netty_tcnative_linux_x86_64.so"
/>
<move
file="${project.build.directory}/unpacked/META-INF/native/netty_tcnative_windows_x86_64.dll"
tofile="${project.build.directory}/unpacked/META-INF/native/org_apache_skywalking_apm_dependencies_netty_tcnative_windows_x86_64.dll"
/>
<echo message="jar back" />
- <jar
destfile="${project.build.directory}/${artifactId}-${version}.jar"
basedir="${project.build.directory}/unpacked" />
+ <jar
destfile="${project.build.directory}/${project.artifactId}-${project.version}.jar"
basedir="${project.build.directory}/unpacked" />
</target>
</configuration>
<goals>
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
index ce50590..859dd36 100755
--- a/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<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";>
+<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>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
@@ -40,12 +41,6 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-connector-java.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml
index 639ce24..fe2220d 100755
--- a/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/mysql-6.x-plugin/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<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";>
+<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>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
@@ -40,12 +41,6 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-connector-java.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml
b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml
index ac8f4ef..611c63f 100755
--- a/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/mysql-8.x-plugin/pom.xml
@@ -16,7 +16,8 @@
~
-->
-<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";>
+<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>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
@@ -40,12 +41,6 @@
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql-connector-java.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql-connector-java.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml
b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml
index e6d571f..d2adbc1 100644
--- a/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml
+++ b/oap-server/server-receiver-plugin/zipkin-receiver-plugin/pom.xml
@@ -17,7 +17,8 @@
~
-->
-<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";>
+<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>server-receiver-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
@@ -47,9 +48,5 @@
<groupId>io.zipkin.zipkin2</groupId>
<artifactId>zipkin</artifactId>
</dependency>
- <dependency>
- <groupId>com.github.ben-manes.caffeine</groupId>
- <artifactId>caffeine</artifactId>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0c3ebb9..181f86f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,6 +29,7 @@
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>21</version>
+ <relativePath/>
</parent>
<modules>
@@ -217,6 +218,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
+ <version>${exec-maven-plugin.version}</version>
<executions>
<execution>
<id>git submodule update</id>
@@ -245,11 +247,6 @@
<version>${takari-maven-plugin.version}</version>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>${exec-maven-plugin.version}</version>
- </plugin>
- <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>${maven-antrun-plugin.version}</version>
</plugin>
