Skip to content

Commit d69f7de

Browse files
committed
MLE-24717 Bumping logback
Fixed some Gradle warnings as well.
1 parent 962a78a commit d69f7de

File tree

1 file changed

+26
-15
lines changed

1 file changed

+26
-15
lines changed

build.gradle

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ configurations {
4444
documentation
4545
assets
4646

47-
configurations.all {
47+
configureEach {
4848
resolutionStrategy {
4949
// Force v4.5.0 of commons-collections4 to avoid CVEs in v4.4.0 from transitive dependecies:
5050
// CVE-2025-48924 (https://www.cve.org/CVERecord?id=CVE-2025-48924) and
@@ -67,7 +67,7 @@ configurations {
6767

6868
// Force v4.2.6.Final of netty-all to avoid CVE-2025-58057
6969
// (https://www.cve.org/CVERecord?id=CVE-2025-58057), which is a transitive
70-
// dependency of marklogic-data-hub:6.2.1
70+
// dependency of marklogic-data-hub:6.2.1
7171
if (details.requested.group.equals("io.netty") && details.requested.version.startsWith("4")) {
7272
details.useVersion "4.2.6.Final"
7373
details.because "Bumping from 4.1.0 (what marklogic-data-hub:6.2.1 depends on) to 4.2.6.Final to eliminate CVEs."
@@ -114,14 +114,14 @@ dependencies {
114114
testImplementation "org.apache.avro:avro-compiler:1.12.0"
115115

116116
// Forcing logback to be used for test logging
117-
testImplementation "ch.qos.logback:logback-classic:1.5.18"
118-
testImplementation "org.slf4j:jcl-over-slf4j:2.0.16"
117+
testImplementation "ch.qos.logback:logback-classic:1.5.19"
118+
testImplementation "org.slf4j:jcl-over-slf4j:2.0.17"
119119

120120
// Automatic loading of test framework implementation dependencies is deprecated.
121121
// https://docs.gradle.org/current/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
122122
// Without this, once using JUnit 5.12 or higher, Gradle will not find any tests and report an error of:
123123
// org.junit.platform.commons.JUnitException: TestEngine with ID 'junit-jupiter' failed to discover tests
124-
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.13.4"
124+
testRuntimeOnly "org.junit.platform:junit-platform-launcher:1.14.0"
125125

126126
documentation files('LICENSE.txt')
127127
documentation files('NOTICE.txt')
@@ -180,34 +180,40 @@ ext {
180180

181181
import org.apache.tools.ant.filters.ReplaceTokens
182182

183-
task connectorArchive_CopyManifestToBuildDirectory(type: Copy, group: confluentArchiveGroup) {
183+
tasks.register("connectorArchive_CopyManifestToBuildDirectory", Copy) {
184+
group = confluentArchiveGroup
184185
description = "Copy the project manifest into the root folder"
185186
from '.'
186187
include 'manifest.json'
187188
into "${baseArchiveBuildDir}/${baseArchiveName}"
188189
filter(ReplaceTokens, tokens: [CONFLUENT_USER: componentOwner, VERSION: version])
189190
}
190191

191-
task connectorArchive_CopyAssetsToBuildDirectory(type: Copy, group: confluentArchiveGroup) {
192+
tasks.register("connectorArchive_CopyAssetsToBuildDirectory", Copy) {
193+
group = confluentArchiveGroup
192194
description = "Copy the project assets into the assets folder"
193195
from configurations.assets
194196
into "${baseArchiveBuildDir}/${baseArchiveName}/assets"
195197
}
196198

197-
task connectorArchive_CopyEtcToBuildDirectory(type: Copy, group: confluentArchiveGroup) {
199+
tasks.register("connectorArchive_CopyEtcToBuildDirectory", Copy) {
200+
group = confluentArchiveGroup
198201
description = "Copy the project support files into the etc folder"
199202
from 'config'
200203
include '*'
201204
into "${baseArchiveBuildDir}/${baseArchiveName}/etc"
202205
}
203206

204-
task connectorArchive_CopyDocumentationToBuildDirectory(type: Copy, group: confluentArchiveGroup) {
207+
tasks.register("connectorArchive_CopyDocumentationToBuildDirectory", Copy) {
208+
group = confluentArchiveGroup
205209
description = "Copy the project documentation into the doc folder"
206210
from configurations.documentation
207211
into "${baseArchiveBuildDir}/${baseArchiveName}/doc"
208212
}
209213

210-
task connectorArchive_CopyDependenciesToBuildDirectory(type: Copy, group: confluentArchiveGroup, dependsOn: jar) {
214+
tasks.register("connectorArchive_CopyDependenciesToBuildDirectory", Copy) {
215+
group = confluentArchiveGroup
216+
dependsOn jar
211217
description = "Copy the dependency jars into the lib folder"
212218
from jar
213219
// Confluent already includes the Jackson dependencies that this connector depends on. If the connector includes any
@@ -224,18 +230,21 @@ task connectorArchive_CopyDependenciesToBuildDirectory(type: Copy, group: conflu
224230
into "${baseArchiveBuildDir}/${baseArchiveName}/lib"
225231
}
226232

227-
task connectorArchive_BuildDirectory(group: confluentArchiveGroup) {
233+
tasks.register("connectorArchive_BuildDirectory") {
234+
group = confluentArchiveGroup
228235
description = "Build the directory that will be used to create the Kafka Connector Archive"
229-
dependsOn = [
236+
dependsOn(
230237
connectorArchive_CopyManifestToBuildDirectory,
231238
connectorArchive_CopyDependenciesToBuildDirectory,
232239
connectorArchive_CopyDocumentationToBuildDirectory,
233240
connectorArchive_CopyEtcToBuildDirectory,
234241
connectorArchive_CopyAssetsToBuildDirectory
235-
]
242+
)
236243
}
237244

238-
task connectorArchive(type: Zip, dependsOn: connectorArchive_BuildDirectory, group: confluentArchiveGroup) {
245+
tasks.register("connectorArchive", Zip) {
246+
group = confluentArchiveGroup
247+
dependsOn connectorArchive_BuildDirectory
239248
description = 'Build a Connector Hub for the Confluent Connector Hub'
240249
from "${baseArchiveBuildDir}"
241250
include '**/*'
@@ -245,7 +254,9 @@ task connectorArchive(type: Zip, dependsOn: connectorArchive_BuildDirectory, gro
245254

246255
// Tasks for using the connector with Confluent Platform on Docker
247256

248-
task copyConnectorToDockerVolume(type: Copy, dependsOn: connectorArchive, group: confluentTestingGroup) {
257+
tasks.register("copyConnectorToDockerVolume", Copy) {
258+
group = confluentTestingGroup
259+
dependsOn connectorArchive
249260
description = "Copies the connector's archive directory to the Docker volume shared with the Connect server"
250261
from "build/connectorArchive"
251262
into "./docker/confluent-marklogic-components"

0 commit comments

Comments
 (0)