diff --git a/debezium-bom/pom.xml b/debezium-bom/pom.xml
index a883e4d56..ae0b5aac4 100644
--- a/debezium-bom/pom.xml
+++ b/debezium-bom/pom.xml
@@ -35,8 +35,8 @@
4.8.1
- 3.0.7
- 20.0.0
+ 4.0.17
+ 23.0.2
@@ -277,17 +277,17 @@
- org.codehaus.groovy
+ org.apache.groovy
groovy
${version.groovy}
- org.codehaus.groovy
+ org.apache.groovy
groovy-json
${version.groovy}
- org.codehaus.groovy
+ org.apache.groovy
groovy-jsr223
${version.groovy}
diff --git a/debezium-core/pom.xml b/debezium-core/pom.xml
index c7a7d5803..6c896a35b 100644
--- a/debezium-core/pom.xml
+++ b/debezium-core/pom.xml
@@ -82,7 +82,7 @@
test
- org.codehaus.groovy
+ org.apache.groovy
groovy-json
test
diff --git a/debezium-microbenchmark/pom.xml b/debezium-microbenchmark/pom.xml
index 5ba60025a..fbef8b959 100644
--- a/debezium-microbenchmark/pom.xml
+++ b/debezium-microbenchmark/pom.xml
@@ -45,12 +45,12 @@
connect-api
- org.codehaus.groovy
+ org.apache.groovy
groovy
true
- org.codehaus.groovy
+ org.apache.groovy
groovy-jsr223
true
diff --git a/debezium-scripting/debezium-scripting-languages/pom.xml b/debezium-scripting/debezium-scripting-languages/pom.xml
index 562496d0f..d5f7e9fb5 100644
--- a/debezium-scripting/debezium-scripting-languages/pom.xml
+++ b/debezium-scripting/debezium-scripting-languages/pom.xml
@@ -13,11 +13,11 @@
- org.codehaus.groovy
+ org.apache.groovy
groovy
- org.codehaus.groovy
+ org.apache.groovy
groovy-jsr223
diff --git a/debezium-scripting/debezium-scripting/pom.xml b/debezium-scripting/debezium-scripting/pom.xml
index 191ae070f..b75189827 100644
--- a/debezium-scripting/debezium-scripting/pom.xml
+++ b/debezium-scripting/debezium-scripting/pom.xml
@@ -59,7 +59,7 @@
test
- org.codehaus.groovy
+ org.apache.groovy
groovy-json
test
diff --git a/documentation/antora.yml b/documentation/antora.yml
index 88269f96d..29b97df2d 100644
--- a/documentation/antora.yml
+++ b/documentation/antora.yml
@@ -12,7 +12,7 @@ asciidoc:
debezium-kafka-version: '3.6.1'
debezium-docker-label: '2.5'
DockerKafkaConnect: registry.redhat.io/amq7/amq-streams-kafka-28-rhel8:1.8.0
- groovy-version: '3.0.11'
+ groovy-version: '4.0.17'
assemblies: '../assemblies'
modules: '../../modules'
mysql-version: '8.0'
diff --git a/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-db2-kafka-connect-yaml.adoc b/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-db2-kafka-connect-yaml.adoc
index d78aff1e9..3ed6c18cd 100644
--- a/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-db2-kafka-connect-yaml.adoc
+++ b/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-db2-kafka-connect-yaml.adoc
@@ -32,11 +32,11 @@ spec:
- type: zip
url: {red-hat-maven-repository}debezium/debezium-scripting/{debezium-version}-redhat-{debezium-build-number}/debezium-scripting-{debezium-version}-redhat-{debezium-build-number}.zip // <9>
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy/{groovy-version}/groovy-{groovy-version}.jar // <10>
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy/{groovy-version}/groovy-{groovy-version}.jar // <10>
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-jsr223/{groovy-version}/groovy-jsr223-{groovy-version}.jar
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy-jsr223/{groovy-version}/groovy-jsr223-{groovy-version}.jar
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-json{groovy-version}/groovy-json-{groovy-version}.jar
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy-json{groovy-version}/groovy-json-{groovy-version}.jar
- type: jar // <11>
url: https://repo1.maven.org/maven2/com/ibm/db2/jcc/{db2-version}/jcc-{db2-version}.jar
diff --git a/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-oracle-kafka-connect-yaml.adoc b/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-oracle-kafka-connect-yaml.adoc
index 3f24e98ad..f64370add 100644
--- a/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-oracle-kafka-connect-yaml.adoc
+++ b/documentation/modules/ROOT/partials/modules/all-connectors/ref-deploy-oracle-kafka-connect-yaml.adoc
@@ -32,11 +32,11 @@ spec:
- type: zip
url: {red-hat-maven-repository}debezium/debezium-scripting/{debezium-version}-redhat-{debezium-build-number}/debezium-scripting-{debezium-version}-redhat-{debezium-build-number}.zip // <9>
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy/{groovy-version}/groovy-{groovy-version}.jar // <10>
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy/{groovy-version}/groovy-{groovy-version}.jar // <10>
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-jsr223/{groovy-version}/groovy-jsr223-{groovy-version}.jar
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy-jsr223/{groovy-version}/groovy-jsr223-{groovy-version}.jar
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-json{groovy-version}/groovy-json-{groovy-version}.jar
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy-json{groovy-version}/groovy-json-{groovy-version}.jar
- type: jar // <11>
url: https://repo1.maven.org/maven2/com/oracle/database/jdbc/ojdbc8/{ojdbc8-version}/ojdbc8-{ojdbc8-version}.jar
diff --git a/documentation/modules/ROOT/partials/modules/all-connectors/shared-deploy-kafka-connect-yaml.adoc b/documentation/modules/ROOT/partials/modules/all-connectors/shared-deploy-kafka-connect-yaml.adoc
index e697e1e95..0c5f8cd21 100644
--- a/documentation/modules/ROOT/partials/modules/all-connectors/shared-deploy-kafka-connect-yaml.adoc
+++ b/documentation/modules/ROOT/partials/modules/all-connectors/shared-deploy-kafka-connect-yaml.adoc
@@ -31,11 +31,11 @@ spec:
- type: zip
url: {red-hat-maven-repository}debezium/debezium-scripting/{debezium-version}-redhat-{debezium-build-number}/debezium-scripting-{debezium-version}-redhat-{debezium-build-number}.zip // <9>
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy/{groovy-version}/groovy-{groovy-version}.jar // <10>
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy/{groovy-version}/groovy-{groovy-version}.jar // <10>
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-jsr223/{groovy-version}/groovy-jsr223-{groovy-version}.jar
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy-jsr223/{groovy-version}/groovy-jsr223-{groovy-version}.jar
- type: jar
- url: https://repo1.maven.org/maven2/org/codehaus/groovy/groovy-json{groovy-version}/groovy-json-{groovy-version}.jar
+ url: https://repo1.maven.org/maven2/org/apache/groovy/groovy-json{groovy-version}/groovy-json-{groovy-version}.jar
bootstrapServers: debezium-kafka-cluster-kafka-bootstrap:9093
diff --git a/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh b/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh
index de2a3e304..2e883ae28 100644
--- a/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh
+++ b/jenkins-jobs/scripts/upstream-artifact-server-prepare.sh
@@ -52,9 +52,9 @@ cp "$MAVEN_REPO"/io/apicurio/apicurio-registry-distro-connect-converter/*/apicur
# Copy groovy scripts
mkdir groovy
-cp "$MAVEN_REPO"/org/codehaus/groovy/groovy/*/groovy-*.jar groovy/
-cp "$MAVEN_REPO"/org/codehaus/groovy/groovy-json/*/groovy-json-*.jar groovy/
-cp "$MAVEN_REPO"/org/codehaus/groovy/groovy-jsr223/*/groovy-jsr223-*.jar groovy/
+cp "$MAVEN_REPO"/org/apache/groovy/groovy/*/groovy-*.jar groovy/
+cp "$MAVEN_REPO"/org/apache/groovy/groovy-json/*/groovy-json-*.jar groovy/
+cp "$MAVEN_REPO"/org/apache/groovy/groovy-jsr223/*/groovy-jsr223-*.jar groovy/
prefix=""
if [ "${ORACLE}" = "false" ] ; then