Skip to content

Commit c2afe66

Browse files
authored
Merge pull request #1808 from marklogic/java17test
MLE-12345:Using Java 17
2 parents 026fb5a + 1d90bc7 commit c2afe66

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Jenkinsfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ def setupDockerMarkLogic(String image){
2121
MARKLOGIC_IMAGE='''+image+''' MARKLOGIC_LOGS_VOLUME=marklogicLogs docker compose up -d --build
2222
echo "Waiting for MarkLogic server to initialize."
2323
sleep 60s
24+
export JAVA_HOME=$JAVA_HOME_DIR
2425
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2526
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
2627
./gradlew mlTestConnections

settings.gradle

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
plugins {
2-
// Allows for downloading a JDK based on Gradle toolchain configuration.
3-
// Using a version prior to 1.0, which requires Java 17, and Jenkins is using Java 8.
4-
id "org.gradle.toolchains.foojay-resolver-convention" version "0.10.0"
5-
}
1+
62

73
rootProject.name = 'marklogic-client-api-parent'
84
include ':marklogic-client-api'

0 commit comments

Comments
 (0)