Ottomata has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/230970

Change subject: 0.8.2.1-3 release - fix for snappy 1.1.1.6 bug
......................................................................

0.8.2.1-3 release - fix for snappy 1.1.1.6 bug

  * Snappy 1.1.1.6 is buggy!  Update to 1.1.1.7.
    https://issues.apache.org/jira/browse/KAFKA-2189

Change-Id: I663829c129e5be59bb2d60f5c686c1336ca23689
---
M debian/bin/kafka
M debian/changelog
M debian/kafka-common.install
R debian/lib/snappy-java-1.1.1.7.jar
M debian/rules
M debian/source/include-binaries
6 files changed, 11 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/kafka 
refs/changes/70/230970/1

diff --git a/debian/bin/kafka b/debian/bin/kafka
index 338325d..9263f34 100755
--- a/debian/bin/kafka
+++ b/debian/bin/kafka
@@ -163,7 +163,7 @@
 
     # Setting the classpath to all the needed dependencies.
     
SYSTEM_JARS=$SYS_CLASSDIR/asm3.jar:$SYS_CLASSDIR/cglib.jar:$SYS_CLASSDIR/commons-cli.jar:$SYS_CLASSDIR/commons-codec.jar:$SYS_CLASSDIR/commons-compress.jar:$SYS_CLASSDIR/commons-el.jar:$SYS_CLASSDIR/commons-httpclient.jar:$SYS_CLASSDIR/commons-io.jar:$SYS_CLASSDIR/commons-lang.jar:$SYS_CLASSDIR/commons-logging.jar:$SYS_CLASSDIR/commons-net.jar:$SYS_CLASSDIR/hsqldb.jar:$SYS_CLASSDIR/jackson-core.jar:$SYS_CLASSDIR/jackson-mapper.jar:$SYS_CLASSDIR/jets3t.jar:$SYS_CLASSDIR/jetty-util.jar:$SYS_CLASSDIR/jetty.jar:$SYS_CLASSDIR/joda-time.jar:$SYS_CLASSDIR/jsp-api-2.1.jar:$SYS_CLASSDIR/junit4.jar:$SYS_CLASSDIR/log4j-1.2.jar:$SYS_CLASSDIR/objenesis.jar:$SYS_CLASSDIR/oro.jar:$SYS_CLASSDIR/qdox.jar:$SYS_CLASSDIR/scala-library.jar:$SYS_CLASSDIR/servlet-api-2.5.jar:$SYS_CLASSDIR/velocity-1.7.jar:$SYS_CLASSDIR/zookeeper.jar
-    
KAFKA_LIB_JARS=$KAFKA_CLASSDIR/lib/avro-1.4.0.jar:$KAFKA_CLASSDIR/lib/commons-collections-2.1.1.jar.jar:$KAFKA_CLASSDIR/lib/easymock-3.0.jar:$KAFKA_CLASSDIR/lib/kafka-ganglia-1.0.0.jar:$KAFKA_CLASSDIR/lib/hadoop-core-0.20.2.jar:$KAFKA_CLASSDIR/lib/jasper-compiler-5.5.12.jar:$KAFKA_CLASSDIR/lib/jasper-runtime-5.5.12.jar:$KAFKA_CLASSDIR/lib/jopt-simple-3.2.jar:$KAFKA_CLASSDIR/lib/jsp-2.1-6.1.14.jar:$KAFKA_CLASSDIR/lib/jsp-api-2.1-6.1.14.jar:$KAFKA_CLASSDIR/lib/kfs-0.3.jar:$KAFKA_CLASSDIR/lib/lz4-1.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-annotation-2.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-core-2.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-ganglia-2.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-graphite-2.2.0.jar:$KAFKA_CLASSDIR/lib/paranamer-ant-2.2.jar:$KAFKA_CLASSDIR/lib/paranamer-generator-2.2.jar:$KAFKA_CLASSDIR/lib/paranamer-2.1.jar:$KAFKA_CLASSDIR/lib/pig-0.8.0.jar:$KAFKA_CLASSDIR/lib/piggybank-0.12.0.jar:$KAFKA_CLASSDIR/lib/scalatest-1.2.jar:$KAFKA_CLASSDIR/lib/slf4j-api-1.7.6.jar:$KAFKA_CLASSDIR/lib/slf4j-simple-1.7.6.jar:$KAFKA_CLASSDIR/lib/snappy-java-1.1.1.6.jar:$KAFKA_CLASSDIR/lib/xmlenc-0.52.jar:$KAFKA_CLASSDIR/lib/zkclient-0.3.jar
+    
KAFKA_LIB_JARS=$KAFKA_CLASSDIR/lib/avro-1.4.0.jar:$KAFKA_CLASSDIR/lib/commons-collections-2.1.1.jar.jar:$KAFKA_CLASSDIR/lib/easymock-3.0.jar:$KAFKA_CLASSDIR/lib/kafka-ganglia-1.0.0.jar:$KAFKA_CLASSDIR/lib/hadoop-core-0.20.2.jar:$KAFKA_CLASSDIR/lib/jasper-compiler-5.5.12.jar:$KAFKA_CLASSDIR/lib/jasper-runtime-5.5.12.jar:$KAFKA_CLASSDIR/lib/jopt-simple-3.2.jar:$KAFKA_CLASSDIR/lib/jsp-2.1-6.1.14.jar:$KAFKA_CLASSDIR/lib/jsp-api-2.1-6.1.14.jar:$KAFKA_CLASSDIR/lib/kfs-0.3.jar:$KAFKA_CLASSDIR/lib/lz4-1.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-annotation-2.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-core-2.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-ganglia-2.2.0.jar:$KAFKA_CLASSDIR/lib/metrics-graphite-2.2.0.jar:$KAFKA_CLASSDIR/lib/paranamer-ant-2.2.jar:$KAFKA_CLASSDIR/lib/paranamer-generator-2.2.jar:$KAFKA_CLASSDIR/lib/paranamer-2.1.jar:$KAFKA_CLASSDIR/lib/pig-0.8.0.jar:$KAFKA_CLASSDIR/lib/piggybank-0.12.0.jar:$KAFKA_CLASSDIR/lib/scalatest-1.2.jar:$KAFKA_CLASSDIR/lib/slf4j-api-1.7.6.jar:$KAFKA_CLASSDIR/lib/slf4j-simple-1.7.6.jar:$KAFKA_CLASSDIR/lib/snappy-java-1.1.1.7.jar:$KAFKA_CLASSDIR/lib/xmlenc-0.52.jar:$KAFKA_CLASSDIR/lib/zkclient-0.3.jar
     
