Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[maven-release-plugin] prepare release v6.0.0-alpha
Browse files Browse the repository at this point in the history
wu-sheng committed Nov 4, 2018
1 parent 4441426 commit 14009ce
Showing 105 changed files with 160 additions and 241 deletions.
2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-log4j-1.x/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-log4j-2.x/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-logback-1.x/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-opentracing/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-application-toolkit/apm-toolkit-trace/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-application-toolkit/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-application-toolkit</artifactId>
6 changes: 5 additions & 1 deletion apm-checkstyle/pom.xml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@

<groupId>org.apache.skywalking</groupId>
<artifactId>apm-checkstyle</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
<description>Module to hold Checkstyle for SkyWalking.</description>

<properties>
@@ -64,4 +64,8 @@
</plugin>
</plugins>
</build>

<scm>
<tag>v6.0.0-alpha</tag>
</scm>
</project>
2 changes: 1 addition & 1 deletion apm-commons/apm-datacarrier/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-commons/apm-util/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm-commons</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-commons/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

13 changes: 4 additions & 9 deletions apm-dist/pom.xml
Original file line number Diff line number Diff line change
@@ -17,12 +17,11 @@
~
-->

<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</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

@@ -82,12 +81,8 @@
</goals>
<configuration>
<tasks>
<copy file="${project.build.directory}/apache-skywalking-apm-incubating.tar.gz"
tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating.tar.gz"
overwrite="true"/>
<copy file="${project.build.directory}/apache-skywalking-apm-incubating.zip"
tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating.zip"
overwrite="true"/>
<copy file="${project.build.directory}/apache-skywalking-apm-incubating.tar.gz" tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating.tar.gz" overwrite="true" />
<copy file="${project.build.directory}/apache-skywalking-apm-incubating.zip" tofile="${project.basedir}/../dist/apache-skywalking-apm-incubating.zip" overwrite="true" />
</tasks>
</configuration>
</execution>
2 changes: 1 addition & 1 deletion apm-protocol/apm-network/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-protocol</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-protocol/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

34 changes: 12 additions & 22 deletions apm-sniffer/apm-agent-core/pom.xml
Original file line number Diff line number Diff line change
@@ -16,14 +16,13 @@
~
-->

<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>apm-agent-core</artifactId>
@@ -214,8 +213,7 @@
</filter>
</filters>
<transformers>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
</transformers>
</configuration>
</execution>
@@ -231,7 +229,7 @@
</goals>
<configuration>
<tasks>
<delete dir="${project.basedir}/../../packages"/>
<delete dir="${project.basedir}/../../packages" />
</tasks>
</configuration>
</execution>
@@ -240,22 +238,14 @@
<phase>package</phase>
<configuration>
<target>
<echo message="unjar"/>
<unzip src="${project.build.directory}/${artifactId}-${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"/>
<echo message="unjar" />
<unzip src="${project.build.directory}/${artifactId}-${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" />
</target>
</configuration>
<goals>
2 changes: 1 addition & 1 deletion apm-sniffer/apm-agent/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sniffer</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>apm-agent</artifactId>
2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/activemq-5.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/dubbo-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/elastic-job-2.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6 changes: 2 additions & 4 deletions apm-sniffer/apm-sdk-plugin/elasticsearch-5.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -16,13 +16,11 @@
~ 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">
<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>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/grpc-1.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>apm-grpc-1.x-plugin</artifactId>
2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/h2-1.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/httpClient-4.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>apm-httpClient-4.x-plugin</artifactId>
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>apm-httpasyncclient-4.x-plugin</artifactId>
6 changes: 2 additions & 4 deletions apm-sniffer/apm-sdk-plugin/hystrix-1.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -17,13 +17,11 @@
~
-->

<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>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/jdbc-commons/pom.xml
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/jedis-2.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>apm-jedis-2.x-plugin</artifactId>
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@
<parent>
<artifactId>jetty-plugins</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/jetty-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.skywalking</groupId>
<artifactId>apm-sdk-plugin</artifactId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>

<artifactId>jetty-plugins</artifactId>
2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/kafka-v1-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2 changes: 1 addition & 1 deletion apm-sniffer/apm-sdk-plugin/mongodb-2.x-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
<version>6.0.0-alpha-SNAPSHOT</version>
<version>6.0.0-alpha</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Loading

0 comments on commit 14009ce

Please sign in to comment.