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

bigtop git commit: BIGTOP-2526: Upgrade Flink version to 1.1.3.

Repository: bigtop
Updated Branches:
  refs/heads/master 8ca435fdf -> 66b5ee149


BIGTOP-2526: Upgrade Flink version to 1.1.3.

Signed-off-by: Konstantin Boudnik <ko...@epam.com>


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

Branch: refs/heads/master
Commit: 66b5ee1499d25ac78c585e22ae02ad5b218f9138
Parents: 8ca435f
Author: Dennis Huo <dh...@google.com>
Authored: Mon Nov 28 14:39:28 2016 -0800
Committer: Konstantin Boudnik <ko...@epam.com>
Committed: Tue Dec 6 15:55:45 2016 -0800

----------------------------------------------------------------------
 bigtop-packages/src/deb/flink/rules            | 2 +-
 bigtop-packages/src/rpm/flink/SPECS/flink.spec | 3 ++-
 bigtop.bom                                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/66b5ee14/bigtop-packages/src/deb/flink/rules
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/deb/flink/rules b/bigtop-packages/src/deb/flink/rules
index 53a62fd..553d828 100644
--- a/bigtop-packages/src/deb/flink/rules
+++ b/bigtop-packages/src/deb/flink/rules
@@ -36,7 +36,7 @@ jobmanager taskmanager:
 
 override_dh_auto_install: jobmanager taskmanager
 	bash -x debian/install_flink.sh \
-	--build-dir=`pwd`/build-target \
+	--build-dir=`pwd`/flink-dist/target/flink-${FLINK_VERSION}-bin/flink-${FLINK_VERSION} \
 	--source-dir=debian \
 	--prefix=debian/tmp
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/66b5ee14/bigtop-packages/src/rpm/flink/SPECS/flink.spec
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/rpm/flink/SPECS/flink.spec b/bigtop-packages/src/rpm/flink/SPECS/flink.spec
index 0ef42a9..250ec19 100644
--- a/bigtop-packages/src/rpm/flink/SPECS/flink.spec
+++ b/bigtop-packages/src/rpm/flink/SPECS/flink.spec
@@ -21,6 +21,7 @@
 %define man_dir %{_mandir}
 %define flink_services flink-jobmanager flink-taskmanager
 %define var_log_flink /var/log/%{flink_name}
+%define build_target_flink flink-dist/target/%{flink_name}-%{flink_version}-bin/%{flink_name}-%{flink_version}/
 
 
 %if  %{!?suse_version:1}0
@@ -104,7 +105,7 @@ bash $RPM_SOURCE_DIR/do-component-build
 %install
 %__rm -rf $RPM_BUILD_ROOT
 
-sh -x %{SOURCE2} --prefix=$RPM_BUILD_ROOT --source-dir=$RPM_SOURCE_DIR --build-dir=`pwd`/build-target
+sh -x %{SOURCE2} --prefix=$RPM_BUILD_ROOT --source-dir=$RPM_SOURCE_DIR --build-dir=`pwd`/%{build_target_flink}
 
 
 

http://git-wip-us.apache.org/repos/asf/bigtop/blob/66b5ee14/bigtop.bom
----------------------------------------------------------------------
diff --git a/bigtop.bom b/bigtop.bom
index b0a524a..df69ccd 100644
--- a/bigtop.bom
+++ b/bigtop.bom
@@ -310,7 +310,7 @@ bigtop {
     'flink' {
       name    = 'flink'
       relNotes = 'Apache Flink'
-      version { base = '1.0.3'; pkg = base; release = 1 }
+      version { base = '1.1.3'; pkg = base; release = 1 }
       tarball { destination = "$name-${version.base}.tar.gz"
                 source      = "$name-${version.base}-src.tgz" }
       url     { download_path = "/$name/$name-${version.base}"