Skip to content

Commit cefcfce

Browse files
committed
MLE-24511 Bumping to latest nightly server version
Also updated the Gradle wrapper and ml-gradle, and now requiring Java 17. This also will make it easier to convert the Jenkinsfile to use Docker as well, instead of rpm's.
1 parent 1124a2f commit cefcfce

File tree

10 files changed

+301
-204
lines changed

10 files changed

+301
-204
lines changed

.copyrightconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ startyear: 2015
1111
# - Dotfiles already skipped automatically
1212
# Enable by removing the leading '# ' from the next line and editing values.
1313
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
14-
filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json
14+
filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ please see the README file.
88

99
To run any of the steps below, first verify that you have the following available;
1010
[sdkman](https://sdkman.io/) is recommended for installing and maintaining versions of Java:
11-
* Java 8.x
11+
* Java 17.x
1212

1313
You will also need to clone this repository locally and open a CLI in the root directory of the cloned project.
1414

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pipeline{
8888
DMC_USER = credentials('MLBUILD_USER')
8989
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
9090
GRADLE_DIR=".gradle"
91-
JAVA_HOME_DIR="/home/builder/java/openjdk-1.8.0-262"
91+
JAVA_HOME_DIR="/home/builder/java/jdk-17.0.2"
9292
}
9393
stages{
9494
stage('runtests-11.3.1'){

test-app/.env

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
2+
3+
# Latest MarkLogic release:
4+
# MARKLOGIC_IMAGE="progressofficial/marklogic-db:latest"
5+
6+
MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs

test-app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// Only used for setting up the test AppServer in MarkLogic
22
plugins {
33
id 'net.saliman.properties' version '1.5.2'
4+
// Sticking with 5.0.0 until a bug in 6.0.x is fixed where LSQT config isn't deployed correctly.
45
id "com.marklogic.ml-gradle" version "5.0.0"
56
}
67

test-app/docker-compose.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ name: node-client
33
services:
44

55
marklogic:
6-
image: "progressofficial/marklogic-db:latest"
7-
# image: "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12"
6+
image: "${MARKLOGIC_IMAGE}"
87
platform: linux/amd64
98
environment:
109
- INSTALL_CONVERTERS=true
1110
- MARKLOGIC_INIT=true
1211
- MARKLOGIC_ADMIN_USERNAME=admin
1312
- MARKLOGIC_ADMIN_PASSWORD=admin
1413
volumes:
15-
- ./docker/marklogic/logs:/var/opt/MarkLogic/Logs
14+
- ${MARKLOGIC_LOGS_VOLUME}:/var/opt/MarkLogic/Logs
1615
ports:
1716
- 8000-8002:8000-8002
1817
- 8015-8017:8015-8017
-16.6 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)