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 <[email protected]> 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>
