You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by xi...@apache.org on 2018/01/09 01:26:14 UTC
[33/33] samza-hello-samza git commit: Merge branch 'latest'
Merge branch 'latest'
Conflicts:
README.md
bin/deploy.sh
bin/grid
build.gradle
gradle.properties
pom.xml
src/main/assembly/src.xml
src/main/config/pageview-adclick-joiner.properties
src/main/config/pageview-filter.properties
src/main/config/pageview-sessionizer.properties
src/main/config/tumbling-pageview-counter.properties
src/main/config/wikipedia-application-local-runner.properties
src/main/config/wikipedia-application.properties
src/main/java/samza/examples/cookbook/PageViewAdClickJoiner.java
src/main/java/samza/examples/cookbook/PageViewFilterApp.java
src/main/java/samza/examples/cookbook/PageViewSessionizerApp.java
src/main/java/samza/examples/cookbook/TumblingPageViewCounterApp.java
src/main/java/samza/examples/wikipedia/application/WikipediaApplication.java
Project: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/commit/f4889274
Tree: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/tree/f4889274
Diff: http://git-wip-us.apache.org/repos/asf/samza-hello-samza/diff/f4889274
Branch: refs/heads/master
Commit: f48892747dea196ab80eb0c76081efa86f0ba00c
Parents: 90bbe75 4e1aea3
Author: xiliu <xi...@xiliu-ld1.linkedin.biz>
Authored: Mon Jan 8 17:24:45 2018 -0800
Committer: xiliu <xi...@xiliu-ld1.linkedin.biz>
Committed: Mon Jan 8 17:24:45 2018 -0800
----------------------------------------------------------------------
bin/deploy.sh | 2 +-
bin/run-azure-application.sh | 30 ++++
gradle.properties | 2 +-
pom.xml | 9 +-
.../azure-application-local-runner.properties | 49 +++++++
.../config/pageview-adclick-joiner.properties | 18 +--
src/main/config/pageview-filter.properties | 18 +--
src/main/config/pageview-sessionizer.properties | 18 +--
.../config/tumbling-pageview-counter.properties | 20 +--
...ikipedia-application-local-runner.properties | 2 -
.../config/wikipedia-application.properties | 4 +-
.../samza/examples/azure/AzureApplication.java | 61 ++++++++
.../examples/azure/AzureZKLocalApplication.java | 42 ++++++
.../cookbook/PageViewAdClickJoiner.java | 108 ++++++++------
.../examples/cookbook/PageViewFilterApp.java | 47 +++---
.../cookbook/PageViewSessionizerApp.java | 59 +++++---
.../cookbook/TumblingPageViewCounterApp.java | 54 ++++---
.../samza/examples/cookbook/data/AdClick.java | 54 +++++++
.../samza/examples/cookbook/data/PageView.java | 46 ++++++
.../samza/examples/cookbook/data/Profile.java | 42 ++++++
.../examples/cookbook/data/UserPageViews.java | 51 +++++++
.../application/WikipediaApplication.java | 145 +++++++++++++------
22 files changed, 658 insertions(+), 223 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/f4889274/bin/deploy.sh
----------------------------------------------------------------------
diff --cc bin/deploy.sh
index 14c3a5e,51faed1..9526067
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@@ -23,4 -23,4 +23,4 @@@ base_dir=`pwd
mvn clean package
mkdir -p $base_dir/deploy/samza
- tar -xvf $base_dir/target/hello-samza-0.13.1-dist.tar.gz -C $base_dir/deploy/samza
-tar -xvf $base_dir/target/hello-samza-0.13.1-SNAPSHOT-dist.tar.gz -C $base_dir/deploy/samza
++tar -xvf $base_dir/target/hello-samza-0.14.0-dist.tar.gz -C $base_dir/deploy/samza
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/f4889274/gradle.properties
----------------------------------------------------------------------
diff --cc gradle.properties
index 8b71e61,f14b8f7..e207baa
--- a/gradle.properties
+++ b/gradle.properties
@@@ -17,7 -17,7 +17,7 @@@
* under the License.
*/
- SAMZA_VERSION=0.13.0
-SAMZA_VERSION=0.14.1-SNAPSHOT
++SAMZA_VERSION=0.14.0
KAFKA_VERSION=0.10.1.1
HADOOP_VERSION=2.6.1
http://git-wip-us.apache.org/repos/asf/samza-hello-samza/blob/f4889274/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index a933038,dbfe749..2065d7a
--- a/pom.xml
+++ b/pom.xml
@@@ -27,7 -27,7 +27,7 @@@ under the License
<groupId>org.apache.samza</groupId>
<artifactId>hello-samza</artifactId>
- <version>0.13.0</version>
- <version>0.14.1-SNAPSHOT</version>
++ <version>0.14.0</version>
<packaging>jar</packaging>
<name>Samza Example</name>
<description>
@@@ -148,7 -148,7 +153,7 @@@
<properties>
<!-- maven specific properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <samza.version>0.13.0</samza.version>
- <samza.version>0.14.1-SNAPSHOT</samza.version>
++ <samza.version>0.14.0</samza.version>
<hadoop.version>2.6.1</hadoop.version>
</properties>