chore: resolve conflicts

Author: kamilmysliwiec

.gitignore

@@ -1,4 +1,5 @@
 packages/*/package-lock.json
+sample/*/package-lock.json
 
 # dependencies
 node_modules/
@@ -10,7 +11,7 @@ node_modules/
 /.devcontainer
 /.classpath
 /.project
-/.settings 
+/.settings
 *.code-workspace
 
 # Vim

LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Kamil Mysliwiec <https://kamilmysliwiec.com>
+Copyright (c) 2017-2025 Kamil Mysliwiec <https://kamilmysliwiec.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

integration/docker-compose.yml

@@ -25,7 +25,7 @@ services:
       - "9001:9001"
     restart: always
   mysql:
-    image: mysql:8.4.3
+    image: mysql:9.1.0
     environment:
       MYSQL_ROOT_HOST: '%'
       MYSQL_ROOT_PASSWORD: root
@@ -51,7 +51,7 @@ services:
   zookeeper:
     container_name: test-zookeeper
     hostname: zookeeper
-    image: confluentinc/cp-zookeeper:7.7.1
+    image: confluentinc/cp-zookeeper:7.8.0
     ports:
       - "2181:2181"
     environment:
@@ -60,7 +60,7 @@ services:
   kafka:
     container_name: test-kafka
     hostname: kafka
-    image: confluentinc/cp-kafka:7.7.1
+    image: confluentinc/cp-kafka:7.8.0
     depends_on:
       - zookeeper
     ports:

lerna.json

@@ -3,5 +3,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "10.4.11"
+  "version": "10.4.15"
 }