Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .copyrightconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ startyear: 2015
# - Dotfiles already skipped automatically
# Enable by removing the leading '# ' from the next line and editing values.
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json
filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ please see the README file.

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

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

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ pipeline{
DMC_USER = credentials('MLBUILD_USER')
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
GRADLE_DIR=".gradle"
JAVA_HOME_DIR="/home/builder/java/openjdk-1.8.0-262"
JAVA_HOME_DIR="/home/builder/java/jdk-17.0.2"
}
stages{
stage('runtests-11.3.1'){
Expand Down
7 changes: 7 additions & 0 deletions test-app/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Latest 12 nightly release:
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12

# Latest MarkLogic release:
# MARKLOGIC_IMAGE="progressofficial/marklogic-db:latest"

MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs
1 change: 1 addition & 0 deletions test-app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Only used for setting up the test AppServer in MarkLogic
plugins {
id 'net.saliman.properties' version '1.5.2'
// Sticking with 5.0.0 until a bug in 6.0.x is fixed where LSQT config isn't deployed correctly.
id "com.marklogic.ml-gradle" version "5.0.0"
}

Expand Down
5 changes: 2 additions & 3 deletions test-app/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ name: node-client
services:

marklogic:
image: "progressofficial/marklogic-db:latest"
# image: "ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12"
image: "${MARKLOGIC_IMAGE}"
platform: linux/amd64
environment:
- INSTALL_CONVERTERS=true
- MARKLOGIC_INIT=true
- MARKLOGIC_ADMIN_USERNAME=admin
- MARKLOGIC_ADMIN_PASSWORD=admin
volumes:
- ./docker/marklogic/logs:/var/opt/MarkLogic/Logs
- ${MARKLOGIC_LOGS_VOLUME}:/var/opt/MarkLogic/Logs
ports:
- 8000-8002:8000-8002
- 8015-8017:8015-8017
Binary file modified test-app/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion test-app/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading