Repository: bigtop Updated Branches: refs/heads/master 201c6013a -> 16a888035
BIGTOP-2370: Upgrade DataFu version to 1.3.0 Signed-off-by: Roman Shaposhnik <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/16a88803 Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/16a88803 Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/16a88803 Branch: refs/heads/master Commit: 16a88803570e5db3b7e7efa7979d0b23edbd96de Parents: 201c601 Author: Kengo Seki <[email protected]> Authored: Sat Oct 8 14:23:01 2016 +0900 Committer: Kengo Seki <[email protected]> Committed: Thu Dec 8 19:36:32 2016 -0500 ---------------------------------------------------------------------- bigtop-packages/src/common/datafu/do-component-build | 11 ++--------- bigtop-packages/src/deb/datafu/rules | 2 +- bigtop-packages/src/rpm/datafu/SPECS/datafu.spec | 4 ++-- bigtop.bom | 9 +++++---- 4 files changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bigtop/blob/16a88803/bigtop-packages/src/common/datafu/do-component-build ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/common/datafu/do-component-build b/bigtop-packages/src/common/datafu/do-component-build index 7bb08a1..e8ea9a7 100644 --- a/bigtop-packages/src/common/datafu/do-component-build +++ b/bigtop-packages/src/common/datafu/do-component-build @@ -18,12 +18,5 @@ set -ex . `dirname $0`/bigtop.bom -sed -i -e '/<dependency org="org.apache.pig"/s# rev=[^ >][^ >]*# rev="'$PIG_VERSION'"#' ivy.xml -sed -i -e 's/\(<settings defaultResolver="ivyrep"\/>\)/\1\n<property name="m2-pattern" value="${user.home}\/.m2\/repository\/[organisation]\/[module]\/[revision]\/[module]-[revision](-[classifier]).[ext]" override="false"\/>/' ivysettings.xml -sed -i -e 's/\(^ *<ibiblio\)/ <filesystem name="local-maven2" m2compatible="true">\n <artifact pattern="${m2-pattern}"\/>\n <ivy pattern="${m2-pattern}"\/>\n <\/filesystem>\n\1/' ivysettings.xml - -ant jar -Dversion=$DATAFU_VERSION "$@" - -# Install artifacts into the local Maven cache -mvn install:install-file -DcreateChecksum=true -DgroupId=com.linkedin.datafu -DartifactId=datafu -Dversion=$DATAFU_VERSION -Dpackaging=jar -Dfile=dist/datafu-$DATAFU_VERSION.jar - +gradle -b bootstrap.gradle +./gradlew clean assemble http://git-wip-us.apache.org/repos/asf/bigtop/blob/16a88803/bigtop-packages/src/deb/datafu/rules ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/deb/datafu/rules b/bigtop-packages/src/deb/datafu/rules index a86bbbe..24a5f38 100755 --- a/bigtop-packages/src/deb/datafu/rules +++ b/bigtop-packages/src/deb/datafu/rules @@ -32,5 +32,5 @@ override_dh_auto_build: override_dh_auto_install: sh -x debian/install_datafu.sh \ - --build-dir=dist \ + --build-dir=datafu-pig/build/libs \ --prefix=debian/tmp http://git-wip-us.apache.org/repos/asf/bigtop/blob/16a88803/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec ---------------------------------------------------------------------- diff --git a/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec b/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec index 713171f..0185736 100644 --- a/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec +++ b/bigtop-packages/src/rpm/datafu/SPECS/datafu.spec @@ -53,7 +53,7 @@ Convenience utility functions (e.g., assertions, easier writing of EvalFuncs) and more... %prep -%setup -n %{datafu_name}-%{datafu_base_version} +%setup -n apache-%{datafu_name}-incubating-sources-%{datafu_base_version} %build bash $RPM_SOURCE_DIR/do-component-build @@ -61,7 +61,7 @@ bash $RPM_SOURCE_DIR/do-component-build %install %__rm -rf $RPM_BUILD_ROOT sh $RPM_SOURCE_DIR/install_datafu.sh \ - --build-dir=dist \ + --build-dir=datafu-pig/build/libs \ --prefix=$RPM_BUILD_ROOT ####################### http://git-wip-us.apache.org/repos/asf/bigtop/blob/16a88803/bigtop.bom ---------------------------------------------------------------------- diff --git a/bigtop.bom b/bigtop.bom index 5734d35..ec0f2d2 100644 --- a/bigtop.bom +++ b/bigtop.bom @@ -258,11 +258,12 @@ bigtop { name = 'datafu' pkg = 'pig-udf-datafu' relNotes = 'Pig UDF Datafu' - version { base = '1.0.0'; pkg = base; release = 1 } + version { base = '1.3.0'; pkg = base; release = 1 } tarball { destination = "$name-${version.base}.tar.gz" - source = "${version.base}.tar.gz" } - url { site = "https://github.com/linkedin/datafu/archive"; - archive = site } + source = "apache-$name-incubating-sources-${version.base}.tgz" } + url { download_path = "incubator/$name/apache-$name-incubating-${version.base}" + site = "${apache.APACHE_MIRROR}/${download_path}" + archive = "${apache.APACHE_ARCHIVE}/${download_path}" } } 'solr' { name = 'solr'
