Skip to content

Fix reporting modified record #720

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

Open
wants to merge 660 commits into
base: 10.0.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
660 commits
Select commit Hold shift + click to select a range
a96fa63
Merge branch '10.0.x' into 10.1.x (using strategy ours)
pbadani Feb 24, 2023
6577038
Merge branch '10.1.x' into 10.2.x (using strategy ours)
pbadani Feb 24, 2023
8e12b28
Merge branch '10.2.x' into 10.3.x (using strategy ours)
pbadani Feb 24, 2023
959b2d1
Merge branch '10.3.x' into 10.4.x (using strategy ours)
pbadani Feb 24, 2023
3aad757
Merge branch '10.4.x' into master (using strategy ours)
pbadani Feb 24, 2023
cabc62c
[maven-release-plugin] prepare release v10.2.7
pbadani Feb 24, 2023
c066a6e
[maven-release-plugin] prepare for next development iteration
pbadani Feb 24, 2023
a32e597
[maven-release-plugin] prepare release v10.3.4
pbadani Feb 24, 2023
a19ecda
[maven-release-plugin] prepare for next development iteration
pbadani Feb 24, 2023
8a2fe89
Merge branch '10.2.x' into 10.3.x (using strategy ours)
pbadani Feb 24, 2023
63d036c
Merge branch '10.3.x' into 10.4.x (using strategy ours)
pbadani Feb 24, 2023
79c6ae8
Merge branch '10.4.x' into master (using strategy ours)
pbadani Feb 24, 2023
8e0ec73
[maven-release-plugin] prepare release v10.4.2
pbadani Feb 24, 2023
3678beb
[maven-release-plugin] prepare for next development iteration
pbadani Feb 24, 2023
98d8e09
Merge branch '10.4.x' into master (using strategy ours)
pbadani Feb 24, 2023
7e6c0b0
Merge branch '10.0.x' into 10.1.x (using strategy ours)
ConfluentJenkins Feb 26, 2023
f596e85
Merge branch '10.1.x' into 10.2.x (using strategy ours)
ConfluentJenkins Feb 26, 2023
5922687
Merge branch '10.2.x' into 10.3.x (using strategy ours)
ConfluentJenkins Feb 26, 2023
eb3a8f9
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ConfluentJenkins Feb 26, 2023
01b64e8
Merge branch '10.4.x' into master (using strategy ours)
ConfluentJenkins Feb 26, 2023
5557bc3
added service.yml for setting up semaphore pipeline
kapilchhajer Feb 28, 2023
e9fe855
Merge pull request #633 from confluentinc/semaphore-setup
kapilchhajer Mar 2, 2023
a9406e1
Merge branch '10.0.x' into 10.1.x
ConfluentJenkins Mar 28, 2023
e2867da
Merge branch '10.1.x' into 10.2.x
ConfluentJenkins Mar 28, 2023
27dcadf
Merge branch '10.2.x' into 10.3.x
ConfluentJenkins Mar 28, 2023
412fe1d
Merge branch '10.3.x' into 10.4.x
pbadani Mar 28, 2023
afe59db
Merge pull request #640 from confluentinc/merge_conflict_10_3_x
pbadani Mar 28, 2023
1e7c037
Merge branch '10.4.x' into master
ConfluentJenkins Mar 28, 2023
2533b79
CC-19543 Standard logs (#630)
srishti-saraswat Apr 4, 2023
5118b85
Merge branch '10.4.x' into master
ConfluentJenkins Apr 4, 2023
7929e12
Merge branch '10.0.x' into 10.1.x (using strategy ours)
ConfluentJenkins Apr 4, 2023
a80a755
Merge branch '10.1.x' into 10.2.x (using strategy ours)
ConfluentJenkins Apr 4, 2023
2ed51d6
Merge branch '10.2.x' into 10.3.x (using strategy ours)
ConfluentJenkins Apr 4, 2023
e64e226
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ConfluentJenkins Apr 4, 2023
e85d064
Merge branch '10.4.x' into master (using strategy ours)
ConfluentJenkins Apr 4, 2023
fa76fd5
Merge branch '10.0.x' into 10.1.x (using strategy ours)
ConfluentJenkins Apr 7, 2023
44e7f2b
Merge branch '10.1.x' into 10.2.x (using strategy ours)
ConfluentJenkins Apr 7, 2023
b836779
Merge branch '10.2.x' into 10.3.x (using strategy ours)
ConfluentJenkins Apr 7, 2023
abadb14
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ConfluentJenkins Apr 7, 2023
c91be43
Merge branch '10.4.x' into master (using strategy ours)
ConfluentJenkins Apr 7, 2023
7919ac6
Merge branch '10.0.x' into 10.1.x
ConfluentJenkins Apr 13, 2023
91e0ea1
Merge branch '10.1.x' into 10.2.x
ConfluentJenkins Apr 13, 2023
4cbc9f0
Merge branch '10.2.x' into 10.3.x
ConfluentJenkins Apr 13, 2023
ac1e638
Merge branch '10.3.x' into 10.4.x
ConfluentJenkins Apr 13, 2023
5724eda
Merge branch '10.4.x' into master
ConfluentJenkins Apr 13, 2023
a5cc26b
[maven-release-plugin] prepare release v10.1.9
sp-gupta Apr 13, 2023
4d7fd42
[maven-release-plugin] prepare for next development iteration
sp-gupta Apr 13, 2023
819dc97
Merge branch '10.0.x' into 10.1.x (using strategy ours)
sp-gupta Apr 13, 2023
3daf323
Merge branch '10.1.x' into 10.2.x (using strategy ours)
sp-gupta Apr 13, 2023
4eb33cf
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Apr 13, 2023
1ae5268
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Apr 13, 2023
d5d128c
Merge branch '10.4.x' into master (using strategy ours)
sp-gupta Apr 13, 2023
663e2ed
[maven-release-plugin] prepare release v10.2.8
sp-gupta Apr 13, 2023
40775d0
[maven-release-plugin] prepare for next development iteration
sp-gupta Apr 13, 2023
604c667
[maven-release-plugin] prepare release v10.3.5
sp-gupta Apr 13, 2023
ebe4023
[maven-release-plugin] prepare for next development iteration
sp-gupta Apr 13, 2023
0516038
[maven-release-plugin] prepare release v10.4.3
sp-gupta Apr 13, 2023
1243094
[maven-release-plugin] prepare for next development iteration
sp-gupta Apr 13, 2023
167545e
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Apr 13, 2023
5fdb176
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Apr 13, 2023
c26968b
Merge branch '10.4.x' into master (using strategy ours)
sp-gupta Apr 13, 2023
b3d356d
Revert "added service.yml for setting up semaphore pipeline"
kapilchhajer Apr 18, 2023
8702881
Merge pull request #647 from confluentinc/revert-633-semaphore-setup
kapilchhajer Apr 21, 2023
53c4c4d
[maven-release-plugin] prepare branch 10.5.x
pbadani May 16, 2023
92f491a
[maven-release-plugin] prepare release v10.5.0
pbadani May 16, 2023
68f7377
[maven-release-plugin] prepare for next development iteration
pbadani May 16, 2023
29f4bc2
Merge branch '10.0.x' into 10.1.x
ConfluentJenkins May 31, 2023
0740329
Merge branch '10.2.x' into pr_merge_from_10_1_x_to_10_2_x
pbadani May 31, 2023
e68dd0d
Merge pull request #653 from confluentinc/pr_merge_from_10_1_x_to_10_2_x
pbadani May 31, 2023
67742f8
Merge branch '10.2.x' into 10.3.x by pbadani
ConfluentJenkins May 31, 2023
235821d
Merge branch '10.3.x' into 10.4.x by pbadani
ConfluentJenkins May 31, 2023
fbf8758
Merge branch '10.4.x' into 10.5.x by pbadani
ConfluentJenkins May 31, 2023
9e6214a
[maven-release-plugin] prepare release v10.1.10
pbadani Jun 1, 2023
4af2454
[maven-release-plugin] prepare for next development iteration
pbadani Jun 1, 2023
0004c20
Merge branch '10.0.x' into 10.1.x (using strategy ours)
pbadani Jun 1, 2023
e207de0
Merge branch '10.1.x' into 10.2.x (using strategy ours)
pbadani Jun 1, 2023
0ff7fe7
Merge branch '10.2.x' into 10.3.x (using strategy ours)
pbadani Jun 1, 2023
357ea1b
Merge branch '10.3.x' into 10.4.x (using strategy ours)
pbadani Jun 1, 2023
f47eb5e
Merge branch '10.4.x' into 10.5.x (using strategy ours)
pbadani Jun 1, 2023
2811693
[maven-release-plugin] prepare release v10.2.9
pbadani Jun 1, 2023
a5085a4
[maven-release-plugin] prepare for next development iteration
pbadani Jun 1, 2023
a59584a
[maven-release-plugin] prepare release v10.3.6
pbadani Jun 1, 2023
e4bd7e8
[maven-release-plugin] prepare for next development iteration
pbadani Jun 1, 2023
e5116f3
Merge branch '10.2.x' into 10.3.x (using strategy ours)
pbadani Jun 1, 2023
bcce7fc
Merge branch '10.3.x' into 10.4.x (using strategy ours)
pbadani Jun 1, 2023
79f2988
Merge branch '10.4.x' into 10.5.x (using strategy ours)
pbadani Jun 1, 2023
8bc360f
[maven-release-plugin] prepare release v10.4.4
pbadani Jun 2, 2023
59228c3
[maven-release-plugin] prepare for next development iteration
pbadani Jun 2, 2023
be6d9c3
[maven-release-plugin] prepare release v10.5.1
pbadani Jun 2, 2023
59a396f
[maven-release-plugin] prepare for next development iteration
pbadani Jun 2, 2023
fbf2941
Merge branch '10.4.x' into 10.5.x (using strategy ours)
pbadani Jun 2, 2023
049085f
Merge branch '10.0.x' into 10.1.x by sp-gupta
ConfluentJenkins Aug 10, 2023
18b16d8
Merge branch '10.1.x' into 10.2.x by sp-gupta
ConfluentJenkins Aug 10, 2023
0cea77e
Merge branch '10.2.x' into 10.3.x by sp-gupta
ConfluentJenkins Aug 10, 2023
77f5fff
Merge branch '10.3.x' into 10.4.x by sp-gupta
ConfluentJenkins Aug 10, 2023
06f5faa
Merge branch '10.4.x' into 10.5.x by sp-gupta
ConfluentJenkins Aug 10, 2023
cf45891
[maven-release-plugin] prepare release v10.1.11
sp-gupta Aug 11, 2023
e97ceaf
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 11, 2023
ee285c7
[maven-release-plugin] prepare release v10.2.10
sp-gupta Aug 11, 2023
2fad7aa
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 11, 2023
4d3d40c
Merge branch '10.0.x' into 10.1.x (using strategy ours)
sp-gupta Aug 11, 2023
bfa76c8
Merge branch '10.1.x' into 10.2.x (using strategy ours)
sp-gupta Aug 11, 2023
d4e657b
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Aug 11, 2023
7d7dc43
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Aug 11, 2023
0affa72
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Aug 11, 2023
212707b
[maven-release-plugin] prepare release v10.5.2
sp-gupta Aug 11, 2023
a2d51d3
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 11, 2023
2712571
Merge branch '10.0.x' into 10.1.x by aniketshrimal
ConfluentJenkins Aug 15, 2023
5268089
Merge branch '10.1.x' into 10.2.x by aniketshrimal
ConfluentJenkins Aug 15, 2023
0bc6268
Merge branch '10.2.x' into 10.3.x by aniketshrimal
ConfluentJenkins Aug 15, 2023
04a2422
Merge branch '10.3.x' into 10.4.x by aniketshrimal
ConfluentJenkins Aug 15, 2023
a179885
Merge branch '10.4.x' into 10.5.x by aniketshrimal
ConfluentJenkins Aug 15, 2023
42a5fb1
[maven-release-plugin] prepare release v10.1.12
sp-gupta Aug 16, 2023
1dba657
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 16, 2023
1ab7867
Merge branch '10.0.x' into 10.1.x (using strategy ours)
sp-gupta Aug 16, 2023
3f2bbb7
Merge branch '10.1.x' into 10.2.x (using strategy ours)
sp-gupta Aug 16, 2023
ca0bbcd
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Aug 16, 2023
72de41a
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Aug 16, 2023
d1f2d52
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Aug 16, 2023
fc99bb0
[maven-release-plugin] prepare release v10.2.11
sp-gupta Aug 16, 2023
bff5697
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 16, 2023
6661adb
[maven-release-plugin] prepare release v10.3.7
sp-gupta Aug 16, 2023
9a4163a
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 16, 2023
84b7d39
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Aug 16, 2023
d5a6f46
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Aug 16, 2023
a5c514f
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Aug 16, 2023
53adb6f
[maven-release-plugin] prepare release v10.4.5
sp-gupta Aug 16, 2023
38095fc
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 16, 2023
dea0d57
[maven-release-plugin] prepare release v10.5.3
sp-gupta Aug 16, 2023
7fe4367
[maven-release-plugin] prepare for next development iteration
sp-gupta Aug 16, 2023
c4d36bb
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Aug 16, 2023
7ed4ed6
Merge branch '10.0.x' into 10.1.x
ConfluentJenkins Aug 18, 2023
54e36e9
Merge branch '10.1.x' into 10.2.x
ConfluentJenkins Aug 18, 2023
b03a728
Merge branch '10.2.x' into 10.3.x
ConfluentJenkins Aug 18, 2023
200a9c5
Merge branch '10.4.x' into pr_merge_from_10_3_x_to_10_4_x
pbadani Aug 18, 2023
addf5c1
Merge pull request #676 from confluentinc/pr_merge_from_10_3_x_to_10_4_x
pbadani Aug 18, 2023
2c358a9
Merge branch '10.4.x' into 10.5.x by pbadani
ConfluentJenkins Aug 18, 2023
6266561
[maven-release-plugin] prepare release v10.1.13
pbadani Aug 18, 2023
ec800a6
[maven-release-plugin] prepare for next development iteration
pbadani Aug 18, 2023
3a5bb5a
Merge branch '10.0.x' into 10.1.x (using strategy ours)
pbadani Aug 18, 2023
c431dff
Merge branch '10.1.x' into 10.2.x (using strategy ours)
pbadani Aug 18, 2023
0fb1090
Merge branch '10.2.x' into 10.3.x (using strategy ours)
pbadani Aug 18, 2023
c9308ff
Merge branch '10.3.x' into 10.4.x (using strategy ours)
pbadani Aug 18, 2023
9665df5
Merge branch '10.4.x' into 10.5.x (using strategy ours)
pbadani Aug 18, 2023
007cf69
[maven-release-plugin] prepare release v10.2.12
pbadani Aug 18, 2023
dbe69bc
[maven-release-plugin] prepare for next development iteration
pbadani Aug 18, 2023
ac208b3
[maven-release-plugin] prepare release v10.3.8
pbadani Aug 18, 2023
3299a08
[maven-release-plugin] prepare for next development iteration
pbadani Aug 18, 2023
58a93a2
Merge branch '10.2.x' into 10.3.x (using strategy ours)
pbadani Aug 18, 2023
3a3c7e4
Merge branch '10.3.x' into 10.4.x (using strategy ours)
pbadani Aug 18, 2023
491e8fc
Merge branch '10.4.x' into 10.5.x (using strategy ours)
pbadani Aug 18, 2023
8a1ddcf
[maven-release-plugin] prepare release v10.4.6
pbadani Aug 18, 2023
0a4c600
[maven-release-plugin] prepare for next development iteration
pbadani Aug 18, 2023
2b37159
[maven-release-plugin] prepare release v10.5.4
pbadani Aug 18, 2023
cfe2437
[maven-release-plugin] prepare for next development iteration
pbadani Aug 18, 2023
581c96b
Merge branch '10.4.x' into 10.5.x (using strategy ours)
pbadani Aug 18, 2023
bc91728
Merge branch '10.0.x' into 10.1.x
ConfluentJenkins Sep 7, 2023
424f4f7
Merge branch '10.1.x' into 10.2.x
ConfluentJenkins Sep 7, 2023
27b69ea
Merge branch '10.2.x' into 10.3.x
ConfluentJenkins Sep 7, 2023
6756491
Merge branch '10.3.x' into 10.4.x
ConfluentJenkins Sep 7, 2023
f5ce550
Merge branch '10.4.x' into 10.5.x
ConfluentJenkins Sep 7, 2023
2a486a2
Merge branch '10.0.x' into 10.1.x by ashoke-cube
ConfluentJenkins Sep 12, 2023
ea3aa3e
Merge branch '10.1.x' into 10.2.x by ashoke-cube
ConfluentJenkins Sep 12, 2023
48970bb
Merge branch '10.2.x' into 10.3.x by ashoke-cube
ConfluentJenkins Sep 12, 2023
fda435f
Merge branch '10.3.x' into 10.4.x by ashoke-cube
ConfluentJenkins Sep 12, 2023
e6494b3
Merge branch '10.4.x' into 10.5.x by ashoke-cube
ConfluentJenkins Sep 12, 2023
666f00d
[maven-release-plugin] prepare release v10.1.14
ashoke-cube Sep 12, 2023
d193678
[maven-release-plugin] prepare for next development iteration
ashoke-cube Sep 12, 2023
d25846c
Merge branch '10.1.x' into 10.2.x (using strategy ours)
ashoke-cube Sep 12, 2023
48f1377
Merge branch '10.2.x' into 10.3.x (using strategy ours)
ashoke-cube Sep 12, 2023
163049a
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ashoke-cube Sep 12, 2023
ad90fbe
Merge branch '10.4.x' into 10.5.x (using strategy ours)
ashoke-cube Sep 12, 2023
981821e
Merge branch '10.0.x' into 10.1.x (using strategy ours)
ashoke-cube Sep 12, 2023
3afb55e
Merge branch '10.1.x' into 10.2.x (using strategy ours)
ashoke-cube Sep 12, 2023
c12d535
Merge branch '10.2.x' into 10.3.x (using strategy ours)
ashoke-cube Sep 12, 2023
abfb79d
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ashoke-cube Sep 12, 2023
badcc93
Merge branch '10.4.x' into 10.5.x (using strategy ours)
ashoke-cube Sep 12, 2023
0c932f6
[maven-release-plugin] prepare release v10.3.9
ashoke-cube Sep 12, 2023
02d2b30
[maven-release-plugin] prepare release v10.5.5
ashoke-cube Sep 12, 2023
ac91c48
[maven-release-plugin] prepare for next development iteration
ashoke-cube Sep 12, 2023
0b74b26
[maven-release-plugin] prepare for next development iteration
ashoke-cube Sep 12, 2023
a0ba692
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ashoke-cube Sep 12, 2023
1bfcfe7
Merge branch '10.4.x' into 10.5.x (using strategy ours)
ashoke-cube Sep 12, 2023
9880029
[maven-release-plugin] prepare release v10.4.7
ashoke-cube Sep 12, 2023
9260407
[maven-release-plugin] prepare for next development iteration
ashoke-cube Sep 12, 2023
246f20a
Merge branch '10.4.x' into 10.5.x (using strategy ours)
ashoke-cube Sep 12, 2023
e9ff424
[maven-release-plugin] prepare release v10.2.13
ashoke-cube Sep 12, 2023
38610a6
[maven-release-plugin] prepare for next development iteration
ashoke-cube Sep 12, 2023
90bc381
Merge branch '10.2.x' into 10.3.x (using strategy ours)
ashoke-cube Sep 12, 2023
7cd5c84
Merge branch '10.3.x' into 10.4.x (using strategy ours)
ashoke-cube Sep 12, 2023
27e9d6c
Merge branch '10.4.x' into 10.5.x (using strategy ours)
ashoke-cube Sep 12, 2023
5d7148a
Merge branch '10.0.x' into 10.1.x
ConfluentJenkins Sep 27, 2023
0a8825a
Merge branch '10.1.x' into 10.2.x
ConfluentJenkins Sep 27, 2023
edbf853
Merge branch '10.2.x' into 10.3.x
ConfluentJenkins Sep 27, 2023
16dc1b2
Merge branch '10.3.x' into 10.4.x
ConfluentJenkins Sep 27, 2023
e4009ca
Merge branch '10.4.x' into 10.5.x
ConfluentJenkins Sep 27, 2023
8f6ecc4
[maven-release-plugin] prepare release v10.1.15
Enigma25 Sep 27, 2023
71b2516
[maven-release-plugin] prepare for next development iteration
Enigma25 Sep 27, 2023
47e8396
Merge branch '10.0.x' into 10.1.x (using strategy ours)
Enigma25 Sep 27, 2023
d9231b9
Merge branch '10.1.x' into 10.2.x (using strategy ours)
Enigma25 Sep 27, 2023
ab8a9c8
Merge branch '10.2.x' into 10.3.x (using strategy ours)
Enigma25 Sep 27, 2023
d6d9cc6
Merge branch '10.3.x' into 10.4.x (using strategy ours)
Enigma25 Sep 27, 2023
59a132e
Merge branch '10.4.x' into 10.5.x (using strategy ours)
Enigma25 Sep 27, 2023
b4b232d
[maven-release-plugin] prepare release v10.2.14
Enigma25 Sep 27, 2023
b723098
[maven-release-plugin] prepare for next development iteration
Enigma25 Sep 27, 2023
ee638c9
[maven-release-plugin] prepare release v10.3.10
Enigma25 Sep 27, 2023
11ce78a
[maven-release-plugin] prepare for next development iteration
Enigma25 Sep 27, 2023
d2bd2b3
Merge branch '10.2.x' into 10.3.x (using strategy ours)
Enigma25 Sep 27, 2023
93d6074
Merge branch '10.3.x' into 10.4.x (using strategy ours)
Enigma25 Sep 27, 2023
db426cc
Merge branch '10.4.x' into 10.5.x (using strategy ours)
Enigma25 Sep 27, 2023
d7b95fd
[maven-release-plugin] prepare release v10.4.8
Enigma25 Sep 28, 2023
92e78b6
[maven-release-plugin] prepare for next development iteration
Enigma25 Sep 28, 2023
d7cb7d7
[maven-release-plugin] prepare release v10.5.6
Enigma25 Sep 28, 2023
f4d287d
[maven-release-plugin] prepare for next development iteration
Enigma25 Sep 28, 2023
54731a6
Merge branch '10.4.x' into 10.5.x (using strategy ours)
Enigma25 Sep 28, 2023
8c88b30
Merge branch '10.0.x' into 10.1.x by sp-gupta
ConfluentJenkins Oct 27, 2023
965f73f
Merge branch '10.1.x' into 10.2.x by sp-gupta
ConfluentJenkins Oct 27, 2023
27ba311
Merge branch '10.2.x' into 10.3.x by sp-gupta
ConfluentJenkins Oct 27, 2023
95cd5fb
Merge branch '10.3.x' into 10.4.x by sp-gupta
ConfluentJenkins Oct 27, 2023
b139092
Merge branch '10.4.x' into 10.5.x by sp-gupta
ConfluentJenkins Oct 27, 2023
d02ca6b
[CC-21863] Resolve plugin.discovery error
sp-gupta Oct 29, 2023
94bd08c
[maven-release-plugin] prepare release v10.1.16
sp-gupta Oct 29, 2023
c370809
[maven-release-plugin] prepare for next development iteration
sp-gupta Oct 29, 2023
9782257
Merge branch '10.0.x' into 10.1.x (using strategy ours)
sp-gupta Oct 29, 2023
e267953
Merge branch '10.1.x' into 10.2.x (using strategy ours)
sp-gupta Oct 29, 2023
50b3b8f
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Oct 29, 2023
fefa18f
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Oct 29, 2023
c3e12ed
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Oct 29, 2023
e42b430
[maven-release-plugin] prepare release v10.2.15
sp-gupta Oct 29, 2023
6f952b4
[maven-release-plugin] prepare for next development iteration
sp-gupta Oct 29, 2023
dfa1b46
[maven-release-plugin] prepare release v10.3.11
sp-gupta Oct 29, 2023
e75b631
[maven-release-plugin] prepare for next development iteration
sp-gupta Oct 29, 2023
83eaf21
Merge branch '10.2.x' into 10.3.x (using strategy ours)
sp-gupta Oct 29, 2023
034dbd9
Merge branch '10.3.x' into 10.4.x (using strategy ours)
sp-gupta Oct 29, 2023
e75e23b
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Oct 29, 2023
69b8590
Merge pull request #696 from confluentinc/CC-21863-2
sp-gupta Oct 30, 2023
e79341c
Merge branch '10.4.x' into 10.5.x
ConfluentJenkins Oct 30, 2023
702e288
[maven-release-plugin] prepare release v10.4.9
sp-gupta Oct 30, 2023
e26f66d
[maven-release-plugin] prepare for next development iteration
sp-gupta Oct 30, 2023
d23c3b7
[maven-release-plugin] prepare release v10.5.7
sp-gupta Oct 30, 2023
7d07124
[maven-release-plugin] prepare for next development iteration
sp-gupta Oct 30, 2023
5dc9bbf
Merge branch '10.4.x' into 10.5.x (using strategy ours)
sp-gupta Oct 30, 2023
11300e9
MINOR: Add diagnostic info for topic partition assignments
anupamaggarwal Nov 8, 2023
d4a27e7
Merge pull request #700 from confluentinc/addinfo
anupamaggarwal Nov 8, 2023
6ae3abb
Merge branch '10.0.x' into 10.1.x
ConfluentSemaphore Feb 9, 2024
dc5eff8
Merge branch '10.1.x' into 10.2.x
ConfluentSemaphore Feb 9, 2024
be15db1
Merge branch '10.2.x' into 10.3.x
ConfluentSemaphore Feb 9, 2024
6da6696
Merge branch '10.3.x' into 10.4.x
ConfluentSemaphore Feb 9, 2024
8859d81
Merge branch '10.4.x' into 10.5.x
ConfluentSemaphore Feb 9, 2024
41b2dc0
Fix reporting modified record
naveenmall11 Feb 20, 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
181 changes: 181 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,188 @@
# Contributing

In order for us to consider merging a contribution, you will need to sign our
**C**ontributor **L**icense **A**greement.

> The purpose of a CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen licence.
> [Wikipedia](http://en.wikipedia.org/wiki/Contributor_License_Agreement)

You can read and sign our full Contributor License Agreement [here](http://clabot.confluent.io/cla).

## Reporting Bugs and Issues

Report bugs and issues by creating a new GitHub issue. Prior to creating an issue, please search
through existing issues so that you are not creating duplicate ones. If a pull request exists that
corresponds to the issue, mention this pull request on the GitHub issue.

## Guidelines for Contributing Code, Examples, Documentation

Code changes are submitted via a pull request (PR). When submitting a PR use the following
guidelines:

* Follow the style guide below
* Add/update documentation appropriately for the change you are making.
* Non-trivial changes should include unit tests covering the new functionality and potentially integration tests.
* Bug fixes should include unit tests and/or integration tests proving the issue is fixed.
* Try to keep pull requests short and submit separate ones for unrelated features.
* Keep formatting changes in separate commits to make code reviews easier and distinguish them from actual code changes.

### Code Style
This connector is using a coding style that generally follows the [Google Java coding standard guide](https://google.github.io/styleguide/javaguide.html).

Some conventions worth mentioning are:

* Indentation (single tab) is 2 spaces.
* All import statements are listed explicitly. The wildcard (*) is not used in imports.
* Imports are groups as follows:
```
import all packages not listed below (all other imports)
<blank line>
import all javax.* packages
import all java.* packages
<blank line>
import all io.confluent.* packages
<blank line>
import static packages
```
* Javadoc is highly recommended and often required during reviews in interfaces and public or protected classes and methods.

### Titles and changelogs

The title of a pull request is used as an entry on the release notes (aka changelogs) of the
connector in every release.

For this reason, please use a brief but descriptive title for your pull request. If GitHub shortens
your pull request title when you issue the pull request adding the excessive part to the pull
request description, make sure that you correct the title before or after you issue the pull
request.

If the fix is a minor fix you are encouraged to use the tag `MINOR:` followed by your pull request
title. You may link the corresponding issue to the description of your pull request but adding it to
the title will not be useful during changelog generation.

When reverting a previous commit, use the prefix `Revert ` on the pull request title (automatically
added by GitHub when a pull request is created to revert an existing commit).

### Tests
Every pull request should contain a sufficient amount of tests that assess your suggested code
changes. It’s highly recommended that you also check the code coverage of the production code you
are adding to make sure that your changes are covered sufficiently by the test code.

### Description
Including a good description when you issue your pull requests helps significantly with reviews.
Feel free to follow the template that is when issuing a pull request and mention how your changes
are tested.

### Backporting Commits
If your code changes are essentially bug fixes that make sense to backport to existing releases make sure to target the earliest release branch (e.g. 2.0.x) that should contain your changes. When selecting the release branch you should also consider how easy it will be to resolve any conflicts in newer release branches, including the `master` branch.

## Github Workflow

1. Fork the connector repository into your GitHub account: https://github.com/confluentinc/kafka-connect-storage-cloud/fork

2. Clone your fork of the GitHub repository, replacing `<username>` with your GitHub username.

Use ssh (recommended):

```bash
git clone [email protected]:<username>/kafka-connect-storage-cloud.git
```

Or https:

```bash
git clone https://github.com/<username>/kafka-connect-storage-cloud.git
```

3. Add a remote to keep up with upstream changes.

```bash
git remote add upstream https://github.com/confluentinc/kafka-connect-storage-cloud.git
```

If you already have a copy, fetch upstream changes.

```bash
git fetch upstream
```

or

```bash
git remote update
```

4. Create a feature branch to work in.

```bash
git checkout -b feature-xyz upstream/master
```

5. Work in your feature branch.

```bash
git commit -a --verbose
```

6. Periodically rebase your changes

```bash
git pull --rebase
```

7. When done, combine ("squash") related commits into a single one

```bash
git rebase -i upstream/master
```

This will open your editor and allow you to re-order commits and merge them:
- Re-order the lines to change commit order (to the extent possible without creating conflicts)
- Prefix commits using `s` (squash) or `f` (fixup) to merge extraneous commits.

8. Submit a pull-request

```bash
git push origin feature-xyz
```

Go to your fork main page

```bash
https://github.com/<username>/kafka-connect-storage-cloud.git
```

If you recently pushed your changes GitHub will automatically pop up a `Compare & pull request`
button for any branches you recently pushed to. If you click that button it will automatically
offer you to submit your pull-request to the `confluentinc` connector repository.

- Give your pull-request a meaningful title as described [above](#titles-and-changelogs).
- In the description, explain your changes and the problem they are solving.

9. Addressing code review comments

Repeat steps 5. through 7. to address any code review comments and rebase your changes if necessary.

Push your updated changes to update the pull request

```bash
git push origin [--force] feature-xyz
```

`--force` may be necessary to overwrite your existing pull request in case your
commit history was changed when performing the rebase.

Note: Be careful when using `--force` since you may lose data if you are not careful.

```bash
git push origin --force feature-xyz
```

## Useful Resources for Developers

1. Connector Developer Guide: https://docs.confluent.io/platform/current/connect/devguide.html
2. A Guide to the Confluent Verified Integrations Program: https://www.confluent.io/blog/guide-to-confluent-verified-integrations-program/
3. Verification Guide for Confluent Platform Integrations: https://cdn.confluent.io/wp-content/uploads/Verification-Guide-Confluent-Platform-Connectors-Integrations.pdf
4. From Zero to Hero with Kafka Connect: https://www.confluent.io/kafka-summit-lon19/from-zero-to-hero-with-kafka-connect/
5. 4 Steps to Creating Apache Kafka Connectors with the Kafka Connect API: https://www.confluent.io/blog/create-dynamic-kafka-connect-source-connectors/
6. How to Write a Connector for Kafka Connect – Deep Dive into Configuration Handling: https://www.confluent.io/blog/write-a-kafka-connect-connector-with-configuration-handling/
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,20 @@ for guidance on this process.

You can build *kafka-connect-storage-cloud* with Maven using the standard lifecycle phases.

# Running Integration Tests
Integration tests are run as part of `mvn install`; however one needs to first configure the environment variable`AWS_CREDENTIALS_PATH` to point to a json file path with following structure:
```
{
"aws_access_key_id": "<key>",
"aws_secret_access_key": "<secret>"
}
```

# Contribute

- Source Code: https://github.com/confluentinc/kafka-connect-storage-cloud
- Issue Tracker: https://github.com/confluentinc/kafka-connect-storage-cloud/issues
- Learn how to work with the connector's source code by reading our [Development and Contribution guidelines](CONTRIBUTING.md).


# License
Expand Down
2 changes: 1 addition & 1 deletion kafka-connect-s3/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>io.confluent</groupId>
<artifactId>kafka-connect-storage-cloud</artifactId>
<version>10.0.28-SNAPSHOT</version>
<version>10.5.8-SNAPSHOT</version>
</parent>

<artifactId>kafka-connect-s3</artifactId>
Expand Down
Loading