KAFKA_JARS=$KAFKA_CLASSDIR/hadoop-consumer.jar:$KAFKA_CLASSDIR/hadoop-producer.jar:$KAFKA_CLASSDIR/kafka-clients.jar:$KAFKA_CLASSDIR/kafka.jar
 
     CLASSPATH=$CLASSPATH:$SYSTEM_JARS:$KAFKA_LIB_JARS:$KAFKA_JARS
diff --git a/debian/changelog b/debian/changelog
index af49dec..1cfafc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kafka (0.8.2.1-3) jessie-wikimedia; urgency=low
+
+  * Snappy 1.1.1.6 is buggy!  Update to 1.1.1.7.
+    https://issues.apache.org/jira/browse/KAFKA-2189
+
+ -- Andrew Otto (WMF) <[email protected]>  Tue, 11 Aug 2015 19:51:00 +0000
+
 kafka (0.8.2.1-2) jessie-wikimedia; urgency=low
 
   * Fix for wrong snappy-java dependency, update to 1.1.1.6
diff --git a/debian/kafka-common.install b/debian/kafka-common.install
index 8f368b2..5db0093 100644
--- a/debian/kafka-common.install
+++ b/debian/kafka-common.install
@@ -21,7 +21,7 @@
 debian/lib/scalatest-1.2.jar usr/share/kafka/lib
 debian/lib/slf4j-api-1.7.6.jar usr/share/kafka/lib
 debian/lib/slf4j-simple-1.7.6.jar usr/share/kafka/lib
