Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update repo by service bot #448

Closed
wants to merge 54 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
7fd6fd1
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Aug 25, 2023
2f23c4e
Bump Confluent to 7.5.1-0, Kafka to 7.5.1-0
ConfluentJenkins Aug 29, 2023
cfc412c
Merge branch '7.5.0-post' into 7.5.x
joel-hamill Aug 30, 2023
4040f77
Merge branch '7.4.x' into 7.5.x
joel-hamill Aug 30, 2023
4d8d82a
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
5010d19
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
6864ae8
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
0c9b4dd
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
976aa9e
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
69433c4
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
d20f0d8
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
0e6efbc
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
8314517
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
57049e1
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
c4ebcb2
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
5fc24c7
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
f2cef84
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
77a1195
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
2c23061
Merge branch '7.5.0-post' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
043c137
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Sep 30, 2023
19cdbd9
Merge branch '7.5.0-post' into 7.5.x by javabrett
ConfluentJenkins Oct 2, 2023
b89a49d
Merge branch '7.4.x' into 7.5.x by javabrett
ConfluentJenkins Oct 2, 2023
4fa9311
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 4, 2023
97c238b
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 4, 2023
d36a810
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 4, 2023
6f48239
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 4, 2023
b1f4b11
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 4, 2023
3c145b6
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 4, 2023
3bd180e
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 5, 2023
2dcdd33
Merge branch '7.4.x' into 7.5.x (using strategy ours)
ConfluentJenkins Oct 5, 2023
b869388
Set Confluent to 7.5.1, Kafka to 7.5.1.
ConfluentJenkins Oct 6, 2023
302ec84
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
b538b81
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
bd4a556
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
a89e319
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
73c6c1f
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
7fd1666
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
135c8da
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
2ef5279
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Nov 9, 2023
7fc8ee9
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 4, 2024
29d956e
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 5, 2024
33f233d
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 5, 2024
d1dbd55
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 5, 2024
7aecf1f
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 5, 2024
ce5c29c
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 5, 2024
4c98604
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Jan 5, 2024
c020af0
feat(): enable confluent.consumer.lag.emitter (#453)
pneff93 Feb 6, 2024
5b6946d
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Apr 10, 2024
3b98167
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Apr 10, 2024
ae1f77e
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Apr 10, 2024
c42e335
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Apr 10, 2024
25761f5
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Apr 10, 2024
62ff3a9
Merge branch '7.5.0-post' into 7.5.1-post (using strategy ours)
ConfluentJenkins Apr 10, 2024
d5a133a
chore: update repo codeowners [ci skip]
ConfluentSemaphore May 31, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @confluentinc/technical-marketing
5 changes: 5 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@ services:
# Encrypt credentials stored in Cluster Link
KAFKA_PASSWORD_ENCODER_SECRET: encoder-secret

# Enable Consumer Lag emitter
KAFKA_CONFLUENT_CONSUMER_LAG_EMITTER_ENABLED: 'true'

kafka2:
image: ${REPOSITORY}/cp-server:${CONFLUENT_DOCKER_TAG}
hostname: kafka2
Expand Down Expand Up @@ -453,6 +456,8 @@ services:
# Encrypt credentials stored in Cluster Link
KAFKA_PASSWORD_ENCODER_SECRET: encoder-secret

# Enable Consumer Lag emitter
KAFKA_CONFLUENT_CONSUMER_LAG_EMITTER_ENABLED: 'true'


connect:
Expand Down
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,15 +167,15 @@ def makeLink(role, rawtext, text, lineno, inliner, options={}, content=[]):
# The short X.Y version.
version = '7.5'
# The full version, including alpha/beta/rc tags.
release = '7.5.0'
release = '7.5.1'
# Kafka version
kafka_branch = '2.6'
# Kafka Javadoc version
kafka_javadoc_version = '26'
# Kafka release we're tracking from upstream, so we can refer to it without the -cp version
kafka_upstream_release = '2.6.0'
# Kafka release (included in CP examples)
kafka_release = '7.5.0-ccs'
kafka_release = '7.5.1-ccs'
# Scala version used for CP packages
scala_version = '2.13'
# release post branch, used in ksqlDB, streams, examples
Expand Down
2 changes: 1 addition & 1 deletion docs/settings.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ fi
# can automatically pass them as environment variables to the Makefile.
#
# IMPORTANT: For *branches*, this must be a remote ref, i.e. "orgin/foobar", not just "foobar"!
export BRANCH="origin/7.5.0-post"
export BRANCH="origin/7.5.1-post"

export MAVEN_OPTS="-XX:MaxPermSize=128M -Dhttps.protocols=TLSv1.2"

Expand Down
10 changes: 5 additions & 5 deletions env_files/config.env
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
# over time to construct other
# values required by this repository
#####################################################
CONFLUENT=7.5.0
CONFLUENT_DOCKER_TAG=7.5.0
CONFLUENT=7.5.1
CONFLUENT_DOCKER_TAG=7.5.1
CONFLUENT_SHORT=7.5
CONFLUENT_PREVIOUS=""
CONFLUENT_RELEASE_TAG_OR_BRANCH=7.5.0-post
CONFLUENT_PREVIOUS="7.5.0"
CONFLUENT_RELEASE_TAG_OR_BRANCH=7.5.1-post
CONFLUENT_MAJOR=7
CONFLUENT_MINOR=5
CONFLUENT_PATCH=0
CONFLUENT_PATCH=1
#####################################################

CP_VERSION_FULL="$CONFLUENT_MAJOR.$CONFLUENT_MINOR.$CONFLUENT_PATCH"