You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ne...@apache.org on 2016/11/30 15:51:07 UTC
[1/5] incubator-trafficcontrol git commit: fix ref to TC_VERSION
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 8fb497d60 -> 15c8451d1
fix ref to TC_VERSION
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e06fbf85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e06fbf85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e06fbf85
Branch: refs/heads/master
Commit: e06fbf852c91aea48103366db99f94857e72857a
Parents: 3003a30
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 22:56:56 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/e06fbf85/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 20d3910..da559fd 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -105,7 +105,6 @@ function checkEnvironment() {
echo "TC_VERSION: $TC_VERSION"
echo "RPM: $RPM"
echo "--------------------------------------------------"
- export TRAFFIC_CONTROL_VERSION="$TC_VERSION"
}
# ---------------------------------------
@@ -115,7 +114,7 @@ function initBuildArea() {
tr_dest=$(createSourceDir traffic_router)
- export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
+ export MVN_CMD="mvn versions:set -DnewVersion=$TC_VERSION"
echo $MVN_CMD
(cd $TR_DIR; $MVN_CMD)
cp -r "$TR_DIR"/{build,connector,core} "$tr_dest"/. || { echo "Could not copy to $tr_dest: $?"; exit 1; }
[2/5] incubator-trafficcontrol git commit: cd to traffic_router prior
to setting version
Posted by ne...@apache.org.
cd to traffic_router prior to setting version
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3003a304
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3003a304
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3003a304
Branch: refs/heads/master
Commit: 3003a304cf34c255ca0e6381f8b60d1bce392d47
Parents: 96711d5
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 22:39:40 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_router/build/build_rpm.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3003a304/traffic_router/build/build_rpm.sh
----------------------------------------------------------------------
diff --git a/traffic_router/build/build_rpm.sh b/traffic_router/build/build_rpm.sh
index 43d6943..20d3910 100755
--- a/traffic_router/build/build_rpm.sh
+++ b/traffic_router/build/build_rpm.sh
@@ -117,7 +117,7 @@ function initBuildArea() {
export MVN_CMD="mvn versions:set -DnewVersion=$TRAFFIC_CONTROL_VERSION"
echo $MVN_CMD
- $MVN_CMD
+ (cd $TR_DIR; $MVN_CMD)
cp -r "$TR_DIR"/{build,connector,core} "$tr_dest"/. || { echo "Could not copy to $tr_dest: $?"; exit 1; }
cp "$TR_DIR"/pom.xml "$tr_dest" || { echo "Could not copy to $tr_dest: $?"; exit 1; }
[4/5] incubator-trafficcontrol git commit: up traffic_monitor and
traffic_router to version 1.9.0
Posted by ne...@apache.org.
up traffic_monitor and traffic_router to version 1.9.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/96711d53
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/96711d53
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/96711d53
Branch: refs/heads/master
Commit: 96711d53de82f5da337c1ee3574c72a4e505f0fe
Parents: 7868dd9
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:47:47 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
traffic_monitor/pom.xml | 2 +-
traffic_router/build/pom.xml | 2 +-
traffic_router/configuration/pom.xml | 2 +-
traffic_router/connector/pom.xml | 2 +-
traffic_router/core/pom.xml | 2 +-
traffic_router/geolocation/pom.xml | 2 +-
traffic_router/neustar/pom.xml | 2 +-
traffic_router/pom.xml | 2 +-
traffic_router/shared/pom.xml | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index 5075610..7c59495 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -26,7 +26,7 @@ under the License.
<groupId>com.comcast.cdn.traffic_control</groupId>
<artifactId>traffic_monitor</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
<packaging>war</packaging>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/build/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/build/pom.xml b/traffic_router/build/pom.xml
index dcb8835..a860b15 100644
--- a/traffic_router/build/pom.xml
+++ b/traffic_router/build/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<scm>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/configuration/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/configuration/pom.xml b/traffic_router/configuration/pom.xml
index 5f80e15..0d0ff89 100644
--- a/traffic_router/configuration/pom.xml
+++ b/traffic_router/configuration/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/connector/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/connector/pom.xml b/traffic_router/connector/pom.xml
index 74e0a07..3878e3e 100644
--- a/traffic_router/connector/pom.xml
+++ b/traffic_router/connector/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<artifactId>traffic_router_connector</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/core/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/core/pom.xml b/traffic_router/core/pom.xml
index f2ec0cd..cfb97c2 100644
--- a/traffic_router/core/pom.xml
+++ b/traffic_router/core/pom.xml
@@ -18,7 +18,7 @@
<parent>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
<artifactId>traffic_router</artifactId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<artifactId>traffic_router_core</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/geolocation/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/geolocation/pom.xml b/traffic_router/geolocation/pom.xml
index c2d6224..3e95cf1 100644
--- a/traffic_router/geolocation/pom.xml
+++ b/traffic_router/geolocation/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/neustar/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/neustar/pom.xml b/traffic_router/neustar/pom.xml
index 002467c..48a5326 100644
--- a/traffic_router/neustar/pom.xml
+++ b/traffic_router/neustar/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/pom.xml b/traffic_router/pom.xml
index 78badf3..1148c49 100644
--- a/traffic_router/pom.xml
+++ b/traffic_router/pom.xml
@@ -18,7 +18,7 @@
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
<packaging>pom</packaging>
<name>traffic_router</name>
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/96711d53/traffic_router/shared/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_router/shared/pom.xml b/traffic_router/shared/pom.xml
index d9cd43a..329038c 100644
--- a/traffic_router/shared/pom.xml
+++ b/traffic_router/shared/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>traffic_router</artifactId>
<groupId>com.comcast.cdn.traffic_control.traffic_router</groupId>
- <version>1.8.0</version>
+ <version>1.9.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[5/5] incubator-trafficcontrol git commit: This closes #111
Posted by ne...@apache.org.
This closes #111
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/15c8451d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/15c8451d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/15c8451d
Branch: refs/heads/master
Commit: 15c8451d17a41e4ce7a4f289a945afd3dfcf67bd
Parents: e06fbf8
Author: Dave Neuman <ne...@apache.org>
Authored: Wed Nov 30 08:50:36 2016 -0700
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:36 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/5] incubator-trafficcontrol git commit: use env BUILD_NUMBER and
RHEL_NUMBER for release name
Posted by ne...@apache.org.
use env BUILD_NUMBER and RHEL_NUMBER for release name
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7868dd93
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7868dd93
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7868dd93
Branch: refs/heads/master
Commit: 7868dd931ffe3e1388f587e2e735289ba824f69a
Parents: 8fb497d
Author: Dan Kirkwood <da...@gmail.com>
Authored: Tue Nov 29 20:38:43 2016 +0000
Committer: Dave Neuman <ne...@apache.org>
Committed: Wed Nov 30 08:50:12 2016 -0700
----------------------------------------------------------------------
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/7868dd93/traffic_monitor/pom.xml
----------------------------------------------------------------------
diff --git a/traffic_monitor/pom.xml b/traffic_monitor/pom.xml
index b6887c7..5075610 100644
--- a/traffic_monitor/pom.xml
+++ b/traffic_monitor/pom.xml
@@ -301,7 +301,8 @@ under the License.
<configuration>
<rules>
<requireEnvironmentVariable>
- <variableName>GIT_REV_COUNT</variableName>
+ <variableName>BUILD_NUMBER</variableName>
+ <variableName>RHEL_VERSION</variableName>
</requireEnvironmentVariable>
</rules>
<fail>true</fail>
@@ -338,7 +339,7 @@ under the License.
</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/7868dd93/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>