You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ks...@apache.org on 2019/03/19 20:27:33 UTC
[tez] branch branch-0.9 updated (f0395c1 -> badab7b)
This is an automated email from the ASF dual-hosted git repository.
kshukla pushed a change to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/tez.git.
from f0395c1 TEZ-4052. Fit dot files ASF License issues - part 2 (Jonathan Eagles via kshukla)
new fb1795a Revert "TEZ-4031. Support tez gitbox migration (Jonathan Eagles via kshukla)"
new badab7b TEZ-4031. Support tez gitbox migration (Jonathan Eagles via kshukla)
The 2 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.
Summary of changes:
pom.xml | 4 +-
.../org/apache/tez/common/TestVersionInfo.java | 31 +++++++--------
tez-ui/src/main/webapp/bower-shrinkwrap.json | 44 +++++++++++-----------
3 files changed, 38 insertions(+), 41 deletions(-)
[tez] 02/02: TEZ-4031. Support tez gitbox migration (Jonathan
Eagles via kshukla)
Posted by ks...@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 <ks...@apache.org>
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 @@
</release>
<repository>
<GitRepository>
- <location rdf:resource="https://git-wip-us.apache.org/repos/asf/tez.git"/>
- <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=tez.git"/>
+ <location rdf:resource="https://gitbox.apache.org/repos/asf/tez.git"/>
+ <browse rdf:resource="https://gitbox.apache.org/repos/asf/tez.git"/>
</GitRepository>
</repository>
<maintainer>
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 @@
<menu name="Contribute">
<item name="JIRA" href="https://issues.apache.org/jira/browse/TEZ" />
- <item name="Git (Read/Write)" href="https://git-wip-us.apache.org/repos/asf/tez.git" alt="Use git clone https://git-wip-us.apache.org/repos/asf/tez.git" />
+ <item name="Git (Read/Write)" href="https://gitbox.apache.org/repos/asf/tez.git" alt="Use git clone https://gitbox.apache.org/repos/asf/tez.git" />
<item name="Git (Read-only)" href="git://git.apache.org/tez.git" alt="Use git clone git://git.apache.org/tez.git" />
<item name="How to Contribute" href="https://cwiki.apache.org/confluence/display/TEZ/How+to+Contribute+to+Tez" alt="Detailed guide on how to contribute to Tez" />
</menu>
diff --git a/pom.xml b/pom.xml
index 946f0d7..a955998 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<protobuf.version>2.5.0</protobuf.version>
<protoc.path>${env.PROTOC_PATH}</protoc.path>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <scm.url>scm:git:https://git-wip-us.apache.org/repos/asf/tez.git</scm.url>
+ <scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
<build.time>${maven.build.timestamp}</build.time>
<frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
@@ -1029,7 +1029,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.7</version>
+ <version>2.9</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
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"
[tez] 01/02: Revert "TEZ-4031. Support tez gitbox migration
(Jonathan Eagles via kshukla)"
Posted by ks...@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 fb1795a4a099524bef96a3e78d2789ef9f3e8eef
Author: Kuhu Shukla <ks...@apache.org>
AuthorDate: Tue Mar 19 15:21:11 2019 -0500
Revert "TEZ-4031. Support tez gitbox migration (Jonathan Eagles via kshukla)"
This reverts commit 7df58660d475c4bee82af0f71d8f06a1e23d61cb.
---
Tez_DOAP.rdf | 4 +-
docs/src/site/site.xml | 2 +-
pom.xml | 6 +--
.../org/apache/tez/common/TestVersionInfo.java | 2 +-
.../test/resources/test1-version-info.properties | 2 +-
.../test/resources/test3-version-info.properties | 2 +-
tez-ui/src/main/webapp/bower-shrinkwrap.json | 44 +++++++++++-----------
tez-ui/src/main/webapp/package.json | 2 +-
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/Tez_DOAP.rdf b/Tez_DOAP.rdf
index 25bc3f5..7e32221 100644
--- a/Tez_DOAP.rdf
+++ b/Tez_DOAP.rdf
@@ -162,8 +162,8 @@
</release>
<repository>
<GitRepository>
- <location rdf:resource="https://gitbox.apache.org/repos/asf/tez.git"/>
- <browse rdf:resource="https://gitbox.apache.org/repos/asf/tez.git"/>
+ <location rdf:resource="https://git-wip-us.apache.org/repos/asf/tez.git"/>
+ <browse rdf:resource="https://git-wip-us.apache.org/repos/asf?p=tez.git"/>
</GitRepository>
</repository>
<maintainer>
diff --git a/docs/src/site/site.xml b/docs/src/site/site.xml
index 4b2d3a4..3984bac 100644
--- a/docs/src/site/site.xml
+++ b/docs/src/site/site.xml
@@ -133,7 +133,7 @@
<menu name="Contribute">
<item name="JIRA" href="https://issues.apache.org/jira/browse/TEZ" />
- <item name="Git (Read/Write)" href="https://gitbox.apache.org/repos/asf/tez.git" alt="Use git clone https://gitbox.apache.org/repos/asf/tez.git" />
+ <item name="Git (Read/Write)" href="https://git-wip-us.apache.org/repos/asf/tez.git" alt="Use git clone https://git-wip-us.apache.org/repos/asf/tez.git" />
<item name="Git (Read-only)" href="git://git.apache.org/tez.git" alt="Use git clone git://git.apache.org/tez.git" />
<item name="How to Contribute" href="https://cwiki.apache.org/confluence/display/TEZ/How+to+Contribute+to+Tez" alt="Detailed guide on how to contribute to Tez" />
</menu>
diff --git a/pom.xml b/pom.xml
index 3e2d1ac..946f0d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,7 +54,7 @@
<protobuf.version>2.5.0</protobuf.version>
<protoc.path>${env.PROTOC_PATH}</protoc.path>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <scm.url>scm:git:https://gitbox.apache.org/repos/asf/tez.git</scm.url>
+ <scm.url>scm:git:https://git-wip-us.apache.org/repos/asf/tez.git</scm.url>
<build.time>${maven.build.timestamp}</build.time>
<frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
<findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
@@ -959,7 +959,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
- <version>3.7.1</version>
+ <version>3.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -1029,7 +1029,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.0.0</version>
+ <version>2.7</version>
<configuration>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
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 6b937cd..17ff3d1 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
@@ -29,7 +29,7 @@ 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://gitbox.apache.org/repos/asf/tez.git";
+ final String scmUrl = "scm:git:https://git-wip-us.apache.org/repos/asf/tez.git";
@Test(timeout = 5000)
public void testTest1File() {
diff --git a/tez-api/src/test/resources/test1-version-info.properties b/tez-api/src/test/resources/test1-version-info.properties
index e2563d6..ebb4c03 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://gitbox.apache.org/repos/asf/tez.git
+scmurl=scm:git:https://git-wip-us.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 9def3fb..401f382 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://gitbox.apache.org/repos/asf/tez.git
+scmurl=scm:git:https://git-wip-us.apache.org/repos/asf/tez.git
diff --git a/tez-ui/src/main/webapp/bower-shrinkwrap.json b/tez-ui/src/main/webapp/bower-shrinkwrap.json
index edcbae3..357d576 100644
--- a/tez-ui/src/main/webapp/bower-shrinkwrap.json
+++ b/tez-ui/src/main/webapp/bower-shrinkwrap.json
@@ -1,72 +1,72 @@
{
"https://github.com/FortAwesome/Font-Awesome.git": {
- "4.5.0": "4.5.0"
+ "4.5.0": "593ad563a987977f14102be935d0abc2a172903e"
},
"https://github.com/Teleborder/FileSaver.js.git": {
- "1.20150507.2": "1.20150507.2"
+ "1.20150507.2": "b7cf622909258086bc63ad764d08fcaed780ab42"
},
"https://github.com/adamwdraper/Numeral-js.git": {
- "1.5.3": "1.5.3"
+ "1.5.3": "f97f14bb8bab988f28f1d854525b4cfeff8ec9e1"
},
"https://github.com/components/codemirror.git": {
- "5.11.0": "5.11.0"
+ "5.11.0": "7d43f32bb56f83a9c47addb3f91170b3102f3ead"
},
"https://github.com/components/ember-data.git": {
- "2.1.0": "2.1.0"
+ "2.1.0": "d8b4d3092f67afe22d9d374c40d719d557915fa3"
},
"https://github.com/components/ember.git": {
- "2.2.0": "2.2.0"
+ "2.2.0": "49e042ca89922ed96b27488c2a98add280ae7123"
},
"https://github.com/components/jqueryui.git": {
- "1.11.4": "1.11.4"
+ "1.11.4": "c34f8dbf3ba57b3784b93f26119f436c0e8288e1"
},
"https://github.com/dockyard/ember-qunit-notifications.git": {
- "0.1.0": "0.1.0"
+ "0.1.0": "a83277aa7a1c0545c66e6d133caebb9a620e71ad"
},
"https://github.com/dockyard/qunit-notifications.git": {
- "0.1.1": "0.1.1"
+ "0.1.1": "7a13f6dba5a340e1cb9e0b64c1c711e4d7edaca1"
},
"https://github.com/ember-cli/ember-cli-shims.git": {
- "0.0.6": "0.0.6"
+ "0.0.6": "dcab43b58d5698690050bb9a46ead5c8663c7da1"
},
"https://github.com/ember-cli/ember-cli-test-loader.git": {
- "0.2.1": "0.2.1"
+ "0.2.1": "3348d801089279296c38f31ae14d9c4d115ce154"
},
"https://github.com/ember-cli/ember-load-initializers.git": {
- "0.1.7": "0.1.7"
+ "0.1.7": "7bb21488563bd1bba23e903a812bf5815beddd1a"
},
"https://github.com/jquery/jquery-dist.git": {
- "2.1.4": "2.1.4"
+ "2.1.4": "7751e69b615c6eca6f783a81e292a55725af6b85"
},
"https://github.com/jquery/jquery-mousewheel.git": {
- "3.1.13": "3.1.13"
+ "3.1.13": "67289b6b2aa0066d7d78a5807f520387135ffb22"
},
"https://github.com/jquery/qunit.git": {
- "1.19.0": "1.19.0"
+ "1.19.0": "467e7e34652ad7d5883ce9c568461cf8c5e172a8"
},
"https://github.com/moment/moment-timezone.git": {
- "0.5.0": "0.5.0"
+ "0.5.0": "74a2e9378ecf4a31a168f3049f086565c8d66814"
},
"https://github.com/moment/moment.git": {
- "2.12.0": "2.12.0"
+ "2.12.0": "d3d7488b4d60632854181cb0a9af325d57fb3d51"
},
"https://github.com/rwjblue/ember-qunit-builds.git": {
- "0.4.16": "0.4.16"
+ "0.4.16": "142c4066a5458bef9dfcb92b70152b9c01d79188"
},
"https://github.com/sreenaths/more-js.git": {
"0.8.6": "f1d9ccdaf7ff74c26b6ee341067a5a5ef33bd64a",
"0.8.8": "0.8.8"
},
"https://github.com/sreenaths/snippet-ss.git": {
- "1.11.0": "1.11.0"
+ "1.11.0": "c1abc566f4e001b7f1939b6dbdd911eadc969cf9"
},
"https://github.com/sreenaths/zip.js.git": {
- "1.0.0": "1.0.0"
+ "1.0.0": "ec67ad22eba116083ea3ef2fe0b40ccc953513ce"
},
"https://github.com/stefanpenner/loader.js.git": {
- "3.3.0": "3.3.0"
+ "3.3.0": "ac909550c9544325632542bbea97531cc60bc628"
},
"https://github.com/twbs/bootstrap.git": {
- "3.3.6": "3.3.6"
+ "3.3.6": "81df608a40bf0629a1dc08e584849bb1e43e0b7a"
}
}
\ No newline at end of file
diff --git a/tez-ui/src/main/webapp/package.json b/tez-ui/src/main/webapp/package.json
index 92f54d2..a14d215 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://gitbox.apache.org/repos/asf/tez.git"
+ "url": "https://git-wip-us.apache.org/repos/asf/tez.git"
},
"engines": {
"node": ">= 0.10.0"