Skip to content

Commit

Permalink
Update copyright notice of files changed (#4327)
Browse files Browse the repository at this point in the history
with PRs started in 2023, global copyright notice,
support email, github links
  • Loading branch information
emasab authored Jun 29, 2023
1 parent 2759b34 commit 49f05db
Show file tree
Hide file tree
Showing 358 changed files with 486 additions and 415 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Read the FAQ first: https://github.com/edenhill/librdkafka/wiki/FAQ
Read the FAQ first: https://github.com/confluentinc/librdkafka/wiki/FAQ

Do NOT create issues for questions, use the discussion forum: https://github.com/edenhill/librdkafka/discussions
Do NOT create issues for questions, use the discussion forum: https://github.com/confluentinc/librdkafka/discussions



Expand All @@ -14,7 +14,7 @@ How to reproduce
<your steps how to reproduce goes here, or remove section if not relevant>


**IMPORTANT**: Always try to reproduce the issue on the latest released version (see https://github.com/edenhill/librdkafka/releases), if it can't be reproduced on the latest version the issue has been fixed.
**IMPORTANT**: Always try to reproduce the issue on the latest released version (see https://github.com/confluentinc/librdkafka/releases), if it can't be reproduced on the latest version the issue has been fixed.


Checklist
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ librdkafka v1.8.0 is a security release:
* Upgrade bundled zlib version from 1.2.8 to 1.2.11 in the `librdkafka.redist`
NuGet package. The updated zlib version fixes CVEs:
CVE-2016-9840, CVE-2016-9841, CVE-2016-9842, CVE-2016-9843
See https://github.com/edenhill/librdkafka/issues/2934 for more information.
See https://github.com/confluentinc/librdkafka/issues/2934 for more information.
* librdkafka now uses [vcpkg](https://vcpkg.io/) for up-to-date Windows
dependencies in the `librdkafka.redist` NuGet package:
OpenSSL 1.1.1l, zlib 1.2.11, zstd 1.5.0.
Expand Down Expand Up @@ -1332,4 +1332,4 @@ v1.4.2 is a maintenance release with the following fixes and enhancements:

# Older releases

See https://github.com/edenhill/librdkafka/releases
See https://github.com/confluentinc/librdkafka/releases
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at rdkafka@edenhill.se. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at cloud-support@confluent.io. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ For more information on the test suite see [tests/README.md].

## How to get your changes into the main sources

File a [pull request on github](https://github.com/edenhill/librdkafka/pulls)
File a [pull request on github](https://github.com/confluentinc/librdkafka/pulls)

Your change will be reviewed and discussed there and you will be
expected to correct flaws pointed out and update accordingly, or the change
Expand Down
10 changes: 5 additions & 5 deletions Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -1210,21 +1210,21 @@ DOCSET_FEEDNAME = "librdkafka documentation"
# The default value is: org.doxygen.Project.
# This tag requires that the tag GENERATE_DOCSET is set to YES.

DOCSET_BUNDLE_ID = se.edenhill.librdkafka
DOCSET_BUNDLE_ID = io.confluent.librdkafka

# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
# the documentation publisher. This should be a reverse domain-name style
# string, e.g. com.mycompany.MyDocSet.documentation.
# The default value is: org.doxygen.Publisher.
# This tag requires that the tag GENERATE_DOCSET is set to YES.

DOCSET_PUBLISHER_ID = se.edenhill
DOCSET_PUBLISHER_ID = io.confluent

# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
# The default value is: Publisher.
# This tag requires that the tag GENERATE_DOCSET is set to YES.

DOCSET_PUBLISHER_NAME = Magnus Edenhill
DOCSET_PUBLISHER_NAME = Confluent Inc.

# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
Expand Down Expand Up @@ -1309,7 +1309,7 @@ QCH_FILE =
# The default value is: org.doxygen.Project.
# This tag requires that the tag GENERATE_QHP is set to YES.

QHP_NAMESPACE = se.edenhill.librdkafka
QHP_NAMESPACE = io.confluent.librdkafka

# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
# Help Project output. For more information please see Qt Help Project / Virtual
Expand Down Expand Up @@ -1368,7 +1368,7 @@ GENERATE_ECLIPSEHELP = NO
# The default value is: org.doxygen.Project.
# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.

ECLIPSE_DOC_ID = se.edenhill.librdkafka
ECLIPSE_DOC_ID = io.confluent.librdkafka

# If you want full control over the layout of the generated HTML pages it might
# be necessary to disable the index and replace it with your own. The
Expand Down
9 changes: 2 additions & 7 deletions INTRODUCTION.md
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ soon as possible.
Lower buffering time leads to smaller batches and larger per-message overheads,
increasing network, memory and CPU usage for producers, brokers and consumers.

See [How to decrease message latency](https://github.com/edenhill/librdkafka/wiki/How-to-decrease-message-latency) for more info.
See [How to decrease message latency](https://github.com/confluentinc/librdkafka/wiki/How-to-decrease-message-latency) for more info.


#### Latency measurement
Expand Down Expand Up @@ -2062,9 +2062,4 @@ librdkafka (file a github pull request).

## Community support

You are welcome to direct your users to
[librdkafka's Gitter chat room](http://gitter.im/edenhill/librdkafka) as long as
you monitor the conversions in there to pick up questions specific to your
bindings.
But for the most part user questions are usually generic enough to apply to all
librdkafka bindings.
Community support is offered through GitHub Issues and Discussions.
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
librdkafka - Apache Kafka C driver library

Copyright (c) 2012-2020, Magnus Edenhill
Copyright (c) 2012-2022, Magnus Edenhill
2023, Confluent Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
3 changes: 2 additions & 1 deletion LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ LICENSE
--------------------------------------------------------------
librdkafka - Apache Kafka C driver library

Copyright (c) 2012-2020, Magnus Edenhill
Copyright (c) 2012-2022, Magnus Edenhill
2023 Confluent Inc.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
25 changes: 13 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ librdkafka - the Apache Kafka C/C++ client library
==================================================

Copyright (c) 2012-2022, [Magnus Edenhill](http://www.edenhill.se/).
2023 [Confluent Inc.](https://www.confluent.io/).

[https://github.com/edenhill/librdkafka](https://github.com/edenhill/librdkafka)
[https://github.com/confluentinc/librdkafka](https://github.com/confluentinc/librdkafka)

**librdkafka** is a C library implementation of the
[Apache Kafka](https://kafka.apache.org/) protocol, providing Producer, Consumer
Expand All @@ -25,8 +26,8 @@ affiliation with and is not endorsed by The Apache Software Foundation.
* Simple (legacy) consumer
* Admin client
* Compression: snappy, gzip, lz4, zstd
* [SSL](https://github.com/edenhill/librdkafka/wiki/Using-SSL-with-librdkafka) support
* [SASL](https://github.com/edenhill/librdkafka/wiki/Using-SASL-with-librdkafka) (GSSAPI/Kerberos/SSPI, PLAIN, SCRAM, OAUTHBEARER) support
* [SSL](https://github.com/confluentinc/librdkafka/wiki/Using-SSL-with-librdkafka) support
* [SASL](https://github.com/confluentinc/librdkafka/wiki/Using-SASL-with-librdkafka) (GSSAPI/Kerberos/SSPI, PLAIN, SCRAM, OAUTHBEARER) support
* Full list of [supported KIPs](INTRODUCTION.md#supported-kips)
* Broker version support: >=0.8 (see [Broker version compatibility](INTRODUCTION.md#broker-version-compatibility))
* Guaranteed API stability for C & C++ APIs (ABI safety guaranteed for C)
Expand All @@ -39,14 +40,14 @@ affiliation with and is not endorsed by The Apache Software Foundation.
# Documentation

* Public API in [C header](src/rdkafka.h) and [C++ header](src-cpp/rdkafkacpp.h).
* Introduction and manual in [INTRODUCTION.md](https://github.com/edenhill/librdkafka/blob/master/INTRODUCTION.md).
* Introduction and manual in [INTRODUCTION.md](https://github.com/confluentinc/librdkafka/blob/master/INTRODUCTION.md).
* Configuration properties in
[CONFIGURATION.md](https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md).
* Statistics metrics in [STATISTICS.md](https://github.com/edenhill/librdkafka/blob/master/STATISTICS.md).
* [Frequently asked questions](https://github.com/edenhill/librdkafka/wiki).
[CONFIGURATION.md](https://github.com/confluentinc/librdkafka/blob/master/CONFIGURATION.md).
* Statistics metrics in [STATISTICS.md](https://github.com/confluentinc/librdkafka/blob/master/STATISTICS.md).
* [Frequently asked questions](https://github.com/confluentinc/librdkafka/wiki).
* Step-by-step tutorial [Getting Started with Apache Kafka and C/C++](https://developer.confluent.io/get-started/c/).

**NOTE**: The `master` branch is actively developed, use latest [release](https://github.com/edenhill/librdkafka/releases) for production use.
**NOTE**: The `master` branch is actively developed, use latest [release](https://github.com/confluentinc/librdkafka/releases) for production use.


# Installation
Expand Down Expand Up @@ -160,11 +161,11 @@ Commercial support is available from [Confluent Inc](https://www.confluent.io/)

## Community support

**Only the [latest official release](https://github.com/edenhill/librdkafka/releases) is supported for community members.**
**Only the [latest official release](https://github.com/confluentinc/librdkafka/releases) is supported for community members.**

File bug reports and feature requests using [GitHub Issues](https://github.com/edenhill/librdkafka/issues).
File bug reports and feature requests using [GitHub Issues](https://github.com/confluentinc/librdkafka/issues).

Questions and discussions are welcome on the [Discussions](https://github.com/edenhill/librdkafka/discussions) forum, and on the [Confluent Community slack](https://launchpass.com/confluentcommunity) #clients channel.
Questions and discussions are welcome on the [Discussions](https://github.com/confluentinc/librdkafka/discussions) forum, and on the [Confluent Community slack](https://launchpass.com/confluentcommunity) #clients channel.


# Language bindings #
Expand Down Expand Up @@ -195,4 +196,4 @@ Questions and discussions are welcome on the [Discussions](https://github.com/ed
* Swift: [Perfect-Kafka](https://github.com/PerfectlySoft/Perfect-Kafka)


See [Powered by librdkafka](https://github.com/edenhill/librdkafka/wiki/Powered-by-librdkafka) for an incomplete list of librdkafka users.
See [Powered by librdkafka](https://github.com/confluentinc/librdkafka/wiki/Powered-by-librdkafka) for an incomplete list of librdkafka users.
2 changes: 1 addition & 1 deletion configure.self
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
mkl_meta_set "description" "name" "librdkafka"
mkl_meta_set "description" "oneline" "The Apache Kafka C/C++ library"
mkl_meta_set "description" "long" "Full Apache Kafka protocol support, including producer and consumer"
mkl_meta_set "description" "copyright" "Copyright (c) 2012-2019 Magnus Edenhill"
mkl_meta_set "description" "copyright" "Copyright (c) 2012-2022, Magnus Edenhill, 2023, Confluent Inc."

# Enable generation of pkg-config .pc file
mkl_mkvar_set "" GEN_PKG_CONFIG y
Expand Down
2 changes: 1 addition & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Uploaders: Christos Trochalakis <ctrochalakis@debian.org>
Build-Depends: debhelper (>= 9), zlib1g-dev, libssl-dev, libsasl2-dev, liblz4-dev, python3
Standards-Version: 3.9.7
Section: libs
Homepage: https://github.com/edenhill/librdkafka
Homepage: https://github.com/confluentinc/librdkafka
Vcs-Git: https://anonscm.debian.org/cgit/pkg-kafka/librdkafka.git -b debian
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kafka/librdkafka.git

Expand Down
6 changes: 3 additions & 3 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: librdkafka
Source: https://github.com/edenhill/librdkafka
Source: https://github.com/confluentinc/librdkafka

License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
Expand All @@ -25,7 +25,7 @@ License: BSD-2-clause
POSSIBILITY OF SUCH DAMAGE.

Files: *
Copyright: 2012-2015, Magnus Edenhill
Copyright: 2012-2022, Magnus Edenhill; 2023, Confluent Inc.
License: BSD-2-clause

Files: src/rdcrc32.c src/rdcrc32.h
Expand All @@ -40,7 +40,7 @@ License: MIT
.
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
.
.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand Down
2 changes: 1 addition & 1 deletion debian/watch
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=3
https://github.com/edenhill/librdkafka/tags .*/v?(\d[\d\.]*)\.tar\.gz
https://github.com/confluentinc/librdkafka/tags .*/v?(\d[\d\.]*)\.tar\.gz
2 changes: 1 addition & 1 deletion dev-conf.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# librdkafka - Apache Kafka C library
#
# Copyright (c) 2018 Magnus Edenhill
# Copyright (c) 2018-2022, Magnus Edenhill
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Expand Down
5 changes: 3 additions & 2 deletions examples/consumer.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2019, Magnus Edenhill
* Copyright (c) 2019-2022, Magnus Edenhill
* 2023, Confluent Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -29,7 +30,7 @@
/**
* Simple high-level balanced Apache Kafka consumer
* using the Kafka driver from librdkafka
* (https://github.com/edenhill/librdkafka)
* (https://github.com/confluentinc/librdkafka)
*/

#include <stdio.h>
Expand Down
2 changes: 1 addition & 1 deletion examples/delete_records.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2020, Magnus Edenhill
* Copyright (c) 2020-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/idempotent_producer.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2019, Magnus Edenhill
* Copyright (c) 2019-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion examples/openssl_engine_example.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2021, Magnus Edenhill
* Copyright (c) 2021-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
4 changes: 2 additions & 2 deletions examples/producer.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2017, Magnus Edenhill
* Copyright (c) 2017-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -29,7 +29,7 @@
/**
* Simple Apache Kafka producer
* using the Kafka driver from librdkafka
* (https://github.com/edenhill/librdkafka)
* (https://github.com/confluentinc/librdkafka)
*/

#include <stdio.h>
Expand Down
4 changes: 2 additions & 2 deletions examples/producer.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2019, Magnus Edenhill
* Copyright (c) 2019-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -29,7 +29,7 @@
/**
* Apache Kafka producer
* using the Kafka driver from librdkafka
* (https://github.com/edenhill/librdkafka)
* (https://github.com/confluentinc/librdkafka)
*/

#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions examples/rdkafka_complex_consumer_example.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2015, Magnus Edenhill
* Copyright (c) 2015-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -29,7 +29,7 @@
/**
* Apache Kafka high level consumer example program
* using the Kafka driver from librdkafka
* (https://github.com/edenhill/librdkafka)
* (https://github.com/confluentinc/librdkafka)
*/

#include <ctype.h>
Expand Down
4 changes: 2 additions & 2 deletions examples/rdkafka_complex_consumer_example.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2014, Magnus Edenhill
* Copyright (c) 2014-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -29,7 +29,7 @@
/**
* Apache Kafka consumer & producer example programs
* using the Kafka driver from librdkafka
* (https://github.com/edenhill/librdkafka)
* (https://github.com/confluentinc/librdkafka)
*/

#include <iostream>
Expand Down
4 changes: 2 additions & 2 deletions examples/rdkafka_consume_batch.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* librdkafka - Apache Kafka C library
*
* Copyright (c) 2018, Magnus Edenhill
* Copyright (c) 2018-2022, Magnus Edenhill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down Expand Up @@ -29,7 +29,7 @@
/**
* Apache Kafka consumer & producer example programs
* using the Kafka driver from librdkafka
* (https://github.com/edenhill/librdkafka)
* (https://github.com/confluentinc/librdkafka)
*
* This example shows how to read batches of messages.
* Note that messages are fetched from the broker in batches regardless
Expand Down
Loading

0 comments on commit 49f05db

Please sign in to comment.