Skip to content

Commit

Permalink
Merge pull request #712 from marklogic/release/5.0.0
Browse files Browse the repository at this point in the history
Merging release/5.0.0 into master
  • Loading branch information
rjrudin authored Sep 16, 2024
2 parents 8b516c6 + d6b1710 commit 7596356
Show file tree
Hide file tree
Showing 1,370 changed files with 67,651 additions and 726 deletions.
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ gradle-local.properties
/.nb-gradle
/.settings
/.project
ml-gradle-all/build/
ml-gradle-all/.gradle/
ml-gradle-all/.classpath
ml-gradle-all/.project
ml-gradle-all/.settings/
sample-project/data/export/
sample-project/local.gradle
examples/sample-project/local.gradle
Expand Down
140 changes: 0 additions & 140 deletions CHANGELOG.mdown

This file was deleted.

10 changes: 8 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,20 @@ pipeline{
stages{
stage('tests'){
steps{
copyRPM 'Release','10.0-9.4'
copyRPM 'Release','11.3.0'
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
sh label:'test', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd ml-gradle
./gradlew test || true
cd ml-javaclient-util-test-app
echo "mlPassword=admin" > gradle-local.properties
../gradlew -i mlDeploy
cd ..
./gradlew ml-javaclient-util:test || true
./gradlew ml-app-deployer:test || true
./gradlew ml-gradle:test || true
'''
junit '**/build/**/*.xml'
}
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ First, [install Gradle](https://gradle.org/install/).

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

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

Then run:

Expand Down
Loading

0 comments on commit 7596356

Please sign in to comment.