You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by wu...@apache.org on 2018/04/25 04:16:21 UTC
[incubator-skywalking] branch hotfix/5.0.0-alpha updated: Update
pom.xml (#1040)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch hotfix/5.0.0-alpha
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/hotfix/5.0.0-alpha by this push:
new 700cb0b Update pom.xml (#1040)
700cb0b is described below
commit 700cb0b70c2e42c90b0b01f3c133292e2219b7d0
Author: 彭勇升 pengys <80...@qq.com>
AuthorDate: Sat Apr 7 13:59:57 2018 +0800
Update pom.xml (#1040)
* Update pom.xml
Add developer email address.
* Update pom.xml
* Update pom.xml
* Delete pom.xml.versionsBackup
* Delete pom.xml.versionsBackup
* Update pom.xml
* Delete pom.xml.versionsBackup
* Update pom.xml
---
.../apm-sdk-plugin/oracle-10.x-plugin/pom.xml | 2 +-
.../oracle-10.x-plugin/pom.xml.versionsBackup | 76 ----------------------
.../apm-sdk-plugin/resin-3.x-plugin/pom.xml | 2 +-
.../resin-3.x-plugin/pom.xml.versionsBackup | 75 ---------------------
.../apm-sdk-plugin/resin-4.x-plugin/pom.xml | 2 +-
.../resin-4.x-plugin/pom.xml.versionsBackup | 76 ----------------------
.../servicecomb-java-chassis-1.x-plugin/pom.xml | 2 +-
pom.xml | 1 +
8 files changed, 5 insertions(+), 231 deletions(-)
diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
index b8b2420..da58ddf 100755
--- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup
deleted file mode 100644
index 8efdb39..0000000
--- a/apm-sniffer/apm-sdk-plugin/oracle-10.x-plugin/pom.xml.versionsBackup
+++ /dev/null
@@ -1,76 +0,0 @@
-<!--
- ~ 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>apm-sdk-plugin</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>apm-oracle-10.x-plugin</artifactId>
- <packaging>jar</packaging>
-
- <name>oracle-10.x-plugin</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.oracle</groupId>
- <artifactId>ojdbc14</artifactId>
- <version>10.2.0.4.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.skywalking</groupId>
- <artifactId>apm-jdbc-commons</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- </plugin>
- <plugin>
- <!-- 源码插件 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <!-- 发布时自动将源码同时发布的配置 -->
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>none</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
index 775d97d..34b60bb 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>apm-resin-3.x-plugin</artifactId>
diff --git a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup
deleted file mode 100644
index b509193..0000000
--- a/apm-sniffer/apm-sdk-plugin/resin-3.x-plugin/pom.xml.versionsBackup
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>apm-sdk-plugin</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha</version>
- </parent>
-
- <artifactId>apm-resin-3.x-plugin</artifactId>
- <packaging>jar</packaging>
-
- <name>resin-3.x-plugin</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.caucho</groupId>
- <artifactId>resin</artifactId>
- <version>3.0.9</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <!-- 源码插件 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <!-- 发布时自动将源码同时发布的配置 -->
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>none</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
index 67aab6b..5579a44 100644
--- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>apm-sdk-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
</parent>
<artifactId>apm-resin-4.x-plugin</artifactId>
diff --git a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup b/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup
deleted file mode 100644
index 8ef5078..0000000
--- a/apm-sniffer/apm-sdk-plugin/resin-4.x-plugin/pom.xml.versionsBackup
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>apm-sdk-plugin</artifactId>
- <groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha</version>
- </parent>
-
- <artifactId>apm-resin-4.x-plugin</artifactId>
- <packaging>jar</packaging>
-
- <name>resin-4.x-plugin</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.caucho</groupId>
- <artifactId>resin</artifactId>
- <version>4.0.41</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <!-- 源码插件 -->
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <!-- 发布时自动将源码同时发布的配置 -->
- <executions>
- <execution>
- <id>attach-sources</id>
- <phase>none</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
index f7177f0..2ce4954 100644
--- a/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
+++ b/apm-sniffer/apm-sdk-plugin/servicecomb-plugin/servicecomb-java-chassis-1.x-plugin/pom.xml
@@ -23,7 +23,7 @@
<parent>
<artifactId>servicecomb-plugin</artifactId>
<groupId>org.apache.skywalking</groupId>
- <version>5.0.0-alpha-SNAPSHOT</version>
+ <version>5.0.0-beta-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 4648617..133ff99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,7 @@
</developer>
<developer>
<name>Peng Yongsheng</name>
+ <email>8082209@qq.com</email>
<url>https://github.com/peng-yongsheng</url>
<roles>
<role>PMC member</role>
--
To stop receiving notification emails like this one, please contact
wusheng@apache.org.