Update versioning and librdkafka repo URL

Author: milindl

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "deps/librdkafka"]
 	path = deps/librdkafka
-	url = https://github.com/edenhill/librdkafka.git
+	url = https://github.com/confluentinc/librdkafka.git

INTRODUCTION.md

@@ -2,7 +2,7 @@
 
 ## Configuration
 
-You can pass many configuration options to `librdkafka`.  A full list can be found in `librdkafka`'s [Configuration.md](https://github.com/edenhill/librdkafka/blob/v2.3.0/CONFIGURATION.md)
+You can pass many configuration options to `librdkafka`.  A full list can be found in `librdkafka`'s [Configuration.md](https://github.com/confluentinc/librdkafka/blob/v2.3.0/CONFIGURATION.md)
 
 Configuration keys that have the suffix `_cb` are designated as callbacks. Some
 of these keys are informational and you can choose to opt-in (for example, `dr_cb`). Others are callbacks designed to
@@ -56,7 +56,7 @@ const producer = new Kafka.Producer({
 });
 ```
 
-A `Producer` requires only `metadata.broker.list` (the Kafka brokers) to be created.  The values in this list are separated by commas.  For other configuration options, see the [Configuration.md](https://github.com/edenhill/librdkafka/blob/v2.3.0/CONFIGURATION.md) file described previously.
+A `Producer` requires only `metadata.broker.list` (the Kafka brokers) to be created.  The values in this list are separated by commas.  For other configuration options, see the [Configuration.md](https://github.com/confluentinc/librdkafka/blob/v2.3.0/CONFIGURATION.md) file described previously.
 
 The following example illustrates a list with several `librdkafka` options set.
 
@@ -259,7 +259,7 @@ const consumer = new Kafka.KafkaConsumer({
 }, {});
 ```
 
-The first parameter is the global config, while the second parameter is the topic config that gets applied to all subscribed topics. To view a list of all supported configuration properties, see the [Configuration.md](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md) file described previously. Look for the `C` and `*` keys.
+The first parameter is the global config, while the second parameter is the topic config that gets applied to all subscribed topics. To view a list of all supported configuration properties, see the [Configuration.md](https://github.com/confluentinc/librdkafka/blob/master/CONFIGURATION.md) file described previously. Look for the `C` and `*` keys.
 
 The `group.id` and `metadata.broker.list` properties are required for a consumer.
 

ci/prepublish.js

@@ -1,5 +1,4 @@
 require('./checks/librdkafka-exists');
 require('./checks/librdkafka-correct-version');
 require('./librdkafka-defs-generator.js');
-// Temporarily disabled until we move to non-devel versions.
-// require('./update-version');
+require('./update-version');

ci/update-version.js

@@ -84,24 +84,15 @@ function getBranch(cb) {
 }
 
 function getPackageVersion(tag, branch) {
-  const baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
+  let baseVersion = `v${tag.major}.${tag.minor}.${tag.patch}`;
 
-  console.log(`Package version is "${baseVersion}"`);
-
-  // never publish with an suffix
-  // fixes https://github.com/confluentinc/confluent-kafka-javascript/issues/981
-  // baseVersion += '-';
-
-  // if (tag.commit === 0 && branch === 'master') {
-  //   return baseVersion;
-  // }
 
-  // if (branch !== 'master') {
-  //   baseVersion += (tag.commit + 1 + '.' + branch);
-  // } else {
-  //   baseVersion += (tag.commit + 1);
-  // }
+  // publish with a -devel suffix for EA and RC releases.
+  if (tag.prerelease.length > 0) {
+    baseVersion += '-' + tag.prerelease.join('-');
+  }
 
+  console.log(`Package version is "${baseVersion}"`);
   return baseVersion;
 }
 
@@ -114,7 +105,6 @@ getVersion((err, tag) => {
     if (err) {
       throw err;
     }
-
     pjs.version = getPackageVersion(tag, branch);
 
     fs.writeFileSync(pjsPath, JSON.stringify(pjs, null, 2));

lib/error.js

@@ -21,7 +21,7 @@ LibrdKafkaError.wrap = errorWrap;
  * Enum for identifying errors reported by the library
  *
  * You can find this list in the C++ code at
- * https://github.com/edenhill/librdkafka/blob/master/src-cpp/rdkafkacpp.h#L148
+ * https://github.com/confluentinc/librdkafka/blob/master/src-cpp/rdkafkacpp.h#L148
  *
  * @readonly
  * @enum {number}

lib/kafka-consumer.js

@@ -655,7 +655,7 @@ KafkaConsumer.prototype.getWatermarkOffsets = function(topic, partition) {
  *
  * enable.auto.offset.store must be set to false to use this API,
  *
- * @see https://github.com/edenhill/librdkafka/blob/261371dc0edef4cea9e58a076c8e8aa7dc50d452/src-cpp/rdkafkacpp.h#L1702
+ * @see https://github.com/confluentinc/librdkafka/blob/261371dc0edef4cea9e58a076c8e8aa7dc50d452/src-cpp/rdkafkacpp.h#L1702
  *
  * @param {Array.<TopicPartition>} topicPartitions - Topic partitions with offsets to store offsets for.
  * @throws {LibrdKafkaError} - Throws when there is no offset stored

lib/topic.js

@@ -17,7 +17,7 @@ var topicKeyLength = topicKey.length;
 // Take all of the topic special codes from librdkafka and add them
 // to the object
 // You can find this list in the C++ code at
-// https://github.com/edenhill/librdkafka/blob/master/src-cpp/rdkafkacpp.h#L1250
+// https://github.com/confluentinc/librdkafka/blob/master/src-cpp/rdkafkacpp.h#L1250
 for (var key in librdkafka.topic) {
   // Skip it if it doesn't start with ErrorCode
   if (key.indexOf('RdKafka::Topic::') !== 0) {

src/connection.cc

@@ -223,7 +223,7 @@ Baton Connection::GetMetadata(
     return Baton(metadata);
   } else {
     // metadata is not set here
-    // @see https://github.com/edenhill/librdkafka/blob/master/src-cpp/rdkafkacpp.h#L860
+    // @see https://github.com/confluentinc/librdkafka/blob/master/src-cpp/rdkafkacpp.h#L860
     return Baton(err);
   }
 }