You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by of...@apache.org on 2016/07/29 17:03:12 UTC

[31/51] [abbrv] bigtop git commit: BIGTOP-2456 Update Apache Apex version to 3.4.0

BIGTOP-2456 Update Apache Apex version to 3.4.0

Signed-off-by: Youngwoo Kim <yw...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/85a2bdd9
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/85a2bdd9
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/85a2bdd9

Branch: refs/heads/BIGTOP-2253
Commit: 85a2bdd9bfce49a904b45a4d0d015434d1a89216
Parents: 9dda04b
Author: Chinmay Kolhatkar <ch...@datatorrent.com>
Authored: Thu Jun 9 16:49:37 2016 -0700
Committer: Youngwoo Kim <yw...@apache.org>
Committed: Tue Jun 14 19:54:26 2016 +0900

----------------------------------------------------------------------
 bigtop-packages/src/common/apex/apex.1          | 2 +-
 bigtop-packages/src/common/apex/install_apex.sh | 7 +++----
 bigtop-packages/src/deb/apex/control            | 2 +-
 bigtop-packages/src/deb/apex/copyright          | 4 ++--
 bigtop-packages/src/rpm/apex/SPECS/apex.spec    | 5 ++---
 bigtop.bom                                      | 8 ++++----
 6 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/85a2bdd9/bigtop-packages/src/common/apex/apex.1
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/apex/apex.1 b/bigtop-packages/src/common/apex/apex.1
index 38a639d..dcdb070 100644
--- a/bigtop-packages/src/common/apex/apex.1
+++ b/bigtop-packages/src/common/apex/apex.1
@@ -46,7 +46,7 @@ Dynamically change the application logical plan
 Create custom macros
 
 .RS 0
-For more information about Apache Apex, see http://apex.incubator.apache.org/
+For more information about Apache Apex, see http://apex.apache.org/
 
 
 .SH OPTIONS

http://git-wip-us.apache.org/repos/asf/bigtop/blob/85a2bdd9/bigtop-packages/src/common/apex/install_apex.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/apex/install_apex.sh b/bigtop-packages/src/common/apex/install_apex.sh
index fed8f30..3993c52 100644
--- a/bigtop-packages/src/common/apex/install_apex.sh
+++ b/bigtop-packages/src/common/apex/install_apex.sh
@@ -94,13 +94,13 @@ install -d -m 0755 $BIN_DIR
 install -d -m 0755 $DOC_DIR
 install -d -m 0755 $MAN_DIR
 
-# Install dtcli
+# Install apex cli
 BINARY_FILE=$APEX_DIR/bin/apex
-cp engine/src/main/scripts/dtcli $APEX_DIR/bin/apex
+cp engine/src/main/scripts/apex $APEX_DIR/bin/apex
 chmod 755 $BINARY_FILE
 
 # Make bin wrappers
-for file in $BIN_DIR/apex $BIN_DIR/dtcli
+for file in $BIN_DIR/apex
 do
   cat > $file <<EOF
 #!/bin/bash
@@ -121,5 +121,4 @@ gzip -c apex.1 > $MAN_DIR/apex.1.gz
 # Install license here.
 cp LICENSE $DOC_DIR
 cp *-LICENSE.txt $DOC_DIR
-cp DISCLAIMER $DOC_DIR
 cp NOTICE $DOC_DIR

http://git-wip-us.apache.org/repos/asf/bigtop/blob/85a2bdd9/bigtop-packages/src/deb/apex/control
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/apex/control b/bigtop-packages/src/deb/apex/control
index 8bed3cc..6145c73 100644
--- a/bigtop-packages/src/deb/apex/control
+++ b/bigtop-packages/src/deb/apex/control
@@ -19,7 +19,7 @@ Priority: extra
 Maintainer: Bigtop <de...@bigtop.apache.org>
 Build-Depends: debhelper (>= 9)
 Standards-Version: 3.9.4
-Homepage: http://apex.incubator.apache.org
+Homepage: http://apex.apache.org
 
 Package:  apex
 Architecture: all

http://git-wip-us.apache.org/repos/asf/bigtop/blob/85a2bdd9/bigtop-packages/src/deb/apex/copyright
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/apex/copyright b/bigtop-packages/src/deb/apex/copyright
index ab45999..48354d1 100644
--- a/bigtop-packages/src/deb/apex/copyright
+++ b/bigtop-packages/src/deb/apex/copyright
@@ -1,6 +1,6 @@
 Format: http://dep.debian.net/deps/dep5
-Source: http://apex.incubator.apache.org/
-Upstream-Name: Apache Apex (incubating)
+Source: http://apex.apache.org/
+Upstream-Name: Apache Apex
 
 Files: *
 Copyright: 2015, The Apache Software Foundation

http://git-wip-us.apache.org/repos/asf/bigtop/blob/85a2bdd9/bigtop-packages/src/rpm/apex/SPECS/apex.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/apex/SPECS/apex.spec b/bigtop-packages/src/rpm/apex/SPECS/apex.spec
index 5f0291a..65cd9bb 100644
--- a/bigtop-packages/src/rpm/apex/SPECS/apex.spec
+++ b/bigtop-packages/src/rpm/apex/SPECS/apex.spec
@@ -35,7 +35,7 @@ Version: %{apex_version}
 Release: %{apex_release}
 Summary: Apache Apex is an enterprise Grade YARN-native platform for unified stream and batch processing
 License: ASL 2.0
-URL: http://apex.incubator.apache.org
+URL: http://apex.apache.org
 Group: Development/Libraries
 Buildroot: %{_topdir}/INSTALL/%{name}-%{version}
 BuildArch: noarch
@@ -57,7 +57,7 @@ Apache Apex includes following key features:
  * Hadoop-native YARN & HDFS implementation
 
 %prep
-%setup -n %{name}-%{apex_base_version}-incubating
+%setup -n %{name}-%{apex_base_version}
 
 %build
 env APEX_VERSION=%{apex_base_version} bash %{SOURCE1}
@@ -73,5 +73,4 @@ sh -x %{SOURCE2} --prefix=$RPM_BUILD_ROOT --doc-dir=$RPM_BUILD_ROOT/%{doc_apex}
 %doc %{doc_apex}
 %{lib_apex}
 %{bin_apex}/apex
-%{bin_apex}/dtcli
 %{man_dir}/man1/apex.1.*

http://git-wip-us.apache.org/repos/asf/bigtop/blob/85a2bdd9/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index 4268677..1b0a96b 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -427,11 +427,11 @@ bigtop {
     }
     'apex' {
       name    = 'apex'
-      relNotes = 'Apache Apex (incubating)'
-      version { base = '3.3.0'; pkg = base; release = 1 }
-      tarball { source      = "$name-${version.base}-incubating-source-release.tar.gz"
+      relNotes = 'Apache Apex'
+      version { base = '3.4.0'; pkg = base; release = 1 }
+      tarball { source      = "$name-${version.base}-source-release.tar.gz"
                 destination = "$name-${version.base}.tar.gz" }
-      url     { download_path = "/incubator/$name/v${version.base}-incubating/"
+      url     { download_path = "/incubator/$name/v${version.base}/"
                 site = "${apache.APACHE_MIRROR}/${download_path}"
                 archive = "${apache.APACHE_ARCHIVE}/${download_path}" }
     }