Skip to content

Commit 7596356

Browse files
authored
Merge pull request #712 from marklogic/release/5.0.0
Merging release/5.0.0 into master
2 parents 8b516c6 + d6b1710 commit 7596356

File tree

1,370 files changed

+67651
-726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,370 files changed

+67651
-726
lines changed

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ gradle-local.properties
66
/.nb-gradle
77
/.settings
88
/.project
9-
ml-gradle-all/build/
10-
ml-gradle-all/.gradle/
11-
ml-gradle-all/.classpath
12-
ml-gradle-all/.project
13-
ml-gradle-all/.settings/
149
sample-project/data/export/
1510
sample-project/local.gradle
1611
examples/sample-project/local.gradle

CHANGELOG.mdown

Lines changed: 0 additions & 140 deletions
This file was deleted.

Jenkinsfile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,20 @@ pipeline{
1414
stages{
1515
stage('tests'){
1616
steps{
17-
copyRPM 'Release','10.0-9.4'
17+
copyRPM 'Release','11.3.0'
1818
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
1919
sh label:'test', script: '''#!/bin/bash
2020
export JAVA_HOME=$JAVA_HOME_DIR
2121
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
2222
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
2323
cd ml-gradle
24-
./gradlew test || true
24+
cd ml-javaclient-util-test-app
25+
echo "mlPassword=admin" > gradle-local.properties
26+
../gradlew -i mlDeploy
27+
cd ..
28+
./gradlew ml-javaclient-util:test || true
29+
./gradlew ml-app-deployer:test || true
30+
./gradlew ml-gradle:test || true
2531
'''
2632
junit '**/build/**/*.xml'
2733
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ First, [install Gradle](https://gradle.org/install/).
4949

5050
Then, in an empty directory, create a file named "build.gradle" with your favorite text editor and enter the following:
5151

52-
plugins { id "com.marklogic.ml-gradle" version "4.8.0" }
52+
plugins { id "com.marklogic.ml-gradle" version "5.0.0" }
5353

5454
Then run:
5555

0 commit comments

Comments
 (0)