You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@skywalking.apache.org by pe...@apache.org on 2018/03/18 05:32:30 UTC
[incubator-skywalking] branch asf/5.0-alpha/release updated: Make
the git submodule command to be a maven profile plugin. Let this command
not execute by default install command.
This is an automated email from the ASF dual-hosted git repository.
pengys pushed a commit to branch asf/5.0-alpha/release
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/asf/5.0-alpha/release by this push:
new 6498428 Make the git submodule command to be a maven profile plugin. Let this command not execute by default install command.
new 126cbb3 Merge branch 'asf/5.0-alpha/release' of https://github.com/apache/incubator-skywalking into asf/5.0-alpha/release
6498428 is described below
commit 649842885d06e1788c1b69c9f8e48ccbf811ecde
Author: peng-yongsheng <80...@qq.com>
AuthorDate: Sun Mar 18 13:32:12 2018 +0800
Make the git submodule command to be a maven profile plugin. Let this command not execute by default install command.
---
.travis.yml | 2 +-
pom.xml | 51 ++++++++++++++++++++++++++++++++++-----------------
2 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8b2c7b1..af2a22f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,6 @@ before_install:
install:
- jdk_switcher use oraclejdk8
- - mvn clean install --quiet jacoco:report coveralls:report
+ - mvn clean install -Pasf-release --quiet jacoco:report coveralls:report
- mvn clean javadoc:javadoc -Dmaven.test.skip=true --quiet
diff --git a/pom.xml b/pom.xml
index 1275ca5..5f9aaae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,23 +150,6 @@
<version>1.6.0</version>
<executions>
<execution>
- <id>git submodule update</id>
- <phase>initialize</phase>
- <inherited>false</inherited>
- <configuration>
- <executable>git</executable>
- <arguments>
- <argument>submodule</argument>
- <argument>update</argument>
- <argument>--init</argument>
- <argument>--recursive</argument>
- </arguments>
- </configuration>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- <execution>
<id>install-jmxtools</id>
<inherited>false</inherited>
<phase>process-resources</phase>
@@ -338,6 +321,40 @@
<profiles>
<profile>
+ <id>asf-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.6.0</version>
+ <executions>
+ <execution>
+ <id>git submodule update</id>
+ <phase>initialize</phase>
+ <inherited>false</inherited>
+ <configuration>
+ <executable>git</executable>
+ <arguments>
+ <argument>submodule</argument>
+ <argument>update</argument>
+ <argument>--init</argument>
+ <argument>--recursive</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<!-- ojdbc is not Apache license compatible, so it must be manually downloaded first -->
<id>install-ojdbc</id>
<activation>
--
To stop receiving notification emails like this one, please contact
pengys@apache.org.