From 8bcc586906a58f0143270248f9c35807cae78c1d Mon Sep 17 00:00:00 2001 From: Cristiano Balducci Date: Wed, 21 Nov 2018 16:03:59 +0000 Subject: [PATCH 1/4] Bump kafka version, 10.2.1 is not available anymore --- bin/grid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/grid b/bin/grid index f31824ba..d44de0c9 100755 --- a/bin/grid +++ b/bin/grid @@ -35,7 +35,7 @@ DOWNLOAD_CACHE_DIR=$HOME/.samza/download COMMAND=$1 SYSTEM=$2 -DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.10.2.1/kafka_2.11-0.10.2.1.tgz +DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.10.2.2/kafka_2.11-0.10.2.2.tgz DOWNLOAD_YARN=https://archive.apache.org/dist/hadoop/common/hadoop-2.6.1/hadoop-2.6.1.tar.gz DOWNLOAD_ZOOKEEPER=http://archive.apache.org/dist/zookeeper/zookeeper-3.4.3/zookeeper-3.4.3.tar.gz @@ -112,7 +112,7 @@ install_yarn() { install_kafka() { mkdir -p "$DEPLOY_ROOT_DIR" - install kafka $DOWNLOAD_KAFKA kafka_2.11-0.10.2.1 + install kafka $DOWNLOAD_KAFKA kafka_2.11-0.10.2.2 # 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 From 2df92b42c492a09590f2d80458d8246f3d4d62d0 Mon Sep 17 00:00:00 2001 From: Cristiano Balducci Date: Wed, 21 Nov 2018 16:04:27 +0000 Subject: [PATCH 2/4] Add samza-sql dependency --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 2065d7a8..0cb8eb5c 100644 --- a/pom.xml +++ b/pom.xml @@ -41,6 +41,11 @@ under the License. samza-api ${samza.version} + + org.apache.samza + samza-sql + ${samza.version} + org.apache.samza samza-azure From bd3ba59b77306ab66990419fcdcd6919d946b810 Mon Sep 17 00:00:00 2001 From: Cristiano Balducci Date: Wed, 21 Nov 2018 16:22:36 +0000 Subject: [PATCH 3/4] Add license to satisfy rat requirements --- .../samza/examples/avro/AvroSerDeFactory.java | 20 +++++++++++++++++++ .../cookbook/PageViewFilterSqlApp.java | 20 +++++++++++++++++++ src/main/schemas/PageViewStream.avsc | 19 ++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/src/main/java/samza/examples/avro/AvroSerDeFactory.java b/src/main/java/samza/examples/avro/AvroSerDeFactory.java index c96eeddf..02cb2f93 100644 --- a/src/main/java/samza/examples/avro/AvroSerDeFactory.java +++ b/src/main/java/samza/examples/avro/AvroSerDeFactory.java @@ -1,5 +1,25 @@ package samza.examples.avro; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + import java.io.ByteArrayOutputStream; import java.io.IOException; import org.apache.avro.Schema; diff --git a/src/main/java/samza/examples/cookbook/PageViewFilterSqlApp.java b/src/main/java/samza/examples/cookbook/PageViewFilterSqlApp.java index de01969d..b2c8e473 100644 --- a/src/main/java/samza/examples/cookbook/PageViewFilterSqlApp.java +++ b/src/main/java/samza/examples/cookbook/PageViewFilterSqlApp.java @@ -1,5 +1,25 @@ package samza.examples.cookbook; +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + + import java.io.File; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/schemas/PageViewStream.avsc b/src/main/schemas/PageViewStream.avsc index 54936f78..2ae86d7e 100644 --- a/src/main/schemas/PageViewStream.avsc +++ b/src/main/schemas/PageViewStream.avsc @@ -1,3 +1,22 @@ +/* +* Licensed to the Apache Software Foundation (ASF) under one +* or more contributor license agreements. See the NOTICE file +* distributed with this work for additional information +* regarding copyright ownership. The ASF licenses this file +* to you under the Apache License, Version 2.0 (the +* "License"); you may not use this file except in compliance +* with the License. You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, +* software distributed under the License is distributed on an +* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +* KIND, either express or implied. See the License for the +* specific language governing permissions and limitations +* under the License. +*/ + { "name": "PageViewEvent", "version" : 1, From 6d6abde17bd971049614ef917b73f22102f6e5a9 Mon Sep 17 00:00:00 2001 From: Cristiano Balducci Date: Wed, 21 Nov 2018 16:23:00 +0000 Subject: [PATCH 4/4] Bump rat version --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 0cb8eb5c..28a58b9b 100644 --- a/pom.xml +++ b/pom.xml @@ -224,7 +224,7 @@ under the License. org.apache.rat apache-rat-plugin - 0.9 + 0.13 *.patch @@ -262,7 +262,7 @@ under the License. org.apache.rat apache-rat-plugin - 0.9 + 0.13 test