Merge pull request #42 from marklogic-community/develop

Release v0.12.0

Author: dmcassel

.gitignore

@@ -4,3 +4,9 @@
 .DS_Store
 build
 out
+.classpath
+.settings
+.project
+marklogic-unit-test-client/bin/
+gradle-local.properties
+.vscode

.travis/run-tests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
 if [ "${TRAVIS_SECURE_ENV_VARS}" = "true" ] ; then
-  cd ml-unit-test-client
+  cd marklogic-unit-test-client
   ../gradlew build test
 fi

CHANGELOG.md

@@ -1,2 +1,2 @@
 group=com.marklogic
-version=0.11.2
+version=0.12.0

CONTRIBUTING.md

@@ -36,11 +36,11 @@ publishing {
 	publications {
 		mainJava(MavenPublication) {
 			from components.java
-			artifactId "ml-unit-test-client"
+			artifactId "marklogic-unit-test-client"
 		}
 		sourcesJava(MavenPublication) {
 			from components.java
-			artifactId "ml-unit-test-client"
+			artifactId "marklogic-unit-test-client"
 			artifact sourcesJar
 		}
 	}
@@ -52,10 +52,11 @@ if (project.hasProperty("myBintrayUser")) {
 		key = myBintrayKey
 		publications = ["mainJava", "sourcesJava"]
 		pkg {
-			repo = "maven"
+			repo = "Maven"
 			name = project.name
+			userOrg = 'marklogic-community'
 			licenses = ["Apache-2.0"]
-			vcsUrl = "https://github.com/rjrudin/" + project.name + ".git"
+			vcsUrl = "https://github.com/marklogic-community/" + project.name + ".git"
 			version {
 				name = project.version
 				released = new Date()
@@ -75,7 +76,7 @@ import module namespace sec = "http://marklogic.com/xdmp/security"
 declare option xdmp:mapping "false";
 
 try {
-  sec:remove-credential("ml-unit-test-credentials")
+  sec:remove-credential("marklogic-unit-test-credentials")
 } catch (\$e) {()};
 
 xquery version "1.0-ml";
@@ -86,7 +87,7 @@ import module namespace sec = "http://marklogic.com/xdmp/security"
 declare option xdmp:mapping "false";
 
 sec:create-credential(
-   "ml-unit-test-credentials",
+   "marklogic-unit-test-credentials",
    "Credentials for ML Rest Helper Calls",
    "${mlUsername}",
    "${mlPassword}",

README.md

@@ -0,0 +1,13 @@
+# These properties are used for the test application that ml-gradle deploys so we can test out marklogic-unit-test
+mlAppName=marklogic-unit-test-testapp
+mlHost=localhost
+mlUsername=admin
+mlPassword=admin
+mlRestPort=8090
+
+# Load both the marklogic-unit-test framework code and some test modules
+mlModulePaths=../marklogic-unit-test-modules/src/main/ml-modules,src/test/ml-modules
+
+# This defaults to src/main/ml-config, but marklogic-unit-test doesn't have any configuration files itself. So the config
+# files are stored under src/test for the sole purpose of running tests on marklogic-unit-test.
+mlConfigPath=src/test/ml-config