tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject tez git commit: TEZ-1890. tez-ui web.tar.gz also being uploaded to maven repository (jeagles)
Date Wed, 14 Jan 2015 19:05:10 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 0db610325 -> 0e872a5dc


TEZ-1890. tez-ui web.tar.gz also being uploaded to maven repository (jeagles)

(cherry picked from commit adcfb84c5121144d0747504d1c89e55f7f090e68)


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

Branch: refs/heads/branch-0.6
Commit: 0e872a5dcd3e517617b1f005a8e732c57e950ffe
Parents: 0db6103
Author: Jonathan Eagles <jeagles@gmail.com>
Authored: Wed Jan 14 13:01:53 2015 -0600
Committer: Jonathan Eagles <jeagles@gmail.com>
Committed: Wed Jan 14 13:03:00 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt                      |  1 +
 docs/src/site/markdown/tez-ui.md |  8 ++++----
 tez-ui/README.TXT                |  4 +---
 tez-ui/pom.xml                   | 20 --------------------
 tez-ui/src/assembly/bin.xml      | 31 -------------------------------
 5 files changed, 6 insertions(+), 58 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/0e872a5d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8037943..6bdc3dc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1890. tez-ui web.tar.gz also being uploaded to maven repository
   TEZ-1931. Publish tez version info to Timeline.
   TEZ-1938. Build warning duplicate jersey-json definitions
   TEZ-1910. Build fails against hadoop-2.2.0.

http://git-wip-us.apache.org/repos/asf/tez/blob/0e872a5d/docs/src/site/markdown/tez-ui.md
----------------------------------------------------------------------
diff --git a/docs/src/site/markdown/tez-ui.md b/docs/src/site/markdown/tez-ui.md
index cee6575..52332ce 100644
--- a/docs/src/site/markdown/tez-ui.md
+++ b/docs/src/site/markdown/tez-ui.md
@@ -101,8 +101,8 @@ tez-site.xml
 
 ### Building Tez UI from sources
 For instructions on building Tez UI from sources or setting up a development environment
see the
-README.txt in tez-ui subfolder. The build generates a tarball as well as a war file of the
distribution
-in the tez-ui/target. currently the Tez-UI can be hosted using one of the following options.
+README.txt in tez-ui subfolder. The build generates a war file of the distribution
+in the tez-ui/target. Currently the Tez-UI can be hosted using one of the following options.
 
 ### hosting using the war file and tomcat.
 1. Remove any old deployments in $TOMCAT_HOME/webapps
@@ -110,8 +110,8 @@ in the tez-ui/target. currently the Tez-UI can be hosted using one of
the follow
 3. Restart tomcat and the war will get deployed. The content of the war would be available
in
 $TOMCAT_HOME/webapps/tez-ui-x.x.x.
 
-### hosting using tarball and a standalone webserver
-1. untar the tarball
+### hosting using extracted war file and a standalone webserver
+1. untar the war file
 2. copy the resulting directory to the document root of the web server.
 3. reload/restart the webserver
 

http://git-wip-us.apache.org/repos/asf/tez/blob/0e872a5d/tez-ui/README.TXT
----------------------------------------------------------------------
diff --git a/tez-ui/README.TXT b/tez-ui/README.TXT
index b2ab7a3..d19f951 100644
--- a/tez-ui/README.TXT
+++ b/tez-ui/README.TXT
@@ -45,9 +45,7 @@ In configs.js
 Building
 ---------
   * To build UI without running test cases, run 'mvn clean package -DskipTests' in tez-ui
directory.
-  * The build will create two files inside tez-ui/target.
-    1. A tarball of the distribution files.
-    2. A war of the distribution files.
+  * The build will create a war file inside tez-ui/target.
   * UI build is part of tez build, refer BUILDING.txt in tez for more info.
 
 Using the war

http://git-wip-us.apache.org/repos/asf/tez/blob/0e872a5d/tez-ui/pom.xml
----------------------------------------------------------------------
diff --git a/tez-ui/pom.xml b/tez-ui/pom.xml
index 6d8c644..be2e443 100644
--- a/tez-ui/pom.xml
+++ b/tez-ui/pom.xml
@@ -29,13 +29,11 @@
   <properties>
     <webappDir>src/main/webapp</webappDir>
     <node.executable>${basedir}/src/main/webapp/node/node</node.executable>
-    <fileName>${artifactId}-${parent.version}</fileName>
     <nodeVersion>v0.10.18</nodeVersion>
     <npmVersion>1.3.8</npmVersion>
   </properties>
 
   <build>
-    <finalName>${fileName}</finalName>
     <plugins>
 
       <!-- Apache RAT -->
@@ -125,24 +123,6 @@
         </executions>
       </plugin>
 
-      <!-- Maven assembly plugin for creating the web tar ball-->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <finalName>${fileName}</finalName>
-          <descriptor>${basedir}/src/assembly/bin.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <!-- Package into war -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

http://git-wip-us.apache.org/repos/asf/tez/blob/0e872a5d/tez-ui/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/tez-ui/src/assembly/bin.xml b/tez-ui/src/assembly/bin.xml
deleted file mode 100644
index 2b5dd18..0000000
--- a/tez-ui/src/assembly/bin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <id>web</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>${basedir}/src/main/webapp/dist</directory>
-      <outputDirectory>/</outputDirectory>
-    </fileSet>
-  </fileSets>
-</assembly>
\ No newline at end of file


Mime
View raw message