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/04/30 08:18:49 UTC

[skywalking] branch release-fix created (now 5e10589)

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a change to branch release-fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at 5e10589  Fix wrong profile name.

This branch includes the following new commits:

     new 2cd73c5  Introduce new profile in release
     new 0b9848f  Fix a missing change.
     new 5e10589  Fix wrong profile name.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



[skywalking] 01/03: Introduce new profile in release

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch release-fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 2cd73c5591c055088b310b5ac1ef153fabbb7499
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Apr 30 16:07:50 2019 +0800

    Introduce new profile in release
---
 docs/en/guides/How-to-release.md |  4 +--
 pom.xml                          | 65 +++++++++++++++++++++++++---------------
 2 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md
index aa99c5f..8a47536 100644
--- a/docs/en/guides/How-to-release.md
+++ b/docs/en/guides/How-to-release.md
@@ -46,7 +46,7 @@ This step is only for test, if your env is set right, don't need to check every
 ## Prepare the release
 ```
 ./mvnw release:clean
-./mvnw release:prepare -DautoVersionSubmodules=true
+./mvnw release:prepare -DautoVersionSubmodules=true -all
 ```
 
 - Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.)
@@ -56,7 +56,7 @@ but just failure. Run `gpg --sign xxx` to any file could remember the password f
 
 ## Stage the release 
 ```
-./mvnw release:perform -DskipTests
+./mvnw release:perform -DskipTests -all
 ```
 
 - The release will automatically be inserted into a temporary staging repository for you.
diff --git a/pom.xml b/pom.xml
index 35096f2..96bd7c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,47 @@
                 <module>apm-dist</module>
             </modules>
         </profile>
+        <profile>
+            <id>all</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+            <modules>
+                <module>apm-sniffer</module>
+                <module>apm-application-toolkit</module>
+                <module>oap-server</module>
+                <module>apm-webapp</module>
+                <module>apm-dist</module>
+            </modules>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>exec-maven-plugin</artifactId>
+                        <version>${exec-maven-plugin.version}</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>
     </profiles>
 
     <properties>
@@ -252,30 +293,6 @@
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>${exec-maven-plugin.version}</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>
-            <plugin>
                 <artifactId>maven-enforcer-plugin</artifactId>
                 <version>${maven-enforcer-plugin.version}</version>
                 <executions>


[skywalking] 03/03: Fix wrong profile name.

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch release-fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 5e10589530e7ac76b0e6e72d9bae43d2b6fc43d1
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Apr 30 16:12:37 2019 +0800

    Fix wrong profile name.
---
 docs/en/guides/How-to-release.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md
index ff04e92..c8d0006 100644
--- a/docs/en/guides/How-to-release.md
+++ b/docs/en/guides/How-to-release.md
@@ -40,13 +40,13 @@ Apache maven staging repository check list.
 ## Test your settings
 This step is only for test, if your env is set right, don't need to check every time.
 ```
-./mvnw clean install -Pauto (this will build artifacts, sources and sign)
+./mvnw clean install -Pall (this will build artifacts, sources and sign)
 ```
 
 ## Prepare the release
 ```
 ./mvnw release:clean
-./mvnw release:prepare -DautoVersionSubmodules=true -all
+./mvnw release:prepare -DautoVersionSubmodules=true -Pall
 ```
 
 - Set version number as x.y.z, and tag as **v**x.y.z (version tag must start with **v**, you will find the purpose in next step.)
@@ -56,7 +56,7 @@ but just failure. Run `gpg --sign xxx` to any file could remember the password f
 
 ## Stage the release 
 ```
-./mvnw release:perform -DskipTests -all
+./mvnw release:perform -DskipTests -Pall
 ```
 
 - The release will automatically be inserted into a temporary staging repository for you.


[skywalking] 02/03: Fix a missing change.

Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch release-fix
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit 0b9848fbe48143b1e11316d3cb72527e40108ab2
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Apr 30 16:09:57 2019 +0800

    Fix a missing change.
---
 docs/en/guides/How-to-release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/en/guides/How-to-release.md b/docs/en/guides/How-to-release.md
index 8a47536..ff04e92 100644
--- a/docs/en/guides/How-to-release.md
+++ b/docs/en/guides/How-to-release.md
@@ -40,7 +40,7 @@ Apache maven staging repository check list.
 ## Test your settings
 This step is only for test, if your env is set right, don't need to check every time.
 ```
-./mvnw clean install -Papache-release (this will build artifacts, sources and sign)
+./mvnw clean install -Pauto (this will build artifacts, sources and sign)
 ```
 
 ## Prepare the release