From commits-return-5964-archive-asf-public=cust-asf.ponee.io@tez.apache.org Tue Mar 19 20:27:35 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 9B87618077A for ; Tue, 19 Mar 2019 21:27:34 +0100 (CET) Received: (qmail 17912 invoked by uid 500); 19 Mar 2019 20:27:33 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 17888 invoked by uid 99); 19 Mar 2019 20:27:33 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Mar 2019 20:27:33 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 2631982F91; Tue, 19 Mar 2019 20:27:33 +0000 (UTC) Date: Tue, 19 Mar 2019 20:27:35 +0000 To: "commits@tez.apache.org" Subject: [tez] 02/02: TEZ-4031. Support tez gitbox migration (Jonathan Eagles via kshukla) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: kshukla@apache.org In-Reply-To: <155302725303.24246.17994345352579426646@gitbox.apache.org> References: <155302725303.24246.17994345352579426646@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: tez X-Git-Refname: refs/heads/branch-0.9 X-Git-Reftype: branch X-Git-Rev: badab7b5e9eb4c6895aae8436bad6f6cebda78ba X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20190319202733.2631982F91@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. kshukla pushed a commit to branch branch-0.9 in repository https://gitbox.apache.org/repos/asf/tez.git commit badab7b5e9eb4c6895aae8436bad6f6cebda78ba Author: Kuhu Shukla AuthorDate: Tue Mar 19 15:22:22 2019 -0500 TEZ-4031. Support tez gitbox migration (Jonathan Eagles via kshukla) (cherry picked from commit 6bbb41f5eaa83533bad2a51565f608d87eeacb61) --- Tez_DOAP.rdf | 4 +-- docs/src/site/site.xml | 2 +- pom.xml | 4 +-- .../org/apache/tez/common/TestVersionInfo.java | 31 ++++++++++------------ .../test/resources/test1-version-info.properties | 2 +- .../test/resources/test3-version-info.properties | 2 +- tez-ui/src/main/webapp/package.json | 2 +- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/Tez_DOAP.rdf b/Tez_DOAP.rdf index 7e32221..25bc3f5 100644 --- a/Tez_DOAP.rdf +++ b/Tez_DOAP.rdf @@ -162,8 +162,8 @@ - - + + diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml index 3984bac..4b2d3a4 100644 --- a/docs/src/site/site.xml +++ b/docs/src/site/site.xml @@ -133,7 +133,7 @@ - + diff --git a/pom.xml b/pom.xml index 946f0d7..a955998 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ 2.5.0 ${env.PROTOC_PATH} UTF-8 - scm:git:https://git-wip-us.apache.org/repos/asf/tez.git + scm:git:https://gitbox.apache.org/repos/asf/tez.git ${maven.build.timestamp} 1.4 3.0.1 @@ -1029,7 +1029,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 2.7 + 2.9 false diff --git a/tez-api/src/test/java/org/apache/tez/common/TestVersionInfo.java b/tez-api/src/test/java/org/apache/tez/common/TestVersionInfo.java index 17ff3d1..67f97b8 100644 --- a/tez-api/src/test/java/org/apache/tez/common/TestVersionInfo.java +++ b/tez-api/src/test/java/org/apache/tez/common/TestVersionInfo.java @@ -18,44 +18,41 @@ package org.apache.tez.common; -import java.io.IOException; - import org.junit.Assert; import org.junit.Test; - public class TestVersionInfo { - final String version = "0.6.0-SNAPSHOT"; - final String revision = "d523db65804a5742ce50824e6fcfb8a04d184c0d"; - final String buildTime = "20141024-1052"; - final String scmUrl = "scm:git:https://git-wip-us.apache.org/repos/asf/tez.git"; + private static final String VERSION = "0.6.0-SNAPSHOT"; + private static final String REVISION = "d523db65804a5742ce50824e6fcfb8a04d184c0d"; + private static final String BUILD_TIME = "20141024-1052"; + private static final String SCM_URL = "scm:git:https://gitbox.apache.org/repos/asf/tez.git"; @Test(timeout = 5000) public void testTest1File() { VersionInfo versionInfo = new VersionInfo("test1"); - Assert.assertEquals(version, versionInfo.getVersion()); - Assert.assertEquals(revision, versionInfo.getRevision()); - Assert.assertEquals(buildTime, versionInfo.getBuildTime()); - Assert.assertEquals(scmUrl, versionInfo.getSCMURL()); + Assert.assertEquals(VERSION, versionInfo.getVersion()); + Assert.assertEquals(REVISION, versionInfo.getRevision()); + Assert.assertEquals(BUILD_TIME, versionInfo.getBuildTime()); + Assert.assertEquals(SCM_URL, versionInfo.getSCMURL()); } @Test(timeout = 5000) public void testTest2File() { VersionInfo versionInfo = new VersionInfo("test2"); - Assert.assertEquals(version, versionInfo.getVersion()); - Assert.assertEquals(revision, versionInfo.getRevision()); - Assert.assertEquals(buildTime, versionInfo.getBuildTime()); + Assert.assertEquals(VERSION, versionInfo.getVersion()); + Assert.assertEquals(REVISION, versionInfo.getRevision()); + Assert.assertEquals(BUILD_TIME, versionInfo.getBuildTime()); Assert.assertEquals(VersionInfo.UNKNOWN, versionInfo.getSCMURL()); } @Test(timeout = 5000) public void testTest3File() { VersionInfo versionInfo = new VersionInfo("test3"); - Assert.assertEquals(version, versionInfo.getVersion()); - Assert.assertEquals(revision, versionInfo.getRevision()); + Assert.assertEquals(VERSION, versionInfo.getVersion()); + Assert.assertEquals(REVISION, versionInfo.getRevision()); Assert.assertEquals("", versionInfo.getBuildTime()); - Assert.assertEquals(scmUrl, versionInfo.getSCMURL()); + Assert.assertEquals(SCM_URL, versionInfo.getSCMURL()); } @Test(timeout = 5000) diff --git a/tez-api/src/test/resources/test1-version-info.properties b/tez-api/src/test/resources/test1-version-info.properties index ebb4c03..e2563d6 100644 --- a/tez-api/src/test/resources/test1-version-info.properties +++ b/tez-api/src/test/resources/test1-version-info.properties @@ -19,4 +19,4 @@ version=0.6.0-SNAPSHOT revision=d523db65804a5742ce50824e6fcfb8a04d184c0d buildtime=20141024-1052 -scmurl=scm:git:https://git-wip-us.apache.org/repos/asf/tez.git +scmurl=scm:git:https://gitbox.apache.org/repos/asf/tez.git diff --git a/tez-api/src/test/resources/test3-version-info.properties b/tez-api/src/test/resources/test3-version-info.properties index 401f382..9def3fb 100644 --- a/tez-api/src/test/resources/test3-version-info.properties +++ b/tez-api/src/test/resources/test3-version-info.properties @@ -19,4 +19,4 @@ version=0.6.0-SNAPSHOT revision=d523db65804a5742ce50824e6fcfb8a04d184c0d buildtime= -scmurl=scm:git:https://git-wip-us.apache.org/repos/asf/tez.git +scmurl=scm:git:https://gitbox.apache.org/repos/asf/tez.git diff --git a/tez-ui/src/main/webapp/package.json b/tez-ui/src/main/webapp/package.json index a14d215..92f54d2 100644 --- a/tez-ui/src/main/webapp/package.json +++ b/tez-ui/src/main/webapp/package.json @@ -19,7 +19,7 @@ }, "repository": { "type": "git", - "url": "https://git-wip-us.apache.org/repos/asf/tez.git" + "url": "https://gitbox.apache.org/repos/asf/tez.git" }, "engines": { "node": ">= 0.10.0"