Skip to content

MLE-24402 Bumping to Hadoop 3.4.2 #556

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.

Sign up for GitHub

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

Merged
rjrudin merged 1 commit into from
Sep 24, 2025
Merged

MLE-24402 Bumping to Hadoop 3.4.2 #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,16 @@ subprojects {
repositories {
mavenCentral()
maven {
url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
}
}

configurations.all {
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
if (details.requested.group.equals("org.apache.hadoop") and details.requested.version.equals("3.4.1")) {
details.useVersion "3.4.2"
details.because "Using 3.4.2 to minimize CVEs and because Flux is doing the same thing. This only affects the connector tests."
}
if (details.requested.group.startsWith('com.fasterxml.jackson')) {
details.useVersion '2.17.2'
details.because 'Need to match the version used by Spark.'
Expand Down Expand Up @@ -79,16 +83,12 @@ subprojects {
exclude module: "rocksdbjni"
}

task allDeps(type: DependencyReportTask) {
description = "Allows for generating dependency reports for every subproject in a single task."
}

test {
useJUnitPlatform()
finalizedBy jacocoTestReport
testLogging {
events 'started', 'passed', 'skipped', 'failed'
exceptionFormat 'full'
events = ['started', 'passed', 'skipped', 'failed']
exceptionFormat = 'full'
}
environment "SEMAPHORE_API_KEY", semaphoreApiKey
environment "SEMAPHORE_HOST", semaphoreHost
Expand Down
29 changes: 21 additions & 8 deletions marklogic-spark-connector/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,12 @@ dependencies {
// Only needs compileOnly, as the Java Client brings this as an implementation dependency.
compileOnly 'com.squareup.okhttp3:okhttp:4.12.0'

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

testImplementation "org.apache.spark:spark-sql_2.13:${sparkVersion}"

// Supports testing the embedder feature.
Expand Down Expand Up @@ -112,11 +118,11 @@ test {
jvmArgs = [
'--add-exports=java.base/sun.nio.ch=ALL-UNNAMED',
'--add-exports=java.base/sun.util.calendar=ALL-UNNAMED',
'--add-exports=java.base/sun.security.action=ALL-UNNAMED'
]
'--add-exports=java.base/sun.security.action=ALL-UNNAMED',

// Increased heap size as part of the Spark 4 upgrade, as we started experiencing OOM errors in the tests.
jvmArgs '-Xmx6g', '-Xms3g'
// Increased heap size as part of the Spark 4 upgrade, as we started experiencing OOM errors in the tests.
'-Xmx6g', '-Xms3g'
]
}

shadowJar {
Expand Down Expand Up @@ -145,6 +151,13 @@ java {
withSourcesJar()
}

// Allows for identifying compiler warnings and treating them as errors.
tasks.withType(JavaCompile) {
options.compilerArgs += ["-Xlint:unchecked", "-Xlint:deprecation", "-Werror"]
options.deprecation = true
options.warnings = true
Copy link

Copilot AI Sep 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The options.warnings = true setting is redundant since warnings are already enabled by default in Gradle. The -Xlint flags on line 150 are sufficient for enabling specific warning categories.

Suggested change
options.warnings = true

Copilot uses AI. Check for mistakes.
}

javadoc.failOnError = false
// Ignores warnings on params that don't have descriptions, which is a little too noisy
javadoc.options.addStringOption('Xdoclint:none', '-quiet')
Expand Down Expand Up @@ -185,17 +198,17 @@ publishing {
maven {
if (project.hasProperty("mavenUser")) {
credentials {
username mavenUser
password mavenPassword
username = mavenUser
password = mavenPassword
}
url publishUrl
allowInsecureProtocol = true
} else {
name = "central"
url = mavenCentralUrl
credentials {
username mavenCentralUsername
password mavenCentralPassword
username = mavenCentralUsername
password = mavenCentralPassword
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion marklogic-spark-connector/src/test/java/com/marklogic/spark/AbstractIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ protected final String rowsToString(List<Row> rows) {
/**
* Avoids having to repeat mode/save.
*/
protected void defaultWrite(DataFrameWriter writer) {
protected void defaultWrite(DataFrameWriter<?> writer) {
writer.options(defaultWriteOptions())
.mode(SaveMode.Append)
.save();
Expand Down