-debian/lib/snappy-java-1.1.1.6.jar usr/share/kafka/lib
+debian/lib/snappy-java-1.1.1.7.jar usr/share/kafka/lib
 debian/lib/xmlenc-0.52.jar usr/share/kafka/lib
 debian/lib/zkclient-0.3.jar usr/share/kafka/lib
 debian/lib/kafka-ganglia-1.0.0.jar usr/share/kafka/lib
diff --git a/debian/lib/snappy-java-1.1.1.6.jar 
b/debian/lib/snappy-java-1.1.1.7.jar
similarity index 90%
rename from debian/lib/snappy-java-1.1.1.6.jar
rename to debian/lib/snappy-java-1.1.1.7.jar
index 11502d8..2bbd1fc 100644
--- a/debian/lib/snappy-java-1.1.1.6.jar
+++ b/debian/lib/snappy-java-1.1.1.7.jar
Binary files differ
diff --git a/debian/rules b/debian/rules
index ad53e2b..b095cc8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 export VERSION=0.8.2.1
 
 # Put build dependency jars here.
-export 
CLASSPATH=/usr/share/java/asm3.jar:/usr/share/java/cglib.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-compress.jar:/usr/share/java/commons-el.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-logging.jar:/usr/share/java/commons-net.jar:/usr/share/java/hsqldb.jar:/usr/share/java/jackson-core.jar:/usr/share/java/jackson-mapper.jar:/usr/share/java/jets3t.jar:/usr/share/java/jetty-util.jar:/usr/share/java/jetty.jar:/usr/share/java/joda-time.jar:/usr/share/java/jsp-api-2.1.jar:/usr/share/java/junit4.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/objenesis.jar:/usr/share/java/oro.jar:/usr/share/java/qdox.jar:/usr/share/java/scala-library.jar:/usr/share/java/servlet-api-2.5.jar:/usr/share/java/velocity-1.7.jar:/usr/share/java/zookeeper.jar:$(CURDIR)/debian/lib/avro-1.4.0.jar:$(CURDIR)/debian/lib/commons-collections-2.1.1.jar.jar:$(CURDIR)/debian/lib/easymock-3.0.jar:$(CURDIR)/debian/lib/hadoop-core-0.20.2.jar:$(CURDIR)/debian/lib/jasper-compiler-5.5.12.jar:$(CURDIR)/debian/lib/jasper-runtime-5.5.12.jar:$(CURDIR)/debian/lib/jopt-simple-3.2.jar:$(CURDIR)/debian/lib/jsp-2.1-6.1.14.jar:$(CURDIR)/debian/lib/jsp-api-2.1-6.1.14.jar:$(CURDIR)/debian/lib/kfs-0.3.jar:$(CURDIR)/debian/lib/lz4-1.2.0.jar:$(CURDIR)/debian/lib/metrics-annotation-2.2.0.jar:$(CURDIR)/debian/lib/metrics-core-2.2.0.jar:$(CURDIR)/debian/lib/metrics-ganglia-2.2.0.jar:$(CURDIR)/debian/lib/metrics-graphite-2.2.0.jar:$(CURDIR)/debian/lib/paranamer-ant-2.2.jar:$(CURDIR)/debian/lib/paranamer-generator-2.2.jar:$(CURDIR)/debian/lib/paranamer-2.1.jar:$(CURDIR)/debian/lib/pig-0.8.0.jar:$(CURDIR)/debian/lib/piggybank-0.12.0.jar:$(CURDIR)/debian/lib/scalatest-1.2.jar:$(CURDIR)/debian/lib/slf4j-api-1.7.6.jar:$(CURDIR)/debian/lib/slf4j-simple-1.7.6.jar:$(CURDIR)/debian/lib/snappy-java-1.1.1.6.jar:$(CURDIR)/debian/lib/xmlenc-0.52.jar:$(CURDIR)/debian/lib/zkclient-0.3.jar
+export 
CLASSPATH=/usr/share/java/asm3.jar:/usr/share/java/cglib.jar:/usr/share/java/commons-cli.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-compress.jar:/usr/share/java/commons-el.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/commons-io.jar:/usr/share/java/commons-lang.jar:/usr/share/java/commons-logging.jar:/usr/share/java/commons-net.jar:/usr/share/java/hsqldb.jar:/usr/share/java/jackson-core.jar:/usr/share/java/jackson-mapper.jar:/usr/share/java/jets3t.jar:/usr/share/java/jetty-util.jar:/usr/share/java/jetty.jar:/usr/share/java/joda-time.jar:/usr/share/java/jsp-api-2.1.jar:/usr/share/java/junit4.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/objenesis.jar:/usr/share/java/oro.jar:/usr/share/java/qdox.jar:/usr/share/java/scala-library.jar:/usr/share/java/servlet-api-2.5.jar:/usr/share/java/velocity-1.7.jar:/usr/share/java/zookeeper.jar:$(CURDIR)/debian/lib/avro-1.4.0.jar:$(CURDIR)/debian/lib/commons-collections-2.1.1.jar.jar:$(CURDIR)/debian/lib/easymock-3.0.jar:$(CURDIR)/debian/lib/hadoop-core-0.20.2.jar:$(CURDIR)/debian/lib/jasper-compiler-5.5.12.jar:$(CURDIR)/debian/lib/jasper-runtime-5.5.12.jar:$(CURDIR)/debian/lib/jopt-simple-3.2.jar:$(CURDIR)/debian/lib/jsp-2.1-6.1.14.jar:$(CURDIR)/debian/lib/jsp-api-2.1-6.1.14.jar:$(CURDIR)/debian/lib/kfs-0.3.jar:$(CURDIR)/debian/lib/lz4-1.2.0.jar:$(CURDIR)/debian/lib/metrics-annotation-2.2.0.jar:$(CURDIR)/debian/lib/metrics-core-2.2.0.jar:$(CURDIR)/debian/lib/metrics-ganglia-2.2.0.jar:$(CURDIR)/debian/lib/metrics-graphite-2.2.0.jar:$(CURDIR)/debian/lib/paranamer-ant-2.2.jar:$(CURDIR)/debian/lib/paranamer-generator-2.2.jar:$(CURDIR)/debian/lib/paranamer-2.1.jar:$(CURDIR)/debian/lib/pig-0.8.0.jar:$(CURDIR)/debian/lib/piggybank-0.12.0.jar:$(CURDIR)/debian/lib/scalatest-1.2.jar:$(CURDIR)/debian/lib/slf4j-api-1.7.6.jar:$(CURDIR)/debian/lib/slf4j-simple-1.7.6.jar:$(CURDIR)/debian/lib/snappy-java-1.1.1.7.jar:$(CURDIR)/debian/lib/xmlenc-0.52.jar:$(CURDIR)/debian/lib/zkclient-0.3.jar
 
 %:
        dh $@ --with javahelper
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 1277ac5..baf50fe 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -21,7 +21,7 @@
 debian/lib/scalatest-1.2.jar
 debian/lib/slf4j-api-1.7.6.jar
 debian/lib/slf4j-simple-1.7.6.jar
-debian/lib/snappy-java-1.1.1.6.jar
+debian/lib/snappy-java-1.1.1.7.jar
 debian/lib/xmlenc-0.52.jar
 debian/lib/zkclient-0.3.jar
 debian/lib/kafka-ganglia-1.0.0.jar

-- 
To view, visit https://gerrit.wikimedia.org/r/230970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I663829c129e5be59bb2d60f5c686c1336ca23689
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/kafka
Gerrit-Branch: debian
Gerrit-Owner: Ottomata <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to