Skip to content

Commit e172e5d

Browse files
paxtonharepaxtonhare
committed
Merge branch 'release/2.0.0'
2 parents 3d095c3 + f70095a commit e172e5d

File tree

192 files changed

+2943
-1673
lines changed

Some content is hidden

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

192 files changed

+2943
-1673
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
matrix:
2+
include:
3+
- env: ML_VERSION=8.0-7
4+
- env: ML_VERSION=9.0-1.1
5+
- env: ML_VERSION=9.0-2
6+
- env: ML_VERSION=9.0-3
7+
18
dist: trusty
29
sudo: required
310
services:

‎.travis/Dockerfile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,17 @@ ENV JAVA_HOME /usr/java/latest
3434
ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/MarkLogic/mlcmd/bin
3535

3636
# Install MarkLogic
37-
COPY ./MarkLogic.rpm /tmp/MarkLogic.rpm
37+
COPY .travis/install-ml-8.sh /tmp/install-ml-8.sh
38+
COPY .travis/install-ml-9.sh /tmp/install-ml-9.sh
39+
COPY .travis/install-ml-10.sh /tmp/install-ml-10.sh
40+
COPY .travis/install-ml.sh /tmp/install-ml.sh
3841

39-
RUN yum -y install /tmp/MarkLogic.rpm 2>&1 > /dev/null
42+
ARG MLBUILD_USER
43+
ARG MLBUILD_PASSWORD
44+
ARG ML_VERSION
45+
46+
RUN chmod 755 /tmp/install-ml.sh
47+
RUN /tmp/install-ml.sh "$MLBUILD_USER" "$MLBUILD_PASSWORD" "$ML_VERSION"
4048

4149
# Expose MarkLogic Server ports - add additional ones for your REST, etc
4250
# endpoints

‎.travis/download.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ echo "Logging in to Docker registry"
44
docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
55

66
echo "Getting Docker Image"
7-
docker pull marklogiccommunity/marklogic-datahub-2x
7+
docker pull marklogiccommunity/marklogic-datahub:${ML_VERSION}

‎.travis/install-ml-10.sh‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
#!/bin/bash
2+
3+
# runs command from parameters and exits with the eoror code of the command
4+
# if it fails
5+
function successOrExit {
6+
"$@"
7+
local status=$?
8+
if [ $status -ne 0 ]; then
9+
echo "$1 exited with error: $status"
10+
exit $status
11+
fi
12+
}
13+
14+
test $1 && MLBUILD_USER=$1
15+
test $2 && MLBUILD_PASSWORD=$2
16+
test $3 && ML_VERSION=$3
17+
18+
suffix=$(sed -e 's#.*\.\(\)#\1#' <<< $ML_VERSION)
19+
if [[ $suffix = 'nightly' ]]; then
20+
# find today
21+
day=$(date +"%Y%m%d")
22+
23+
# if the user passed a day string as a param then use it instead
24+
test $4 && day=$4
25+
# make a version number out of the date
26+
ver="10.0-$day"
27+
28+
echo "********* Downloading MarkLogic nightly $ver"
29+
30+
# fetch/install ML nightly
31+
fname="MarkLogic-$ver.x86_64.rpm"
32+
33+
url="https://root.marklogic.com/nightly/builds/linux64-rh7/rh7v-10-tst-1.marklogic.com/HEAD/pkgs.$day/$fname"
34+
35+
status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
36+
if [[ $status = 200 ]]; then
37+
successOrExit curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD -o ./$fname $url
38+
39+
fname=$(pwd)/$fname
40+
41+
yum -y install $fname 2>&1 > /dev/null
42+
43+
echo "********* MarkLogic nightly $ver installed"
44+
else
45+
echo "CANNOT DOWNLOAD: status = $status for date $day (URL=\"$url\")"
46+
exit 1
47+
fi
48+
else
49+
echo "There is no ML 10, silly!"
50+
exit 1
51+
fi

