Skip to content

Commit 8fb00ea

Browse files
author
MarkLogic Builder
authored
DHFPROD-1928: merging PR
DHFPROD-1928: Adding the change log to Release Branch
2 parents a36f097 + c2dbb83 commit 8fb00ea

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
11
# Change Log
22

33

4+
# [v4.2.2](https://github.com/marklogic/marklogic-data-hub/tree/v4.2.2) (2019-03-13)
5+
6+
**Fixed bugs:**
7+
- empty collector result should be finished instead of failed job [\#1715](https://github.com/marklogic/marklogic-data-hub/issues/1715)
8+
- gradle hubRunFlow options does not lose dhf prefix [\#1536](https://github.com/marklogic/marklogic-data-hub/issues/1536)
9+
- [DHFPROD-1930] Data Hub Framework URI handling with diacritics
10+
- [DHFPROD-1929] Triggers dont get deployed to staging-triggers
11+
12+
13+
# [v4.2.1](https://github.com/marklogic/marklogic-data-hub/tree/v4.2.1) (2019-02-27)
14+
15+
**Fixed bugs:**
16+
- Unable to delete harmonize flow with the "trash" icon [\#1877](https://github.com/marklogic/marklogic-data-hub/issues/1877)
17+
- QuickStart - mlcp transform_param shows the wrong entity when defining input flow [\#1858](https://github.com/marklogic/marklogic-data-hub/issues/1858)
18+
- flow name no longer stored for errors [\#1845](https://github.com/marklogic/marklogic-data-hub/issues/1845)
19+
20+
**Improvement**
21+
- [DHFPROD-1819] - Generate ES-created entity schema
22+
23+
24+
25+
426
# [v4.2.0](https://github.com/marklogic/marklogic-data-hub/tree/v4.2.0) (2019-02-14)
527
[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v4.1.1...v4.2.0)
628

‎Jenkinsfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pipeline{
3333
}
3434
}
3535
println(BRANCH_NAME)
36-
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean --stacktrace;./gradlew build -x test -Pskipui=true;'
36+
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean --stacktrace;./gradlew build -x test -Pskipui=true;'
3737
archiveArtifacts artifacts: 'data-hub/marklogic-data-hub/build/libs/* , data-hub/ml-data-hub-plugin/build/libs/* , data-hub/quick-start/build/libs/', onlyIfSuccessful: true }
3838
post{
3939
failure {
@@ -56,7 +56,7 @@ pipeline{
5656
steps{
5757
copyRPM 'Latest'
5858
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
59-
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;'
59+
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;'
6060
junit '**/TEST-*.xml'
6161
script{
6262
if(env.CHANGE_TITLE){
@@ -195,7 +195,7 @@ pipeline{
195195
steps{
196196
copyRPM 'Latest'
197197
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
198-
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true -Dorg.gradle.jvmargs=-Xmx1g;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;'
198+
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true -Dorg.gradle.jvmargs=-Xmx1g;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;'
199199
junit '**/TEST-*.xml'
200200
script{
201201
commitMessage = sh (returnStdout: true, script:'''
@@ -279,7 +279,7 @@ pipeline{
279279
copyRPM 'Release','9.0-6'
280280
script{
281281
def dockerhost=setupMLDockerCluster 3
282-
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "su -builder;echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;"'
282+
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "su -builder;echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;"'
283283
}
284284
junit '**/TEST-*.xml'
285285
script{
@@ -314,7 +314,7 @@ pipeline{
314314
copyRPM 'Release','9.0-7'
315315
script{
316316
def dockerhost=setupMLDockerCluster 3
317-
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "su -builder;echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;"'
317+
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "su -builder;echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;"'
318318
}
319319
junit '**/TEST-*.xml'
320320
script{
@@ -348,7 +348,7 @@ pipeline{
348348
copyRPM 'Release','9.0-8'
349349
script{
350350
def dockerhost=setupMLDockerCluster 3
351-
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;"'
351+
sh 'docker exec -u builder -i '+dockerhost+' /bin/sh -c "echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;set +e;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;sleep 10s;./gradlew marklogic-data-hub:testBootstrap -Pskipui=true;sleep 10s;./gradlew ml-data-hub:testFullCycle -Pskipui=true;"'
352352
}
353353
junit '**/TEST-*.xml'
354354
script{
@@ -465,7 +465,7 @@ pipeline{
465465
post{
466466
success{
467467
node('dhfLinuxAgent'){
468-
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew publish'
468+
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew publish'
469469
}
470470
}
471471
}
@@ -523,7 +523,7 @@ pipeline{
523523
steps{
524524
copyRPM 'Latest'
525525
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
526-
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USR_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;'
526+
sh 'echo $JAVA_HOME;export JAVA_HOME=`$JAVA_HOME_DIR`;export GRADLE_USER_HOME=$WORKSPACE$GRADLE_DIR;export M2_HOME=$MAVEN_HOME/bin;export PATH=$GRADLE_USER_HOME:$PATH:$MAVEN_HOME/bin;cd $WORKSPACE/data-hub;rm -rf $GRADLE_USER_HOME/caches;./gradlew clean;./gradlew clean;./gradlew marklogic-data-hub:test -Pskipui=true;sleep 10s;./gradlew ml-data-hub:test -Pskipui=true;sleep 10s;./gradlew quick-start:test -Pskipui=true;'
527527
junit '**/TEST-*.xml'
528528
script{
529529
commitMessage = sh (returnStdout: true, script:'''

0 commit comments

Comments
 (0)