SAMZA-1099: Changes to hello-samza (latest branch) for the 0.12 release
diff --git a/bin/grid b/bin/grid
index 74ee026..ec9d210 100755
--- a/bin/grid
+++ b/bin/grid
@@ -35,7 +35,7 @@
COMMAND=$1
SYSTEM=$2
-DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.8.2.1/kafka_2.10-0.8.2.1.tgz
+DOWNLOAD_KAFKA=http://www.us.apache.org/dist/kafka/0.10.0.1/kafka_2.11-0.10.0.1.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
@@ -74,7 +74,7 @@
git clone git://git.apache.org/samza.git
cd samza
fi
- ./gradlew -PscalaVersion=2.10 clean publishToMavenLocal
+ ./gradlew -PscalaVersion=2.11 clean publishToMavenLocal
popd
}
@@ -96,7 +96,7 @@
install_kafka() {
mkdir -p "$DEPLOY_ROOT_DIR"
- install kafka $DOWNLOAD_KAFKA kafka_2.10-0.8.2.1
+ install kafka $DOWNLOAD_KAFKA kafka_2.11-0.10.0.1
# 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
diff --git a/build.gradle b/build.gradle
index e838b18..40505ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,17 +46,17 @@
compile(group: 'org.slf4j', name: 'slf4j-log4j12', version: "$SLF4J_VERSION")
compile(group: 'org.schwering', name: 'irclib', version: '1.10')
compile(group: 'org.apache.samza', name: 'samza-api', version: "$SAMZA_VERSION")
- compile(group: 'org.apache.samza', name: 'samza-kv_2.10', version: "$SAMZA_VERSION")
+ compile(group: 'org.apache.samza', name: 'samza-kv_2.11', version: "$SAMZA_VERSION")
explode (group: 'org.apache.samza', name: 'samza-shell', ext: 'tgz', classifier: 'dist', version: "$SAMZA_VERSION")
- runtime(group: 'org.apache.samza', name: 'samza-core_2.10', version: "$SAMZA_VERSION")
+ runtime(group: 'org.apache.samza', name: 'samza-core_2.11', version: "$SAMZA_VERSION")
runtime(group: 'org.apache.samza', name: 'samza-log4j', version: "$SAMZA_VERSION")
runtime(group: 'org.apache.samza', name: 'samza-shell', version: "$SAMZA_VERSION")
- runtime(group: 'org.apache.samza', name: 'samza-yarn_2.10', version: "$SAMZA_VERSION")
- runtime(group: 'org.apache.samza', name: 'samza-kv-rocksdb_2.10', version: "$SAMZA_VERSION")
- runtime(group: 'org.apache.samza', name: 'samza-kafka_2.10', version: "$SAMZA_VERSION")
- runtime(group: 'org.apache.kafka', name: 'kafka_2.10', version: "$KAFKA_VERSION")
+ runtime(group: 'org.apache.samza', name: 'samza-yarn_2.11', version: "$SAMZA_VERSION")
+ runtime(group: 'org.apache.samza', name: 'samza-kv-rocksdb_2.11', version: "$SAMZA_VERSION")
+ runtime(group: 'org.apache.samza', name: 'samza-kafka_2.11', version: "$SAMZA_VERSION")
+ runtime(group: 'org.apache.kafka', name: 'kafka_2.11', version: "$KAFKA_VERSION")
runtime(group: 'org.apache.hadoop', name: 'hadoop-hdfs', version: "$HADOOP_VERSION")
}
diff --git a/gradle.properties b/gradle.properties
index 3d8a0ea..1bc7633 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,8 +17,8 @@
* under the License.
*/
-SAMZA_VERSION=0.11.1-SNAPSHOT
-KAFKA_VERSION=0.8.2.1
+SAMZA_VERSION=0.13.0-SNAPSHOT
+KAFKA_VERSION=0.10.0.1
HADOOP_VERSION=2.6.1
SLF4J_VERSION = 1.7.7
diff --git a/pom.xml b/pom.xml
index d90b1f9..100b2b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
<groupId>org.apache.samza</groupId>
<artifactId>hello-samza</artifactId>
- <version>0.11.1</version>
+ <version>0.13.0</version>
<packaging>jar</packaging>
<name>Samza Example</name>
<description>
@@ -43,7 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.samza</groupId>
- <artifactId>samza-core_2.10</artifactId>
+ <artifactId>samza-core_2.11</artifactId>
<version>${samza.version}</version>
</dependency>
<dependency>
@@ -60,28 +60,28 @@
</dependency>
<dependency>
<groupId>org.apache.samza</groupId>
- <artifactId>samza-yarn_2.10</artifactId>
+ <artifactId>samza-yarn_2.11</artifactId>
<version>${samza.version}</version>
</dependency>
<dependency>
<groupId>org.apache.samza</groupId>
- <artifactId>samza-kv_2.10</artifactId>
+ <artifactId>samza-kv_2.11</artifactId>
<version>${samza.version}</version>
</dependency>
<dependency>
<groupId>org.apache.samza</groupId>
- <artifactId>samza-kv-rocksdb_2.10</artifactId>
+ <artifactId>samza-kv-rocksdb_2.11</artifactId>
<version>${samza.version}</version>
</dependency>
<dependency>
<groupId>org.apache.samza</groupId>
- <artifactId>samza-kafka_2.10</artifactId>
+ <artifactId>samza-kafka_2.11</artifactId>
<version>${samza.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.10</artifactId>
- <version>0.8.2.1</version>
+ <artifactId>kafka_2.11</artifactId>
+ <version>0.10.0.1</version>
</dependency>
<dependency>
<groupId>org.schwering</groupId>
@@ -143,7 +143,7 @@
<properties>
<!-- maven specific properties -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <samza.version>0.11.1-SNAPSHOT</samza.version>
+ <samza.version>0.13.0-SNAPSHOT</samza.version>
<hadoop.version>2.6.1</hadoop.version>
</properties>
diff --git a/src/main/assembly/src.xml b/src/main/assembly/src.xml
index f57fee2..3f2e4a8 100644
--- a/src/main/assembly/src.xml
+++ b/src/main/assembly/src.xml
@@ -64,14 +64,14 @@
<dependencySet>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>org.apache.samza:samza-core_2.10</include>
- <include>org.apache.samza:samza-kafka_2.10</include>
- <include>org.apache.samza:samza-yarn_2.10</include>
- <include>org.apache.samza:samza-kv-rocksdb_2.10</include>
+ <include>org.apache.samza:samza-core_2.11</include>
+ <include>org.apache.samza:samza-kafka_2.11</include>
+ <include>org.apache.samza:samza-yarn_2.11</include>
+ <include>org.apache.samza:samza-kv-rocksdb_2.11</include>
<include>org.apache.samza:samza-log4j</include>
<include>org.apache.samza:hello-samza</include>
<include>org.slf4j:slf4j-log4j12</include>
- <include>org.apache.kafka:kafka_2.10</include>
+ <include>org.apache.kafka:kafka_2.11</include>
<include>org.apache.hadoop:hadoop-hdfs</include>
</includes>
<useTransitiveFiltering>true</useTransitiveFiltering>
