You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by bo...@apache.org on 2021/02/05 02:06:32 UTC
[samza-hello-samza] branch master updated (ffcd2be -> 49463d2)
This is an automated email from the ASF dual-hosted git repository.
boryas pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/samza-hello-samza.git.
from ffcd2be Merge latest branch into master and set version to 1.5.0 (#80)
add f480fba Latest changes for 1.1.0
add a7b670d Bump version
add 1f54d08 Bump guava version
add 98ac848 Merge pull request #52 from dxichen/latest
add 8f22978 Updated latest branch to work with samza master (1.1.1-SNAPSHOT)
add a05bf22 [CHERRY-PICK] Kafka Download URL correction and version bump for ZK & Kafka
add 3684762 Making script work on RHEL-7/Linux because of https://arfore.com/2015/10/05/rhel7-and-ncat-changes/
add 0a16205 Updating after Bharath's scala 2.11 change, upgrading YARN version to match samza's yarn version
add 7f2f2bf Fixed build failure due to changes in Samza project (#63)
add eada343 SAMZA-2218: Add a Couchbase example to samza-hello-samza (#64)
add fd13056 SAMZA-2223: Update Couchbase example to use NoOpTableReadFunction
add d887371 Update dependencies to match OSS documentation
add bdcbd2d Merge pull request #68: Update dependencies to match OSS documentation
add 1b7522d Update POM to 1.4.0-SNAPSHOT as samza 1.3 has been published
add df59365 Upgrade gradle.properties
add 325ccfd Merge pull request #69 from kw2542/latest
add 751e03d SAMZA-2433: Use log4j2 in samza-hello-samza (#70)
add 158628a SAMZA-2437: Sample for producing to Azure Blob Storage (#71)
add 1baa029 add license for PageViewAvroRecord (#75)
add a3a8fe1 Sync latest branch with master (#76)
add 5d57c13 [Minor] updating latest branch to use 1.5.0-SNAPSHOT for samza version (#78)
add cbe4b08 Update doc and javadoc from config factory to config loader (#79)
add df86c11 SAMZA-2586: Update samza-hello-samza#latest to use 1.6.0-SNAPSHOT (#82)
new 49463d2 merge
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
bin/deploy.sh | 4 ++++
gradle.properties | 2 +-
pom.xml | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
[samza-hello-samza] 01/01: merge
Posted by bo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
boryas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza-hello-samza.git
commit 49463d2a0b1de832c5186a757eb40d1ffc4d1b24
Merge: ffcd2be df86c11
Author: Boris Shkolnik <bo...@apache.org>
AuthorDate: Thu Feb 4 18:01:13 2021 -0800
merge
bin/deploy.sh | 4 ++++
gradle.properties | 2 +-
pom.xml | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --cc bin/deploy.sh
index 84c3319,139c788..167333e
--- a/bin/deploy.sh
+++ b/bin/deploy.sh
@@@ -23,4 -23,4 +23,8 @@@ base_dir=`pwd
mvn clean package
mkdir -p $base_dir/deploy/samza
++<<<<<<< HEAD
+tar -xvf $base_dir/target/hello-samza-1.5.0-dist.tar.gz -C $base_dir/deploy/samza
++=======
+ tar -xvf $base_dir/target/hello-samza-1.5.0-SNAPSHOT-dist.tar.gz -C $base_dir/deploy/samza
++>>>>>>> origin/latest
diff --cc gradle.properties
index eac119f,ed6b46b..6435c33
--- a/gradle.properties
+++ b/gradle.properties
@@@ -17,7 -17,7 +17,7 @@@
* under the License.
*/
- SAMZA_VERSION=1.5.0
-SAMZA_VERSION=1.6.0-SNAPSHOT
++SAMZA_VERSION=1.6.0
KAFKA_VERSION=0.11.0.2
HADOOP_VERSION=2.7.1
diff --cc pom.xml
index 39d4915,f7a0d27..d7d83ca
--- 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>1.5.0</version>
- <version>1.6.0-SNAPSHOT</version>
++ <version>1.6.0</version>
<packaging>jar</packaging>
<name>Samza Example</name>
<description>
@@@ -294,7 -294,7 +294,7 @@@
<properties>
<!-- maven specific properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <samza.version>1.5.0</samza.version>
- <samza.version>1.6.0-SNAPSHOT</samza.version>
++ <samza.version>1.6.0</samza.version>
<hadoop.version>2.6.1</hadoop.version>
</properties>