‎.travis/install-ml-8.sh‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#!/bin/bash
2+
3+
# runs command from parameters and exits with the eoror code of the command
4+
# if it fails
5+
function successOrExit {
6+
"$@"
7+
local status=$?
8+
if [ $status -ne 0 ]; then
9+
echo "$1 exited with error: $status"
10+
exit $status
11+
fi
12+
}
13+
14+
test $1 && MLBUILD_USER=$1
15+
test $2 && MLBUILD_PASSWORD=$2
16+
test $3 && ML_VERSION=$3
17+
18+
suffix=$(sed -e 's#.*\.\(\)#\1#' <<< $ML_VERSION)
19+
if [[ $suffix = 'nightly' ]]; then
20+
# find today
21+
day=$(date +"%Y%m%d")
22+
23+
# if the user passed a day string as a param then use it instead
24+
test $4 && day=$4
25+
# make a version number out of the date
26+
ver="8.0-$day"
27+
28+
echo "********* Downloading MarkLogic nightly $ver"
29+
30+
# fetch/install ML nightly
31+
fname="MarkLogic-RHEL7-$ver.x86_64.rpm"
32+
33+
url="https://root.marklogic.com/nightly/builds/linux64-rh7/rh7-intel64-80-test-1.marklogic.com/b8_0/pkgs.$day/$fname"
34+
35+
status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
36+
if [[ $status = 200 ]]; then
37+
successOrExit curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD -o ./$fname $url
38+
39+
fname=$(pwd)/$fname
40+
41+
yum -y install $fname --skip-broken
42+
43+
echo "********* MarkLogic nightly $ver installed"
44+
else
45+
echo "CANNOT DOWNLOAD: status = $status for date $day (URL=\"$url\")"
46+
exit 1
47+
fi
48+
else
49+
ver=${ML_VERSION}
50+
fname=MarkLogic-RHEL7-${ver}.x86_64.rpm
51+
52+
curl -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login
53+
dl_link=$(curl -b cookies.txt --data "download=/download/binaries/8.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
54+
url="https://developer.marklogic.com${dl_link}"
55+
56+
echo "********* Downloading MarkLogic $ver"
57+
echo "Download URL: $url"
58+
59+
successOrExit curl -k -o ./$fname $url
60+
61+
fname=$(pwd)/$fname
62+
63+
yum -y install $fname --skip-broken
64+
65+
echo "********* MarkLogic $ver installed"
66+
fi

‎.travis/install-ml-9.sh‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
#!/bin/bash
2+
3+
# runs command from parameters and exits with the eoror code of the command
4+
# if it fails
5+
function successOrExit {
6+
"$@"
7+
local status=$?
8+
if [ $status -ne 0 ]; then
9+
echo "$1 exited with error: $status"
10+
exit $status
11+
fi
12+
}
13+
14+
test $1 && MLBUILD_USER=$1
15+
test $2 && MLBUILD_PASSWORD=$2
16+
test $3 && ML_VERSION=$3
17+
18+
suffix=$(sed -e 's#.*\.\(\)#\1#' <<< $ML_VERSION)
19+
if [[ $suffix = 'nightly' ]]; then
20+
# find today
21+
day=$(date +"%Y%m%d")
22+
23+
# if the user passed a day string as a param then use it instead
24+
test $4 && day=$4
25+
# make a version number out of the date
26+
ver="9.0-$day"
27+
28+
echo "********* Downloading MarkLogic nightly $ver"
29+
30+
# fetch/install ML nightly
31+
fname="MarkLogic-$ver.x86_64.rpm"
32+
33+
url="https://root.marklogic.com/nightly/builds/linux64-rh7/rh7v-intel64-90-test-build.marklogic.com/b9_0/pkgs.$day/$fname"
34+
35+
status=$(curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD --head --write-out %{http_code} --silent --output /dev/null $url)
36+
if [[ $status = 200 ]]; then
37+
successOrExit curl -k --anyauth -u $MLBUILD_USER:$MLBUILD_PASSWORD -o ./$fname $url
38+
39+
fname=$(pwd)/$fname
40+
41+
yum -y install $fname 2>&1 > /dev/null
42+
43+
echo "********* MarkLogic nightly $ver installed"
44+
else
45+
echo "CANNOT DOWNLOAD: status = $status for date $day (URL=\"$url\")"
46+
exit 1
47+
fi
48+
else
49+
ver=${ML_VERSION}
50+
fname=MarkLogic-${ver}.x86_64.rpm
51+
52+
curl -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login
53+
dl_link=$(curl -b cookies.txt --data "download=/download/binaries/9.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
54+
url="https://developer.marklogic.com${dl_link}"
55+
56+
echo "********* Downloading MarkLogic $ver"
57+
58+
successOrExit curl -k -o ./$fname $url
59+
60+
fname=$(pwd)/$fname
61+
62+
yum -y install $fname 2>&1 > /dev/null
63+
64+
echo "********* MarkLogic $ver installed"
65+
fi

‎.travis/install-ml.sh‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#!/bin/bash
2+
3+
test $1 && MLBUILD_USER=$1
4+
test $2 && MLBUILD_PASSWORD=$2
5+
test $3 && ML_VERSION=$3
6+
echo "ML_VERSION = ${ML_VERSION}"
7+
MAJOR_VER=$(sed -e 's#\([^.]*\)\..*#\1#' <<< $ML_VERSION)
8+
echo "major version = ${MAJOR_VER}"
9+
if [ "${MAJOR_VER}" = "8" ]; then
10+
echo "/tmp/install-ml-8.sh"
11+
chmod 755 /tmp/install-ml-8.sh
12+
/tmp/install-ml-8.sh ${MLBUILD_USER} ${MLBUILD_PASSWORD} ${ML_VERSION}
13+
elif [ "${MAJOR_VER}" = "9" ]; then
14+
echo "/tmp/install-ml-9.sh"
15+
chmod 755 /tmp/install-ml-9.sh
16+
/tmp/install-ml-9.sh ${MLBUILD_USER} ${MLBUILD_PASSWORD} ${ML_VERSION}
17+
elif [ "${MAJOR_VER}" = "10" ]; then
18+
echo "/tmp/install-ml-10.sh"
19+
chmod 755 /tmp/install-ml-10.sh
20+
/tmp/install-ml-10.sh ${MLBUILD_USER} ${MLBUILD_PASSWORD} ${ML_VERSION}
21+
else
22+
echo "NOTHING TO INSTALL!"
23+
exit 1
24+
fi

‎CHANGELOG.md‎

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

3+
## [Unreleased](https://github.com/marklogic-community/marklogic-data-hub/tree/HEAD)
4+
5+
[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-rc.2...HEAD)
6+
7+
**Fixed bugs:**
8+
9+
- mlWatch is deploying Flow XMLs on every iteration [\#522](https://github.com/marklogic-community/marklogic-data-hub/issues/522)
10+
- Can't login to quickstart with data-hub-user [\#519](https://github.com/marklogic-community/marklogic-data-hub/issues/519)
11+
- Error when settings gradle properties from task definition [\#518](https://github.com/marklogic-community/marklogic-data-hub/issues/518)
12+
- Basic auth not working [\#517](https://github.com/marklogic-community/marklogic-data-hub/issues/517)
13+
- Debug of run-flow transform breaks multipart requests and can't be turned off [\#516](https://github.com/marklogic-community/marklogic-data-hub/issues/516)
14+
- Bug in deploying Flows to MarkLogic [\#512](https://github.com/marklogic-community/marklogic-data-hub/issues/512)
15+
- Writer trace is firing twice [\#510](https://github.com/marklogic-community/marklogic-data-hub/issues/510)
16+
- Error loading XSD schemas [\#509](https://github.com/marklogic-community/marklogic-data-hub/issues/509)
17+
18+
**Closed issues:**
19+
20+
- Can't run flows with spaces in the names from MLCP [\#523](https://github.com/marklogic-community/marklogic-data-hub/issues/523)
21+
- Better error handling on gradle hubRunFlow [\#514](https://github.com/marklogic-community/marklogic-data-hub/issues/514)
22+
- Move the Input Flow writer trace into main.\(sjs|xqy\) [\#513](https://github.com/marklogic-community/marklogic-data-hub/issues/513)
23+
- Links need updating [\#508](https://github.com/marklogic-community/marklogic-data-hub/issues/508)
24+
- Update to latest ml-gradle [\#505](https://github.com/marklogic-community/marklogic-data-hub/issues/505)
25+
- Input flow \(mlcp\) options aren't saved [\#481](https://github.com/marklogic-community/marklogic-data-hub/issues/481)
26+
327
## [v2.0.0-rc.2](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-rc.2) (2017-09-12)
428
[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.5...v2.0.0-rc.2)
529

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ plugins {
7171
...
7272
7373
// comment out this line. It pulls the version from the cloud
74-
// id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
74+
// id 'com.marklogic.ml-data-hub' version '2.0.0'
7575
}
7676
7777
// this tells gradle to apply the plugin you included above in the buildscript section

‎README.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This project allows you to deploy a skeleton Data Hub into MarkLogic. With some
2424
You need these to get started
2525

2626
- Java 8 JDK
27-
- MarkLogic 8.2 or greater, or 9.0 or greater
27+
- MarkLogic 8.0-7 or greater, or 9.0-1.1 or greater
2828
- Gradle 3.4 or greater **(Optional)**
2929

3030
### TL;DR
@@ -35,12 +35,12 @@ Or watch the [MarkLogic University - Data Hub Framework On Demand Video Courses]
3535

3636
### The Easiest Way
3737

38-
To use the Data Hub Framework you should download the latest [quickstart.war](https://github.com/marklogic-community/marklogic-data-hub/releases/download/v2.0.0-rc.2/quick-start-2.0.0-rc.2.war).
38+
To use the Data Hub Framework you should download the latest [quickstart.war](https://github.com/marklogic-community/marklogic-data-hub/releases/download/v2.0.0/quick-start-2.0.0.war).
3939

4040
Then Run the war like so:
4141

4242
```bash
43-
java -jar quick-start-2.0.0-rc.2.war
43+
java -jar quick-start-2.0.0.war
4444
```
4545

4646
### Using the Hub in your existing Java project
@@ -50,7 +50,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
5050
**Gradle**
5151

5252
```groovy
53-
compile('com.marklogic:marklogic-data-hub:2.0.0-rc.2')
53+
compile('com.marklogic:marklogic-data-hub:2.0.0')
5454
```
5555

5656
**Maven**
@@ -59,15 +59,15 @@ compile('com.marklogic:marklogic-data-hub:2.0.0-rc.2')
5959
<dependency>
6060
<groupId>com.marklogic</groupId>
6161
<artifactId>marklogic-data-hub</artifactId>
62-
<version>2.0.0-rc.2</version>
62+
<version>2.0.0</version>
6363
<type>pom</type>
6464
</dependency>
6565
```
6666

6767
**Ivy**
6868

6969
```xml
70-
<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.2'>
70+
<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0'>
7171
<artifact name='$AID' ext='pom'></artifact>
7272
</dependency>
7373
```
@@ -78,7 +78,7 @@ If you prefer to use gradle for all of your hub interactions then you can includ
7878

7979
```groovy
8080
plugins {
81-
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
81+
id 'com.marklogic.ml-data-hub' version '2.0.0'
8282
}
8383
```
8484

0 commit comments

Comments
 (0)