Repository: incubator-samza-hello-samza Updated Branches: refs/heads/master 5bbb45e6c -> a37cf4a34
SAMZA-183; upgrade hello-samza to Kafka 0.8.1 and fix download URLs. Project: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/commit/a37cf4a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/tree/a37cf4a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/diff/a37cf4a3 Branch: refs/heads/master Commit: a37cf4a349ced326ab2b4192ee7212d201a62474 Parents: 5bbb45e Author: Martin Kleppmann <[email protected]> Authored: Mon Mar 17 09:44:19 2014 -0700 Committer: Chris Riccomini <[email protected]> Committed: Mon Mar 17 09:44:19 2014 -0700 ---------------------------------------------------------------------- bin/grid | 18 +++++++++--------- lib/kafka_2.10-0.8.1-SNAPSHOT.jar | Bin 2856071 -> 0 bytes pom.xml | 23 +---------------------- 3 files changed, 10 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/a37cf4a3/bin/grid ---------------------------------------------------------------------- diff --git a/bin/grid b/bin/grid index acc5ce6..97d7003 100755 --- a/bin/grid +++ b/bin/grid @@ -19,8 +19,8 @@ DOWNLOAD_CACHE_DIR=$HOME/.samza/download COMMAND=$1 SYSTEM=$2 -DOWNLOAD_KAFKA=http://mirrors.sonic.net/apache/kafka/0.8.0/kafka_2.8.0-0.8.0.tar.gz -DOWNLOAD_YARN=http://mirrors.sonic.net/apache/hadoop/common/hadoop-2.2.0/hadoop-2.2.0.tar.gz +DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.8.1/kafka_2.9.2-0.8.1.tgz +DOWNLOAD_YARN=https://archive.apache.org/dist/hadoop/common/hadoop-2.2.0/hadoop-2.2.0.tar.gz DOWNLOAD_ZOOKEEPER=http://archive.apache.org/dist/zookeeper/zookeeper-3.4.3/zookeeper-3.4.3.tar.gz bootstrap() { @@ -41,12 +41,12 @@ install_all() { } install_zookeeper() { - install $DOWNLOAD_ZOOKEEPER zookeeper + install zookeeper $DOWNLOAD_ZOOKEEPER zookeeper-3.4.3 cp "$DEPLOY_ROOT_DIR/zookeeper/conf/zoo_sample.cfg" "$DEPLOY_ROOT_DIR/zookeeper/conf/zoo.cfg" } install_yarn() { - install $DOWNLOAD_YARN yarn + install yarn $DOWNLOAD_YARN hadoop-2.2.0 cp "$BASE_DIR/conf/yarn-site.xml" "$DEPLOY_ROOT_DIR/yarn/etc/hadoop/yarn-site.xml" if [ ! -f "$HOME/.samza/conf/yarn-site.xml" ]; then mkdir -p "$HOME/.samza/conf" @@ -55,7 +55,7 @@ install_yarn() { } install_kafka() { - install $DOWNLOAD_KAFKA kafka + install kafka $DOWNLOAD_KAFKA kafka_2.9.2-0.8.1 # have to use SIGTERM since nohup on appears to ignore SIGINT # and Kafka switched to SIGINT in KAFKA-1031. sed -i.bak 's/SIGINT/SIGTERM/g' $DEPLOY_ROOT_DIR/kafka/bin/kafka-server-stop.sh @@ -79,14 +79,14 @@ install_samza() { } install() { - DOWNLOAD_URL=$1 + DESTINATION_DIR="$DEPLOY_ROOT_DIR/$1" + DOWNLOAD_URL=$2 + PACKAGE_DIR="$DOWNLOAD_CACHE_DIR/$3" PACKAGE_FILE="$DOWNLOAD_CACHE_DIR/$(basename $DOWNLOAD_URL)" - PACKAGE_DIR="$DOWNLOAD_CACHE_DIR/$(basename $DOWNLOAD_URL .tar.gz )" # assume foo-1.2.3.tar.gz unpacks to a directory called foo-1.2.3 - DESTINATION_DIR="$DEPLOY_ROOT_DIR/$2" if [ -f "$PACKAGE_FILE" ]; then echo "Using previously downloaded file $PACKAGE_FILE" else - echo "Downloading $(basename $DOWNLOAD_URL .tar.gz )..." + echo "Downloading $(basename $DOWNLOAD_URL)..." mkdir -p $DOWNLOAD_CACHE_DIR curl "$DOWNLOAD_URL" > "${PACKAGE_FILE}.tmp" mv "${PACKAGE_FILE}.tmp" "$PACKAGE_FILE" http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/a37cf4a3/lib/kafka_2.10-0.8.1-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/lib/kafka_2.10-0.8.1-SNAPSHOT.jar b/lib/kafka_2.10-0.8.1-SNAPSHOT.jar deleted file mode 100644 index 88d81b2..0000000 Binary files a/lib/kafka_2.10-0.8.1-SNAPSHOT.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/a37cf4a3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d9ae40e..50eddef 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka_2.10</artifactId> - <version>0.8.1-SNAPSHOT</version> + <version>0.8.1</version> </dependency> <dependency> <groupId>org.schwering</groupId> @@ -197,27 +197,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>2.3.1</version> - <inherited>false</inherited> - <executions> - <execution> - <id>install-kafka</id> - <phase>validate</phase> - <goals> - <goal>install-file</goal> - </goals> - <configuration> - <groupId>org.apache.kafka</groupId> - <artifactId>kafka_2.10</artifactId> - <version>0.8.1-SNAPSHOT</version> - <packaging>jar</packaging> - <file>${basedir}/lib/kafka_2.10-0.8.1-SNAPSHOT.jar</file> - </configuration> - </execution> - </executions> - </plugin> </plugins> </build> </project>
