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 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'