Repository: incubator-samza-hello-samza
Updated Branches:
  refs/heads/master 3fead6c73 -> e9cf88d0d


SAMZA-318: Use 0.7.0 binary Maven release for hello-samza.


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/e9cf88d0
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/tree/e9cf88d0
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/diff/e9cf88d0

Branch: refs/heads/master
Commit: e9cf88d0d4698b272c669385ea0d52e7d8c0f666
Parents: 3fead6c
Author: Martin Kleppmann <[email protected]>
Authored: Mon Jul 7 21:28:53 2014 +0100
Committer: Martin Kleppmann <[email protected]>
Committed: Wed Jul 16 00:30:46 2014 +0100

----------------------------------------------------------------------
 README.md                 | 11 +++++++++++
 bin/grid                  | 17 -----------------
 pom.xml                   | 19 ++++++++++---------
 samza-job-package/pom.xml |  2 +-
 samza-wikipedia/pom.xml   |  2 +-
 5 files changed, 23 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/e9cf88d0/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index ee69946..3d5c323 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,17 @@ Hello Samza is a starter project for [Apache 
Samza](http://samza.incubator.apach
 
 Please see [Hello 
Samza](http://samza.incubator.apache.org/startup/hello-samza/0.7.0/) to get 
started.
 
+By default, Hello Samza uses a recent release of Samza from a Maven 
repository. If you want to use a custom
+version of Samza, you can publish it to your local Maven repository in 
`$HOME/.m2` by running the following
+in the Samza repository:
+
+    ./gradlew publishToMavenLocal
+
+You can then use that version in Hello Samza by specifying the `samza.version` 
property when building
+Hello Samza, for example:
+
+    mvn package -Dsamza.version=0.8.0-SNAPSHOT
+
 ### Pull requests and questions
 Hello Samza is developed as part of the Apache Samza project. Please direct 
questions, improvements and
 bug fixes there.  Questions about Hello Samza are welcome on the dev list 
(details on the main

http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/e9cf88d0/bin/grid
----------------------------------------------------------------------
diff --git a/bin/grid b/bin/grid
index 1738464..4324c92 100755
--- a/bin/grid
+++ b/bin/grid
@@ -50,7 +50,6 @@ bootstrap() {
 }
 
 install_all() {
-  $DIR/grid install samza
   $DIR/grid install zookeeper
   $DIR/grid install yarn
   $DIR/grid install kafka
@@ -82,22 +81,6 @@ install_kafka() {
   sed -i.bak 's/^num\.partitions *=.*/num.partitions=1/' 
$DEPLOY_ROOT_DIR/kafka/config/server.properties
 }
 
-install_samza() {
-  mkdir -p "$DEPLOY_ROOT_DIR"
-  if [ -d "$DOWNLOAD_CACHE_DIR/incubator-samza/.git" ]; then
-    pushd "$DOWNLOAD_CACHE_DIR/incubator-samza"
-    git fetch origin
-    git reset --hard origin/master
-  else
-    mkdir -p $DOWNLOAD_CACHE_DIR
-    pushd $DOWNLOAD_CACHE_DIR
-    git clone git://git.apache.org/incubator-samza.git
-    cd incubator-samza
-  fi
-  ./gradlew -PscalaVersion=2.10 clean publishToMavenLocal
-  popd
-}
-
 install() {
   DESTINATION_DIR="$DEPLOY_ROOT_DIR/$1"
   DOWNLOAD_URL=$2

http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/e9cf88d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 51bf0fc..90f6c03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@ under the License.
 
   <groupId>samza</groupId>
   <artifactId>samza-example-parent</artifactId>
-  <version>0.8.0</version>
+  <version>0.7.0</version>
   <packaging>pom</packaging>
   <name>Samza Parent</name>
   <description>
@@ -40,44 +40,44 @@ under the License.
       <dependency>
         <groupId>samza</groupId>
         <artifactId>samza-wikipedia</artifactId>
-        <version>0.8.0</version>
+        <version>0.7.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-api</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-core_2.10</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-serializers_2.10</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-shell</artifactId>
         <classifier>dist</classifier>
         <type>tgz</type>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-yarn_2.10</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-kv_2.10</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.samza</groupId>
         <artifactId>samza-kafka_2.10</artifactId>
-        <version>0.8.0-SNAPSHOT</version>
+        <version>${samza.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.kafka</groupId>
@@ -110,6 +110,7 @@ under the License.
   <properties>
     <!-- maven specific properties -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <samza.version>0.7.0</samza.version>
   </properties>
 
   <modules>

http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/e9cf88d0/samza-job-package/pom.xml
----------------------------------------------------------------------
diff --git a/samza-job-package/pom.xml b/samza-job-package/pom.xml
index cd81eb6..5dafbfc 100644
--- a/samza-job-package/pom.xml
+++ b/samza-job-package/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>samza</groupId>
     <artifactId>samza-example-parent</artifactId>
-    <version>0.8.0</version>
+    <version>0.7.0</version>
   </parent>
 
   <artifactId>samza-job-package</artifactId>

http://git-wip-us.apache.org/repos/asf/incubator-samza-hello-samza/blob/e9cf88d0/samza-wikipedia/pom.xml
----------------------------------------------------------------------
diff --git a/samza-wikipedia/pom.xml b/samza-wikipedia/pom.xml
index 671bdd5..20d94ed 100644
--- a/samza-wikipedia/pom.xml
+++ b/samza-wikipedia/pom.xml
@@ -24,7 +24,7 @@ under the License.
   <parent>
     <groupId>samza</groupId>
     <artifactId>samza-example-parent</artifactId>
-    <version>0.8.0</version>
+    <version>0.7.0</version>
   </parent>
 
   <artifactId>samza-wikipedia</artifactId>

Reply via email to