From dfb1506ec0b6cfcebaef92f0ddbacf8b88d009f2 Mon Sep 17 00:00:00 2001
From: SameeraPriyathamTadikonda <preethu4476@gmail.com>
Date: Thu, 24 Jul 2025 07:45:17 -0700
Subject: [PATCH 1/2] Removing plugin

---
 settings.gradle | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index 0526ec39f..e4bd7c9d8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,4 @@
-plugins {
-	// Allows for downloading a JDK based on Gradle toolchain configuration.
-	// Using a version prior to 1.0, which requires Java 17, and Jenkins is using Java 8.
-	id "org.gradle.toolchains.foojay-resolver-convention" version "0.10.0"
-}
+
 
 rootProject.name = 'marklogic-client-api-parent'
 include ':marklogic-client-api'

From 1d90bc779eaad04b4c54981e8a1d3311e31bd106 Mon Sep 17 00:00:00 2001
From: SameeraPriyathamTadikonda <preethu4476@gmail.com>
Date: Thu, 24 Jul 2025 08:30:01 -0700
Subject: [PATCH 2/2] Setting up java

---
 Jenkinsfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0d66f12e9..8e2e42f04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,6 +21,7 @@ def setupDockerMarkLogic(String image){
     MARKLOGIC_IMAGE='''+image+''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
     echo "Waiting for MarkLogic server to initialize."
     sleep 60s
+		export JAVA_HOME=$JAVA_HOME_DIR
 		export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
 		export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
 		./gradlew mlTestConnections