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: Keep the repo aligned with the confluent repo #11

Open
wants to merge 261 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
261 commits
Select commit Hold shift + click to select a range
0babdd1
Merge branch '10.2.x' into master by khsoneji
ConfluentJenkins Nov 16, 2023
cb9b78a
[maven-release-plugin] prepare release v10.2.5
khsoneji Nov 16, 2023
2254599
[maven-release-plugin] prepare for next development iteration
khsoneji Nov 16, 2023
dc5508a
Merge branch '10.2.x' into master (using strategy ours)
khsoneji Nov 16, 2023
0ec1769
RCCA-16236: AVRO buffer loss fix on IOException (#678)
vbalani002 Dec 19, 2023
873c0d6
Merge branch '10.0.x' into 10.1.x by vbalani002
ConfluentJenkins Dec 19, 2023
53ae874
Merge branch '10.1.x' into 10.2.x by vbalani002
ConfluentJenkins Dec 19, 2023
d99e15b
Merge branch '10.2.x' into master by vbalani002
ConfluentJenkins Dec 19, 2023
cf2ba0d
Update CODEOWNERS (#679)
arihant-confluent Dec 27, 2023
0884762
CC-23123 : Integrated Sonarqube code quality check (#677)
amitr17 Dec 29, 2023
8fab0ae
Merge branch '5.0.x' into 5.1.x by amitr17
ConfluentJenkins Dec 29, 2023
4898aae
CC-23123 : Integrated Sonarqube code quality check (#677) (#680)
ConfluentJenkins Jan 2, 2024
445e1b4
Merge branch '5.2.x' into 5.3.x by amitr17
ConfluentJenkins Jan 2, 2024
d5df41e
Merge branch '5.3.x' into 5.4.x by amitr17
ConfluentJenkins Jan 2, 2024
1a8a716
Merge branch '5.4.x' into 5.5.x by amitr17
ConfluentJenkins Jan 2, 2024
9c2c20b
Merge branch '10.0.x' into pr_merge_from_5_5_x_to_10_0_x
amitr17 Jan 2, 2024
16aa68b
Merge pull request #681 from confluentinc/pr_merge_from_5_5_x_to_10_0_x
amitr17 Jan 2, 2024
afa5815
Merge branch '10.0.x' into 10.1.x by amitr17
ConfluentJenkins Jan 2, 2024
2125723
Merge branch '10.1.x' into 10.2.x by amitr17
ConfluentJenkins Jan 2, 2024
f98a26a
Merge branch '10.2.x' into master by amitr17
ConfluentJenkins Jan 2, 2024
c598d72
Merge branch '3.0.x' into 3.1.x by amitr17
ConfluentJenkins Jan 2, 2024
a6e1e7f
Merge branch '3.1.x' into 3.2.x by amitr17
ConfluentJenkins Jan 2, 2024
d91a832
Merge branch '3.2.x' into 3.3.x by amitr17
ConfluentJenkins Jan 2, 2024
2064cd1
Merge branch '3.3.x' into 4.0.x by amitr17
ConfluentJenkins Jan 2, 2024
9fd47e3
Merge branch '4.0.x' into 4.1.x by amitr17
ConfluentJenkins Jan 2, 2024
b011969
Merge branch '4.1.x' into 5.0.x by amitr17
ConfluentJenkins Jan 2, 2024
4bba463
Merge branch '5.0.x' into 5.1.x by amitr17
ConfluentJenkins Jan 2, 2024
24b3ab3
Merge branch '5.2.x' into pr_merge_from_5_1_x_to_5_2_x
amitr17 Jan 2, 2024
cd1889a
Merge pull request #682 from confluentinc/pr_merge_from_5_1_x_to_5_2_x
arihant-confluent Jan 2, 2024
4407aaf
Merge branch '5.2.x' into 5.3.x by amitr17
ConfluentJenkins Jan 2, 2024
1e95be1
Merge branch '5.3.x' into 5.4.x by amitr17
ConfluentJenkins Jan 2, 2024
285826f
Merge branch '5.4.x' into 5.5.x by amitr17
ConfluentJenkins Jan 2, 2024
9f47655
Merge branch '5.5.x' into 10.0.x by amitr17
ConfluentJenkins Jan 2, 2024
bd6b9de
Merge branch '10.0.x' into 10.1.x by amitr17
ConfluentJenkins Jan 2, 2024
08d494a
Merge branch '10.1.x' into 10.2.x by amitr17
ConfluentJenkins Jan 2, 2024
5a8e21d
Merge branch '10.2.x' into master by amitr17
ConfluentJenkins Jan 2, 2024
94d7e70
[maven-release-plugin] prepare release v10.0.11
snehashisp Jan 26, 2024
0920f21
[maven-release-plugin] prepare for next development iteration
snehashisp Jan 26, 2024
c752527
Merge branch '10.0.x' into 10.1.x (using strategy ours)
snehashisp Jan 26, 2024
ef1b700
Merge branch '10.1.x' into 10.2.x (using strategy ours)
snehashisp Jan 26, 2024
49e1d08
Merge branch '10.2.x' into master (using strategy ours)
snehashisp Jan 26, 2024
4fdaaf9
[maven-release-plugin] prepare release v10.1.17
snehashisp Jan 29, 2024
e9d9f1e
[maven-release-plugin] prepare for next development iteration
snehashisp Jan 29, 2024
3b95cdb
Merge branch '10.1.x' into 10.2.x (using strategy ours)
snehashisp Jan 29, 2024
221732e
Merge branch '10.2.x' into master (using strategy ours)
snehashisp Jan 29, 2024
84eeaf5
[maven-release-plugin] prepare release v10.2.6
snehashisp Jan 29, 2024
71000db
[maven-release-plugin] prepare for next development iteration
snehashisp Jan 29, 2024
b537e13
Merge branch '10.2.x' into master (using strategy ours)
snehashisp Jan 29, 2024
7ca7189
Jenkins->Semaphore Migration (#686)
vbalani002 Mar 8, 2024
db47b6f
Merge branch '10.0.x' into 10.1.x
ConfluentSemaphore Mar 8, 2024
7e0e910
Merge branch '10.1.x' into 10.2.x
ConfluentSemaphore Mar 8, 2024
303c516
Merge branch '10.2.x' into master
ConfluentSemaphore Mar 8, 2024
ac7c466
Jenkins->Semaphore Migration (#686)
vbalani002 Mar 8, 2024
89460ac
Merge pull request #689 from confluentinc/backport-semaphore
vbalani002 Mar 20, 2024
2600bb4
Merge branch '5.0.x' into 5.1.x
ConfluentSemaphore Mar 20, 2024
01e30f3
Merge remote-tracking branch 'origin/5.2.x' into pr_merge_from_5_1_x_…
vbalani002 Mar 20, 2024
b674301
Merge pull request #690 from confluentinc/pr_merge_from_5_1_x_to_5_2_x
vbalani002 Mar 20, 2024
63feca7
Merge remote-tracking branch 'origin/5.3.x' into pr_merge_from_5_2_x_…
vbalani002 Mar 20, 2024
4075a3e
Merge pull request #691 from confluentinc/pr_merge_from_5_2_x_to_5_3_x
vbalani002 Mar 20, 2024
3c47e49
Merge branch '5.3.x' into 5.4.x
ConfluentSemaphore Mar 20, 2024
4f43619
Merge branch '5.4.x' into 5.5.x
ConfluentSemaphore Mar 20, 2024
30f54d3
Merge branch '5.5.x' into 10.0.x
ConfluentSemaphore Mar 20, 2024
7412e56
Merge branch '10.0.x' into 10.1.x
ConfluentSemaphore Mar 20, 2024
bb89c95
Merge branch '10.1.x' into 10.2.x
ConfluentSemaphore Mar 20, 2024
74c14b5
Merge branch '10.2.x' into master
ConfluentSemaphore Mar 20, 2024
5cd4d0f
CVE Fixes: Avro, Netty, Zookeeper, Compress (#688)
vbalani002 Mar 20, 2024
5ea362c
Merge branch '10.2.x' into master
ConfluentSemaphore Mar 20, 2024
2e2da69
DP-13727 Add CodeArtifact package paths to service.yml (#692)
huizheng278 Mar 25, 2024
889073d
[maven-release-plugin] prepare release v10.2.7
vbalani002 Apr 1, 2024
3239c3e
[maven-release-plugin] prepare for next development iteration
vbalani002 Apr 1, 2024
df43721
Merge branch '10.2.x' into master (using strategy ours)
vbalani002 Apr 1, 2024
16aa5d9
CC-26341, CC-26342, CC-26343, CC-26345, CC-26346, CC-27071: CVE Fixes…
vbalani002 May 19, 2024
d1169a2
Merge branch '10.2.x' into master
ConfluentSemaphore May 19, 2024
66a160f
CC-27233: Bump kafka-connect-storage-common version to fix CVE (#700)
vbalani002 May 24, 2024
bbdf194
Merge branch '10.2.x' into master
ConfluentSemaphore May 24, 2024
f2adecb
[maven-release-plugin] prepare release v10.2.8
vbalani002 May 24, 2024
2c9d472
[maven-release-plugin] prepare for next development iteration
vbalani002 May 24, 2024
b61cb46
Merge branch '10.2.x' into master (using strategy ours)
vbalani002 May 24, 2024
a9afafc
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
dcd7b5f
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
af249fa
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
e96db95
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
17c5e70
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
9b8e342
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
fc6f9a5
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
ceccfe1
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
0108414
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
b5d7734
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
07136ff
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
a8a30a7
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
05ceed7
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
cc3fa57
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
730041e
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
dc7425d
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
e1dbb63
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
71f2350
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
179a80e
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
7d1f67c
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
0e2f978
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
d4ebe3d
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
7e140a0
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
d5e0881
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
9c0e615
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
5eb539e
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
36fbab1
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
9d11797
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
b951dd3
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
1d754f2
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
1ef386d
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
1abb6f3
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
ea1dfe1
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
3cd6ddc
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
ef4a477
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
3d346bd
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
3206afb
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
4212d7b
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
a9e6aea
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
f2c704a
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
c406718
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
0aef5bb
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
b1f805b
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
5a6bb65
[skip ci] Copy CODEOWNERS from the default branch
patrick-premont May 31, 2024
dc4cec6
Merge branch '3.1.0-post' into 3.1.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
8025235
Merge branch '3.1.1-post' into 3.1.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
c172f07
Merge branch '3.1.2-post' into 3.2.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
3efee10
Merge branch '3.2.0-post' into 3.2.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
a69bcf4
Merge branch '3.2.1-post' into 3.2.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
6db0711
Merge branch '3.2.2-post' into 3.2.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
ec83c39
Merge branch '3.2.4-post' into 3.3.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
a15366e
Merge branch '3.3.0-post' into 3.3.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
a3fb31a
Merge branch '3.3.1-post' into 3.3.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
8de72f2
Merge branch '3.3.2-post' into 3.3.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
e21b117
Merge branch '3.3.3-post' into 4.0.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
3824809
Merge branch '4.0.0-post' into 4.0.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
ecdd070
Merge branch '4.0.1-post' into 4.0.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
f32bf88
Merge branch '4.0.2-post' into 4.0.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
15da591
Merge branch '4.0.3-post' into 4.1.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
d6182a7
Merge branch '4.1.0-post' into 4.1.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
05062a0
Merge branch '4.1.1-post' into 4.1.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
9b9c23e
Merge branch '4.1.2-post' into 4.1.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
d263d82
Merge branch '4.1.3-post' into 4.1.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
5aed589
Merge branch '4.1.4-post' into 5.0.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
8177aac
Merge branch '5.0.0-post' into 5.0.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
4c63df0
Merge branch '5.0.1-post' into 5.0.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
432ecfd
Merge branch '5.0.2-post' into 5.0.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
da4789a
Merge branch '5.0.3-post' into 5.0.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
4e6ccdb
Merge branch '5.0.4-post' into 5.1.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
29d3f7b
Merge branch '5.1.0-post' into 5.1.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
7fd5185
Merge branch '5.1.1-post' into 5.1.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
d9d0bcb
Merge branch '5.1.2-post' into 5.1.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
f643557
Merge branch '5.1.3-post' into 5.1.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
aa15562
Merge branch '5.1.4-post' into 5.2.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
476e9c6
Merge branch '5.2.0-post' into 5.2.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
40d5fde
Merge branch '5.2.1-post' into 5.2.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
e11469a
Merge branch '5.2.2-post' into 5.2.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
7b0355f
Merge branch '5.2.3-post' into 5.2.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
e062384
Merge branch '5.2.4-post' into 5.2.5-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
80292c4
Merge branch '5.2.5-post' into 5.2.6-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
e0babcf
Merge branch '5.2.6-post' into 5.2.7-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
2322ac3
Merge branch '5.2.7-post' into 5.3.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
d32b32b
Merge branch '5.3.0-post' into 5.3.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
0708403
Merge branch '5.3.1-post' into 5.3.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
57d46d2
Merge branch '5.3.2-post' into 5.3.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
ea2603a
Merge branch '5.3.3-post' into 5.3.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
9be39a0
Merge branch '5.3.4-post' into 5.3.5-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
890a8f9
Merge branch '5.3.5-post' into 5.3.6-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
eec4edb
Merge branch '5.3.6-post' into 5.3.7-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
031391b
Merge branch '5.3.7-post' into 5.3.8-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
c00ff15
Merge branch '5.3.8-post' into 5.4.0-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
2d83e76
Merge branch '5.4.0-post' into 5.4.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
79b0052
Merge branch '5.4.1-post' into 5.4.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
6fb0b68
Merge branch '5.4.2-post' into 5.4.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
1842c26
Merge branch '5.4.3-post' into 5.4.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
3211d1e
Merge branch '5.4.4-post' into 5.4.5-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
0e23549
Merge branch '5.4.5-post' into 5.4.6-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
b70967a
Merge branch '5.4.6-post' into 5.4.7-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
ceab936
Merge branch '5.4.7-post' into 5.4.8-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
6483688
Merge branch '5.4.8-post' into 5.4.9-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
8632121
Merge branch '5.4.9-post' into 5.4.10-post by patrick-premont (using…
ConfluentSemaphore Jun 1, 2024
edec34e
Merge branch '5.4.10-post' into 5.4.11-post by patrick-premont (usin…
ConfluentSemaphore Jun 1, 2024
0dd1fcb
Merge branch '5.4.11-post' into 5.5.0-post by patrick-premont (using…
ConfluentSemaphore Jun 1, 2024
4d42020
Merge branch '5.5.0-post' into 5.5.1-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
9928a0d
Merge branch '5.5.1-post' into 5.5.2-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
f978988
Merge branch '5.5.2-post' into 5.5.3-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
34fb625
Merge branch '5.5.3-post' into 5.5.4-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
7e45434
Merge branch '5.5.4-post' into 5.5.5-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
b05f0a3
Merge branch '5.5.5-post' into 5.5.6-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
e7b3241
Merge branch '5.5.6-post' into 5.5.7-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
70f1255
Merge branch '5.5.7-post' into 5.5.8-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
faf29cc
Merge branch '5.5.8-post' into 5.5.9-post by patrick-premont (using …
ConfluentSemaphore Jun 1, 2024
c7dc88d
Merge branch '5.5.9-post' into 5.5.10-post by patrick-premont (using…
ConfluentSemaphore Jun 1, 2024
4c6a434
Merge branch '5.5.10-post' into 5.5.11-post by patrick-premont (usin…
ConfluentSemaphore Jun 1, 2024
04ea57d
Merge branch '5.5.11-post' into 5.5.12-post by patrick-premont (usin…
ConfluentSemaphore Jun 1, 2024
8513929
Merge branch '5.5.12-post' into 5.5.13-post by patrick-premont (usin…
ConfluentSemaphore Jun 1, 2024
1315d33
Merge branch '5.5.13-post' into 5.5.14-post by patrick-premont (usin…
ConfluentSemaphore Jun 1, 2024
aca0b8d
Merge branch '5.5.14-post' into 5.5.15-post by patrick-premont (usin…
ConfluentSemaphore Jun 1, 2024
436b150
Merge branch '3.1.2-post' into 3.1.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
752518c
Merge branch '3.2.4-post' into 3.2.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
02232a5
Merge branch '3.3.3-post' into 3.3.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
90d1856
Merge branch '4.0.3-post' into 4.0.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
915a507
Merge branch '4.1.4-post' into 4.1.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
c0de0bf
Merge branch '5.0.4-post' into 5.0.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
ad43a28
Merge branch '5.1.4-post' into 5.1.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
e6663d1
Merge branch '5.2.7-post' into 5.2.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
90479da
Merge branch '5.3.8-post' into 5.3.x by patrick-premont (using strat…
ConfluentSemaphore Jun 1, 2024
8b3f0d7
Merge branch '5.4.11-post' into 5.4.x by patrick-premont (using stra…
ConfluentSemaphore Jun 1, 2024
502d97e
Merge branch '5.5.15-post' into 5.5.x by patrick-premont (using stra…
ConfluentSemaphore Jun 1, 2024
4e7e66b
Merge branch '3.1.x' into 3.2.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
8b0ca37
Merge branch '3.2.x' into 3.3.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
e7e8f3d
Merge branch '3.3.x' into 4.0.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
d99a869
Merge branch '4.0.x' into 4.1.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
adddb5d
Merge branch '4.1.x' into 5.0.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
cea88ef
Merge branch '5.0.x' into 5.1.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
5e14700
Merge branch '5.1.x' into 5.2.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
c67f291
Merge branch '5.2.x' into 5.3.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
53ea886
Merge branch '5.3.x' into 5.4.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
c74f5e2
Merge branch '5.4.x' into 5.5.x by patrick-premont
ConfluentSemaphore Jun 1, 2024
a88ae97
Merge branch '5.5.x' into 10.0.x by patrick-premont (using strategy …
ConfluentSemaphore Jun 1, 2024
3737bd3
Merge branch '10.0.x' into 10.1.x by patrick-premont (using strategy…
ConfluentSemaphore Jun 1, 2024
8ca000b
Merge branch '10.1.x' into 10.2.x by patrick-premont (using strategy…
ConfluentSemaphore Jun 1, 2024
a1a9cee
Merge branch '10.2.x' into master by patrick-premont (using strategy…
ConfluentSemaphore Jun 1, 2024
1c2b1e9
CVE Fix: libthrift, aircompressor (#702)
vbalani002 Jul 3, 2024
397bd87
Merge branch '10.2.x' into master
ConfluentSemaphore Jul 3, 2024
331bc90
[maven-release-plugin] prepare release v10.2.9
vbalani002 Jul 5, 2024
8cf0665
[maven-release-plugin] prepare for next development iteration
vbalani002 Jul 5, 2024
972324a
Merge branch '10.2.x' into master (using strategy ours)
vbalani002 Jul 5, 2024
610759f
CC-28069: Bump `tomcat-embed-core` version to fix CVEs (#703)
vbalani002 Aug 7, 2024
d38d1a5
Merge branch '10.2.x' into master
ConfluentSemaphore Aug 7, 2024
cf040d3
[maven-release-plugin] prepare release v10.2.10
vbalani002 Aug 9, 2024
bd7d170
[maven-release-plugin] prepare for next development iteration
vbalani002 Aug 9, 2024
a005a1c
Merge branch '10.2.x' into master (using strategy ours)
vbalani002 Aug 9, 2024
153cd5b
CC-29302, CC-29425: CVE Fixes for `commons-io` & `protobuf-java` (#704)
vbalani002 Oct 5, 2024
76f68fc
Merge branch '10.2.x' into master
ConfluentSemaphore Oct 5, 2024
657b83f
[maven-release-plugin] prepare release v10.2.11
vbalani002 Oct 7, 2024
8fe78c7
[maven-release-plugin] prepare for next development iteration
vbalani002 Oct 7, 2024
c249143
Merge branch '10.2.x' into master (using strategy ours)
vbalani002 Oct 7, 2024
12b3ba3
chore: update repo by service bot (#687)
ConfluentJenkins Oct 20, 2024
0722591
CC-29601, CC-29566, CC-29504: CVE Fixes (#705)
vbalani002 Oct 21, 2024
2b7d26b
Merge branch '10.2.x' into master
ConfluentSemaphore Oct 21, 2024
5812323
[maven-release-plugin] prepare release v10.2.12
vbalani002 Oct 23, 2024
b5eda06
[maven-release-plugin] prepare for next development iteration
vbalani002 Oct 23, 2024
d70b4b6
Merge branch 'master' into pr_merge_from_10_2_x_to_master
vbalani002 Oct 23, 2024
5ead18e
Merge pull request #706 from confluentinc/pr_merge_from_10_2_x_to_master
vbalani002 Oct 23, 2024
35ccc75
Revert release version (#708)
vbalani002 Nov 3, 2024
8f6e78f
Merge branch 'master' into pr_merge_from_10_2_x_to_master
vbalani002 Nov 3, 2024
c6f50d9
Merge pull request #709 from confluentinc/pr_merge_from_10_2_x_to_master
vbalani002 Nov 3, 2024
58f36b8
[maven-release-plugin] prepare release v10.2.12
vbalani002 Nov 3, 2024
31841b8
[maven-release-plugin] prepare for next development iteration
vbalani002 Nov 3, 2024
c244cf7
Merge branch '10.2.x' into master (using strategy ours)
vbalani002 Nov 3, 2024
dae32f2
replace twistlock scanning with trivy (#707)
ap00rv Nov 8, 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
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Each line is a file pattern followed by one or more owners.
# These owners will be the default owners for everything in
# the repo.
* @confluentinc/connect-team1
* @confluentinc/connect
89 changes: 89 additions & 0 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# This file is managed by ServiceBot plugin - Semaphore. The content in this file is created using a common
# template and configurations in service.yml.
# Any modifications made to ths file will be overwritten by the generated content in nightly runs.
# For more information, please refer to the page:
# https://confluentinc.atlassian.net/wiki/spaces/Foundations/pages/2871296194/Add+SemaphoreCI
version: v1.0
name: build-test-release
agent:
machine:
type: s1-prod-ubuntu20-04-amd64-1

fail_fast:
cancel:
when: "true"

execution_time_limit:
hours: 1

queue:
- when: "branch != 'master' and branch !~ '[0-9]+\\.[0-9]+\\.x'"
processing: parallel

global_job_config:
prologue:
commands:
- checkout
- sem-version java 8
- . cache-maven restore

blocks:
- name: Test
dependencies: []
run:
# don't run the tests on non-functional changes...
when: "change_in('/', {exclude: ['/.deployed-versions/', '.github/']})"
task:
jobs:
- name: Test
commands:
- . sem-pint
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode --no-transfer-progress clean verify install dependency:analyze validate
- cve-scan
- . cache-maven store
epilogue:
always:
commands:
- . publish-test-results
- artifact push workflow target/test-results
- artifact push workflow target

- name: Release
dependencies: ["Test"]
run:
when: "branch = 'master' or branch =~ '[0-9]+\\.[0-9]+\\.x'"
task:
jobs:
- name: Release
commands:
- mvn -Dcloud -Pjenkins -U -Dmaven.wagon.http.retryHandler.count=10 --batch-mode -DaltDeploymentRepository=confluent-codeartifact-internal::default::https://confluent-519856050701.d.codeartifact.us-west-2.amazonaws.com/maven/maven-snapshots/
-DrepositoryId=confluent-codeartifact-internal deploy -DskipTests
- name: Release Notes
dependencies: []
run:
when: "branch =~ '[0-9]+\\.[0-9]+\\.x'"
task:
jobs:
- name: Generate Release Notes
commands:
- git clone --branch master --single-branch git@github.com:confluentinc/connect-releases.git
- ./connect-releases/tasks/release-connect-plugins/generate-connect-changelogs.sh

after_pipeline:
task:
agent:
machine:
type: s1-prod-ubuntu20-04-arm64-0
jobs:
- name: Metrics
commands:
- emit-ci-metrics -p -a test-results
- name: Publish Test Results
commands:
- test-results gen-pipeline-report
- name: SonarQube
commands:
- checkout
- sem-version java 11
- artifact pull workflow target
- emit-sonarqube-data --run_only_sonar_scan
1 change: 1 addition & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# See https://aquasecurity.github.io/trivy/v0.56/docs/configuration/filtering/#trivyignore for guidance on adding exceptions for Trivy scanner
9 changes: 0 additions & 9 deletions Jenkinsfile

This file was deleted.

186 changes: 179 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.confluent</groupId>
<artifactId>kafka-connect-storage-common-parent</artifactId>
<version>11.1.4</version>
<version>11.2.20</version>
</parent>

<artifactId>kafka-connect-hdfs</artifactId>
Expand Down Expand Up @@ -55,16 +55,23 @@
<apacheds-jdbm1.version>2.0.0-M2</apacheds-jdbm1.version>
<confluent-log4j.version>1.2.17-cp8</confluent-log4j.version>
<kafka.connect.maven.plugin.version>0.11.1</kafka.connect.maven.plugin.version>
<instruction.coverage.threshold>0.65</instruction.coverage.threshold>
<branch.coverage.threshold>0.59</branch.coverage.threshold>
<method.coverage.threshold>0.63</method.coverage.threshold>
<class.coverage.threshold>0.67</class.coverage.threshold>
<complexity.coverage.threshold>0.53</complexity.coverage.threshold>
<line.coverage.threshold>0.66</line.coverage.threshold>
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
<kafka.connect.storage.common.version>11.1.4</kafka.connect.storage.common.version>
<kafka.connect.storage.common.version>11.2.20</kafka.connect.storage.common.version>
<commons.collections.version>3.2.2</commons.collections.version>
<commons-net.version>3.9.0</commons-net.version>
<ivy.version>2.5.1</ivy.version>
<ivy.version>2.5.2</ivy.version>
<json-smart.version>2.4.10</json-smart.version>
<libthrift.version>0.13.0</libthrift.version>
<libthrift.version>0.14.0</libthrift.version>
<log4j2-api.version>2.17.1</log4j2-api.version>
<jettison.version>1.5.4</jettison.version>
<snakeyaml.version>2.0</snakeyaml.version>
<snappy.java.version>1.1.10.4</snappy.java.version>
<woodstox-core.version>6.5.0</woodstox-core.version>
</properties>

Expand Down Expand Up @@ -122,6 +129,18 @@
<artifactId>snakeyaml</artifactId>
<version>${snakeyaml.version}</version>
</dependency>
<!-- pin the velocity-engine to remove false positive for CVE-2024-47554 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>2.4</version>
</dependency>
<!-- Pin commons-io to resolve CVE-2024-47554 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.14.0</version>
</dependency>
<!-- Pin xercesImpl to resolve CVE-2022-2343 -->
<dependency>
<groupId>xerces</groupId>
Expand All @@ -134,6 +153,58 @@
<artifactId>slider-core</artifactId>
<version>0.92.0-incubating</version>
</dependency>
<!-- pin dependency to fix cve -->
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>${snappy.java.version}</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.7.2</version>
</dependency>
<!-- pin dependency to fix cve-->
<dependency>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
<version>9.37.2</version>
</dependency>
<!-- pin dependency to fix cve-->
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>3.4.0</version>
</dependency>
<!-- pin hbase and exclude commons-httpclient to fix cve -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
<version>1.1.1</version>
<exclusions>
<exclusion>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- pin aircompressor to fix cve -->
<dependency>
<groupId>io.airlift</groupId>
<artifactId>aircompressor</artifactId>
<version>0.27</version>
</dependency>
<dependency>
<groupId>org.apache.calcite.avatica</groupId>
<artifactId>avatica-core</artifactId>
<version>1.22.0</version>
</dependency>
<!-- pin tomcat-embed to fix cve -->
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.5.100</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -209,7 +280,7 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
<exclusion>
<exclusion>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</exclusion>
Expand All @@ -230,12 +301,12 @@
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
<version>1.11.0</version>
<version>1.22.0</version>
</dependency>
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-druid</artifactId>
<version>1.11.0</version>
<version>1.22.0</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
Expand Down Expand Up @@ -504,6 +575,107 @@
</filesets>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.11</version>
<configuration>
<excludes>
<exclude>**/model/**</exclude>
<exclude>**/rest/**</exclude>
</excludes>
</configuration>
<executions>
<execution>
<id>prepare-agent</id>
<goals>
<goal>prepare-agent</goal>
</goals>
</execution>
<execution>
<id>prepare-agent-it</id>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
<phase>pre-integration-test</phase>
</execution>
<execution>
<id>merge-coverage-reports</id>
<phase>verify</phase>
<goals>
<goal>merge</goal>
</goals>
<configuration>
<fileSets>
<fileSet>
<directory>${project.basedir}</directory>
<includes>
<include>/target/jacoco.exec</include>
<include>/target/jacoco-it.exec</include>
</includes>
</fileSet>
</fileSets>
<destFile>${project.basedir}/target/jacoco-aggregate.exec</destFile>
</configuration>
</execution>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>${instruction.coverage.threshold}</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
<minimum>${branch.coverage.threshold}</minimum>
</limit>
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>${complexity.coverage.threshold}</minimum>
</limit>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>${line.coverage.threshold}</minimum>
</limit>
<limit>
<counter>METHOD</counter>
<value>COVEREDRATIO</value>
<minimum>${method.coverage.threshold}</minimum>
</limit>
<limit>
<counter>CLASS</counter>
<value>COVEREDRATIO</value>
<minimum>${class.coverage.threshold}</minimum>
</limit>
</limits>
</rule>
</rules>
<dataFile>${project.basedir}/target/jacoco-aggregate.exec</dataFile>
</configuration>
</execution>
<execution>
<id>generate-code-coverage-report</id>
<phase>verify</phase>
<goals>
<goal>report</goal>
</goals>
<configuration>
<dataFile>${project.basedir}/target/jacoco-aggregate.exec</dataFile>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
Expand Down
19 changes: 19 additions & 0 deletions service.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: kafka-connect-hdfs
lang: java
lang_version: 8
git:
enable: true
codeowners:
enable: true
semaphore:
enable: true
pipeline_type: cp
extra_deploy_args: -Dcloud -Pjenkins
extra_build_args: -Dcloud -Pjenkins
generate_connect_changelogs: true
trivy_scan: true
run_pint_merge: true
code_artifact:
enable: true
package_paths:
- maven-snapshots/maven/io.confluent/kafka-connect-hdfs
9 changes: 9 additions & 0 deletions sonar-project.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### service-bot sonarqube plugin managed file
sonar.coverage.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
sonar.coverage.jacoco.xmlReportPaths=**/jacoco.xml
sonar.cpd.exclusions=**/test/**/*,**/tests/**/*,**/mock/**/*,**/mocks/**/*,**/*mock*,**/*test*
sonar.exclusions=**/*.pb.*,**/mk-include/**/*
sonar.java.binaries=.
sonar.language=java
sonar.projectKey=kafka-connect-hdfs
sonar.sources=.
Loading