You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2015/03/28 21:16:36 UTC

ambari git commit: Prepare for publishing to Maven. (yusaku)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.0.0-maven-publish [created] be0999ada


Prepare for publishing to Maven. (yusaku)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be0999ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be0999ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be0999ad

Branch: refs/heads/branch-2.0.0-maven-publish
Commit: be0999ada8355dc5c1b136f2fb20d59495069d97
Parents: 78d41cd
Author: Yusaku Sako <yu...@hortonworks.com>
Authored: Sat Mar 28 13:16:01 2015 -0700
Committer: Yusaku Sako <yu...@hortonworks.com>
Committed: Sat Mar 28 13:16:01 2015 -0700

----------------------------------------------------------------------
 ambari-project/pom.xml | 2 +-
 pom.xml                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/be0999ad/ambari-project/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 48c7214..13a2c1b 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -126,7 +126,7 @@ instead of a SNAPSHOT. -->
             <executions>
               <execution>
                 <id>sign-artifacts</id>
-                <phase>deploy</phase>
+                <phase>verify</phase>
                 <goals>
                   <goal>sign</goal>
                 </goals>

http://git-wip-us.apache.org/repos/asf/ambari/blob/be0999ad/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9fc2c90..0a5cb76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -173,7 +173,7 @@
             <configuration>
               <name>package-version</name>
               <value>${project.version}</value>
-              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*</regex>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-).*)?</regex>
               <replacement>$1.$2.$3</replacement>
               <failIfNoMatch>true</failIfNoMatch>
             </configuration>
@@ -186,8 +186,8 @@
             <configuration>
               <name>package-release</name>
               <value>${project.version}</value>
-              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*</regex>
-              <replacement>$5</replacement>
+              <regex>^([0-9]+)\.([0-9]+)\.([0-9]+)((\.|-)(([0-9]+)|(SNAPSHOT)|(techwin)).*)?</regex>
+              <replacement>$6</replacement>
               <failIfNoMatch>true</failIfNoMatch>
             </configuration>
           </execution>