Merge branch 'dev'

Author: Rob Rudin

LICENSE

@@ -1,11 +1,13 @@
 buildscript {
   repositories {
+		jcenter()
     maven {
       url "https://plugins.gradle.org/m2/"
     }
   }
   dependencies {
     classpath "com.gradle.publish:plugin-publish-plugin:0.9.5"
+		classpath "com.smokejumperit.gradle.license:Gradle-License-Report:0.0.2"
   }
 }
 
@@ -19,6 +21,9 @@ plugins {
 
 apply plugin: "com.gradle.plugin-publish"
 
+// gradle dependencyLicenseReport to generate your report in build/reports/dependency-license
+apply plugin:'license-report'
+
 sourceCompatibility = "1.7"
 targetCompatibility = "1.7"
 

build.gradle

@@ -1,6 +1,6 @@
 # Set this to the version you used when running
 # "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
-mlGradleVersion=2.6.DEV
+mlGradleVersion=DEV
 
 mlHost=localhost
 mlAppName=example

examples/local-testing-project/gradle.properties

@@ -30,8 +30,12 @@ repositories {
 configurations {
 	// This configuration captures the dependencies for running mlcp (Content Pump). This is only needed if you want
 	// to run mlcp via Gradle tasks. If you do, using com.marklogic.gradle.task.MlcpTask is a useful starting point, as
-	// shown below.
-	mlcp
+	// shown below.  Need to force to use certain version of xml-apis library.
+	mlcp {
+      resolutionStrategy {
+        force "xml-apis:xml-apis:1.4.01"
+      }
+    }
 }
 
 /**
@@ -43,9 +47,7 @@ configurations {
  * bin/winutils.exe. This does not appear to have any impact on mlcp behavior though.
  */
 dependencies {
-	mlcp "com.marklogic:mlcp:8.0-5"
-	//mlcp "com.marklogic:mlcp-Hadoop2:1.3-2"
-	//mlcp "com.marklogic:marklogic-mapreduce2:2.1.3"
+	mlcp "com.marklogic:mlcp:8.0.6.3"
 
 	/**
 	 * If you need to import delimited text, be sure to include this dependency as well.

examples/mlcp-project/build.gradle

@@ -0,0 +1,8 @@
+This project shows how to deploy a sample temporal config - including lsqt config
+
+Note that (as of this version), the deployed temporal config cannot be changed except for 
+
+1. The temporal collection option properties (refer to https://docs.marklogic.com/temporal:collection-set-options for possible values)
+1. The lsqt temporal collection option properties (refer to https://docs.marklogic.com/REST/PUT/manage/v2/databases/[id-or-name]/temporal/collections/lsqt/properties@collection=[name]) for possible values)
+	1. Note that the lsqt config filename must correspond to the name of the temporal collection it is modifying
+	1. E.g. ml-config/temporal/collections/lsqt/my-temporal-collection.json will modify the lsqt properties for the 'my-temporal-collection' temporal collection 

examples/schemas-project/src/main/ml-schemas/tde/my.ruleset

@@ -0,0 +1,3 @@
+plugins {
+	id "com.marklogic.ml-gradle" version "2.6.0"
+}

examples/temporal-lsqt-project/README.md

@@ -0,0 +1,6 @@
+mlHost=localhost
+mlAppName=temporal-lsqt-project
+mlRestPort=8450
+mlUsername=admin
+mlPassword=admin
+

examples/temporal-lsqt-project/build.gradle

@@ -0,0 +1,42 @@
+{
+  "database-name": "%%DATABASE%%",
+  "triggers-database": "%%TRIGGERS_DATABASE%%",
+  "schema-database": "%%SCHEMAS_DATABASE%%",
+	"range-element-index": [
+		{
+			"collation": "",
+			"invalid-values": "reject",
+			"localname": "validStart",
+			"namespace-uri": "",
+			"range-value-positions": false,
+			"scalar-type": "dateTime"
+		}
+	,
+		{
+			"collation": "",
+			"invalid-values": "reject",
+			"localname": "validEnd",
+			"namespace-uri": "",
+			"range-value-positions": false,
+			"scalar-type": "dateTime"
+		}
+	,
+		{
+			"collation": "",
+			"invalid-values": "reject",
+			"localname": "systemStart",
+			"namespace-uri": "",
+			"range-value-positions": false,
+			"scalar-type": "dateTime"
+		}
+	,
+		{
+			"collation": "",
+			"invalid-values": "reject",
+			"localname": "systemEnd",
+			"namespace-uri": "",
+			"range-value-positions": false,
+			"scalar-type": "dateTime"
+		}
+	]
+}

examples/temporal-lsqt-project/gradle.properties

@@ -0,0 +1,3 @@
+{
+  "database-name": "%%SCHEMAS_DATABASE%%"
+}