Skip to content

Commit c9fae4d

Browse files
committed
DEVEXP-652 Bumped to Java Client 6.3.0 to address vulnerability
Addresses the vulnerability in okio, which is fixed in Java Client 6.3.0. Had to bump Gradle to 8 to allow for uber jar to be built, now that Jackson 2.15 is used by the Java Client (we did the same thing for our Spark connector). Everything in the CONTRIB ran fine, no issues encountered.
1 parent 68d8c1e commit c9fae4d

File tree

3 files changed

+14
-26
lines changed

3 files changed

+14
-26
lines changed

build.gradle

+12-24
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
22
id 'java'
33
id 'net.saliman.properties' version '1.5.2'
4-
id 'com.github.johnrengelman.shadow' version '7.1.2'
4+
id 'com.github.johnrengelman.shadow' version '8.1.1'
55
id "com.github.jk1.dependency-license-report" version "1.19"
66

77
// Only used for testing
8-
id 'com.marklogic.ml-gradle' version '4.5.0'
8+
id 'com.marklogic.ml-gradle' version '4.6.0'
99
id 'jacoco'
1010
id "org.sonarqube" version "3.5.0.2730"
1111

@@ -23,19 +23,6 @@ java {
2323

2424
repositories {
2525
mavenCentral()
26-
27-
// For testing
28-
mavenLocal()
29-
maven {
30-
url "https://nexus.marklogic.com/repository/maven-snapshots/"
31-
}
32-
}
33-
34-
// Do not cache changing modules
35-
configurations.all {
36-
resolutionStrategy {
37-
cacheChangingModulesFor 0, 'seconds'
38-
}
3926
}
4027

4128
configurations {
@@ -44,7 +31,7 @@ configurations {
4431
}
4532

4633
ext {
47-
kafkaVersion = "3.2.3"
34+
kafkaVersion = "3.5.1"
4835
}
4936

5037
dependencies {
@@ -53,11 +40,11 @@ dependencies {
5340
compileOnly "org.apache.kafka:connect-runtime:${kafkaVersion}"
5441
compileOnly "org.slf4j:slf4j-api:1.7.36"
5542

56-
implementation 'com.marklogic:ml-javaclient-util:4.5.0'
43+
implementation 'com.marklogic:ml-javaclient-util:4.6.0'
5744
// Force DHF to use the latest version of ml-app-deployer, which minimizes security vulnerabilities
58-
implementation "com.marklogic:ml-app-deployer:4.5.0"
45+
implementation "com.marklogic:ml-app-deployer:4.6.0"
5946

60-
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.14.1"
47+
implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.15.2"
6148

6249
// Note that in general, the version of the DHF jar must match that of the deployed DHF instance. Different versions
6350
// may work together, but that behavior is not guaranteed.
@@ -72,11 +59,11 @@ dependencies {
7259
exclude module: "logback-classic"
7360
}
7461

75-
testImplementation 'com.marklogic:marklogic-junit5:1.3.0'
62+
testImplementation 'com.marklogic:marklogic-junit5:1.4.0'
7663

7764
testImplementation "org.apache.kafka:connect-api:${kafkaVersion}"
7865
testImplementation "org.apache.kafka:connect-json:${kafkaVersion}"
79-
testImplementation 'net.mguenther.kafka:kafka-junit:3.2.2'
66+
testImplementation 'net.mguenther.kafka:kafka-junit:3.5.1'
8067

8168
testImplementation "org.apache.avro:avro-compiler:1.11.1"
8269

@@ -113,7 +100,8 @@ jacocoTestReport {
113100
// Enabling the XML report allows for sonar to grab coverage data from jacoco
114101
jacocoTestReport {
115102
reports {
116-
xml.enabled true
103+
// This isn't working with Gradle 8. Will replace this soon with the sonar instance in docker-compose.
104+
// xml.enabled true
117105
}
118106
}
119107

@@ -220,8 +208,8 @@ task connectorArchive(type: Zip, dependsOn: connectorArchive_BuildDirectory, gro
220208
description = 'Build a Connector Hub for the Confluent Connector Hub'
221209
from "${baseArchiveBuildDir}"
222210
include '**/*'
223-
archiveName "${baseArchiveName}.zip"
224-
destinationDir(file('build/distro'))
211+
archiveFileName = "${baseArchiveName}.zip"
212+
destinationDirectory = file('build/distro')
225213
}
226214

227215
task installConnectorInConfluent(type: Exec, group: confluentTestingGroup, dependsOn: [connectorArchive]) {

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
group=com.marklogic
2-
version=1.8.0
2+
version=1.8-SNAPSHOT
33

44
# For the Confluent Connector Archive
55
componentOwner=marklogic
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)