You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/30 16:05:33 UTC
[3/3] incubator-trafficcontrol git commit: use env BUILD_NUMBER and
RHEL_NUMBER for release name
use env BUILD_NUMBER and RHEL_NUMBER for release name
(cherry picked from commit 7868dd931ffe3e1388f587e2e735289ba824f69a)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b32c9900
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b32c9900
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b32c9900
Branch: refs/heads/1.8.x
Commit: b32c99002279f2c78c797397dacd2803cdf80b9f
Parents: 8dc3f0c
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:38:43 2016 +0000
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 30 16:05:01 2016 +0000
----------------------------------------------------------------------
traffic_monitor/pom.xml | 5 +++--
traffic_router/build/pom.xml | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b32c9900/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index d4c5f0a..5366a2e 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -281,7 +281,8 @@
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
+ <variableName>RHEL_VERSION</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -318,7 +319,7 @@
</executions>
<configuration>
<group>Applications/Internet</group>
- <release>${env.GIT_REV_COUNT}.${buildNumber}.el6</release>
+ <release>${env.BUILD_NUMBER}.${env.RHEL_VERSION}</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b32c9900/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index a4e611b..dcb8835 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -88,6 +88,7 @@
<rules>
<requireEnvironmentVariable>
<variableName>BUILD_NUMBER</variableName>
+ <variableName>RHEL_VERSION</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -125,7 +126,7 @@
<configuration>
<group>Applications/Internet</group>
<name>${project.parent.artifactId}</name>
- <release>${env.BUILD_NUMBER}.el6</release>
+ <release>${env.BUILD_NUMBER}.${env.RHEL_VERSION}</release>
<needarch>x86_64</needarch>
<mappings>
<mapping>