Merge pull request #1454 from marklogic/feature/doc-updates

Updated functional test README, bumped to 6.0.0-SNAPSHOT

Author: rjrudin

.gitignore

@@ -30,3 +30,6 @@ out
 uriCache.txt
 gradle-local.properties
 bin
+repairXMLFull.xml
+xml-with-props.xml
+

README.md

@@ -1,4 +1,19 @@
+// We need the properties plugin to work on both marklogic-client-api and test-app. The 'plugins' Gradle syntax can't be
+// used for that. So we have to add the properties plugin to the buildscript classpath and then apply the properties
+// plugin via subprojects below.
+buildscript {
+    repositories {
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
+    }
+    dependencies {
+        classpath "net.saliman:gradle-properties-plugin:1.5.2"
+    }
+}
+
 subprojects {
+    apply plugin: "net.saliman.properties"
     apply plugin: 'java'
 
  	tasks.withType(JavaCompile) {
@@ -27,8 +42,5 @@ subprojects {
     	systemProperty "file.encoding", "UTF-8"
         systemProperty "javax.xml.stream.XMLOutputFactory", "com.sun.xml.internal.stream.XMLOutputFactoryImpl"
     }
-}
 
-task gradleWrapper(type: Wrapper) {
-    gradleVersion = '6.7'
 }

build.gradle

@@ -1,5 +1,9 @@
 group=com.marklogic
-version=5.5-SNAPSHOT
-releaseVersion=5.5.3
+version=6.0-SNAPSHOT
 describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases
+
+# Defined at this level so that they can be set as system properties and used by the marklogic-client-api and test-app
+# project
+mlHost=localhost
+mlPassword=admin

gradle.properties

@@ -1,9 +1,6 @@
 plugins {
     id 'maven-publish'
     id 'distribution'
-
-    id "net.saliman.properties" version "1.5.1"
-    id 'com.marklogic.ml-gradle' version '4.3.5'
 }
 
 group = 'com.marklogic'

marklogic-client-api-functionaltests/README.md

@@ -2,3 +2,4 @@ rootProject.name = 'marklogic-client-api-parent'
 include ':marklogic-client-api'
 include ':marklogic-client-api-functionaltests'
 include ':ml-development-tools'
+include ':test-app'