Merge branch 'dev'

Author: rjrudin

build.gradle

@@ -1,16 +1,3 @@
-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"
-  }
-}
-
 plugins {
   id "groovy"
   id "maven-publish"
@@ -21,11 +8,6 @@ plugins {
   id "com.gradle.plugin-publish" version "0.9.7"
 }
 
-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"
 
@@ -90,11 +72,11 @@ pluginBundle {
       displayName = 'ml-gradle for MarkLogic'
       description = 'Gradle plugin for configuring and deploying applications to MarkLogic'
       tags = ['marklogic']
-      version = "2.9.0"
+      version = project.version
     }
   }
 
   mavenCoordinates {
-    version = "2.9.0"
+    version = project.version
   }
 }

examples/local-testing-project/gradle.properties

@@ -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.9.0
+mlGradleVersion=3.0.0
 
 mlHost=localhost
 mlAppName=example

examples/sample-project/build.gradle

@@ -2,19 +2,28 @@
  * In order to use ml-gradle, it must be applied. This occurs after the two above blocks for overriding properties so
  * that those blocks can override properties before ml-gradle initializes itself.
  */
-plugins {
-  id "com.marklogic.ml-gradle" version "2.7.1"
+buildscript {
+	repositories {
+		mavenLocal()
+		jcenter()
+	}
+	dependencies {
+		classpath "com.marklogic:ml-gradle:3.0-alpha1"
+	}
+}
 
-  // The following plugins are optional
+plugins {
+	// The following plugins are optional
 
-  // The Java plugin is used to compile and run JUnit tests
-  id "java"
+	// The Java plugin is used to compile and run JUnit tests
+	id "java"
 
-  // These plugins are used to generate IDE files
-  id "eclipse"
-  id "idea"
+	// These plugins are used to generate IDE files
+	id "eclipse"
+	id "idea"
 }
 
+apply plugin: "com.marklogic.ml-gradle"
 
 /*
  * Everything below this line is optional and is intended to show different features provided by ml-gradle.
@@ -26,73 +35,70 @@ plugins {
  * dependencies expressed below.
  */
 repositories {
-    jcenter()
+	jcenter()
+	mavenLocal()
 }
 
 
 configurations {
-    // This custom Gradle configuration allows us to specify the classpath for running Corb jobs. This is only needed if
-    // you want to run Corb jobs via Gradle tasks. More info on Corb can be found at - http://developer.marklogic.com/code/corb.
-    corb
+	// This custom Gradle configuration allows us to specify the classpath for running Corb jobs. This is only needed if
+	// you want to run Corb jobs via Gradle tasks. More info on Corb can be found at - http://developer.marklogic.com/code/corb.
+	corb
 }
 
-
 /*
  * This expresses dependencies on the ml-java and ml-junit libraries. The former is typically used for application
  * code, and the latter supports writing JUnit-based tests. A dependency exists on RestAssured to show an option for
  * using that library in tests that must invoke MarkLogic HTTP endpoints.
  */
 dependencies {
-    // Needed to compile and run the JUnit tests
-    testCompile "com.marklogic:ml-junit:2.6.0"
-    testCompile "com.jayway.restassured:rest-assured:2.4.1"
+	// Needed to compile and run the JUnit tests
+	testCompile "com.marklogic:ml-junit:3.0-alpha1"
+	testCompile "com.jayway.restassured:rest-assured:2.4.1"
 
-    // corb jar available from jcenter
-    corb "com.marklogic:marklogic-corb:2.3.2"
+	// corb jar available from jcenter
+	corb "com.marklogic:marklogic-corb:2.3.2"
 }
 
-
 /*
  * ml-gradle adds an instance of com.marklogic.appdeployer.AppConfig to the Gradle project under the key "mlAppConfig".
  * This instance can be modified to affect the behavior of ml-gradle.
  */
 ext {
-    // mlAppConfig is an instance of com.marklogic.appdeployer.AppConfig
-    mlAppConfig {
-        // Example of adding custom tokens; these will then be replaced in any JSON/XML config files
-        customTokens.put("sample-key", "sample-value")
-        customTokens.put("%%ODBC_PORT%%", "8102")
-        customTokens.put("%%XDBC_PORT%%", "8103")
-
-        // By default, the createTriggersDatabase attribute is set to true, which results in a triggers database being
-        // created, even if a databases/triggers-database.json file isn't present. Un-commenting the line will below
-        // will prevent one from being created (assuming the triggers-database.json file isn't present).
-        //createTriggersDatabase = false
-
-        // Example of adding a path for modules to the list of module paths, which defaults to src/main/ml-modules
-        // modulePaths.add("src/another-modules-dir")
-        // You can also override the list of module paths
-        // modulePaths = ["src/another-modules-dir"]
-
-        // You can have multiple config files for your content database. This is useful when you have a dependency on
-        // a package of MarkLogic modules that requires some content database config, and you don't want to duplicate
-        // that in your own content-database.json file. Instead, just add the file from your
-        // build/mlRestApi/(name of dependency)/ml-config/databases directory.
-        configDir.contentDatabaseFiles.add(new File("src/main/ml-config/databases/more-content-database-config.json"))
-
-        // XCC URL for running corb task below and for creating triggers on pre-8.0-4 builds of MarkLogic
-        contentXccUrl = "xcc://${mlRestAdminUsername}:${mlRestAdminPassword}@${mlHost}:${mlRestPort}"
-    }
+	// mlAppConfig is an instance of com.marklogic.appdeployer.AppConfig
+	mlAppConfig {
+		// Example of adding custom tokens; these will then be replaced in any JSON/XML config files
+		customTokens.put("sample-key", "sample-value")
+		customTokens.put("%%ODBC_PORT%%", "8102")
+		customTokens.put("%%XDBC_PORT%%", "8103")
+
+		// By default, the createTriggersDatabase attribute is set to true, which results in a triggers database being
+		// created, even if a databases/triggers-database.json file isn't present. Un-commenting the line will below
+		// will prevent one from being created (assuming the triggers-database.json file isn't present).
+		//createTriggersDatabase = false
+
+		// Example of adding a path for modules to the list of module paths, which defaults to src/main/ml-modules
+		// modulePaths.add("src/another-modules-dir")
+		// You can also override the list of module paths
+		// modulePaths = ["src/another-modules-dir"]
+
+		// You can have multiple config files for your content database. This is useful when you have a dependency on
+		// a package of MarkLogic modules that requires some content database config, and you don't want to duplicate
+		// that in your own content-database.json file. Instead, just add the file from your
+		// build/mlRestApi/(name of dependency)/ml-config/databases directory.
+		configDir.contentDatabaseFiles.add(new File("src/main/ml-config/databases/more-content-database-config.json"))
+
+		// XCC URL for running corb task below and for creating triggers on pre-8.0-4 builds of MarkLogic
+		contentXccUrl = "xcc://${mlRestAdminUsername}:${mlRestAdminPassword}@${mlHost}:${mlRestPort}"
+	}
 }
 
-
 /*
  * For tests that reference test files in the test source tree, we need to tell Gradle to copy these to src/test/resources
  * so that they can be found when running "gradle test".
  */
 sourceSets.test.resources.srcDir 'src/test/java'
 
-
 /*
  * This is an example of both a custom Gradle task and an easy way of invoking Corb. This depends on "mlLoadModules" to
  * ensure that the Corb uris/transform modules are loaded. It also uses as a classpath the custom configuration named
@@ -102,20 +108,19 @@ sourceSets.test.resources.srcDir 'src/test/java'
  * to invoke corb from Gradle.
  */
 task runCorb(dependsOn: ['mlLoadModules'], type: JavaExec) {
-    main = 'com.marklogic.developer.corb.Manager'
-    classpath = configurations.corb
-    args = [contentXccUrl, '""', 'transform.xqy', '4', 'uris.xqy', '/ext/sample-project/corb/', 'sample-project-modules', 'false']
+	main = 'com.marklogic.developer.corb.Manager'
+	classpath = configurations.corb
+	args = [contentXccUrl, '""', 'transform.xqy', '4', 'uris.xqy', '/ext/sample-project/corb/', 'sample-project-modules', 'false']
 }
 
-
 /*
  * The management API has an operation for loading the default CPF pipelines -
  * http://docs.marklogic.com/REST/POST/manage/v2/databases/[id-or-name]/pipelines. To load these as part of your
  * deployment process, just uncomment the line below. These pipelines will be loaded before your custom pipelines and
  * domains, which means you can safely reference them in your domain configuration files.
  */
 ext {
-    //mlAppDeployer.commands.add(new com.marklogic.appdeployer.command.cpf.DeployDefaultPipelinesCommand())
+	//mlAppDeployer.commands.add(new com.marklogic.appdeployer.command.cpf.DeployDefaultPipelinesCommand())
 }
 
 /*
@@ -130,7 +135,6 @@ ext {
 //	mlDatabaseCommands.add(otherDbCommand)
 //}
 
-
 /*
  * Example of a custom command, which in this case performs a merge on a database. The benefit of doing this in a
  * command (as opposed to a task) is that a command can be included in the mlDeploy and mlUndeploy tasks by adding it to
@@ -140,41 +144,40 @@ ext {
  * Management REST API. Note that this class could also be defined in the Gradle buildSrc directory, which is really a
  * better option for keeping your build.gradle file slim.
  */
-import com.marklogic.appdeployer.command.AbstractCommand;
-import com.marklogic.appdeployer.command.CommandContext;
+import com.marklogic.appdeployer.command.AbstractCommand
+import com.marklogic.appdeployer.command.CommandContext
 
 class MergeContentDatabaseCommand extends AbstractCommand {
-    public Integer getExecuteSortOrder() {
-        return Integer.MAX_VALUE;
-    }
-    public void execute(CommandContext context) {
-        String dbName = context.getAppConfig().getContentDatabaseName();
-        logger.info("Merging database: " + dbName);
-        context.getManageClient().postJson("/manage/v2/databases/" + dbName, '{"operation":"merge-database"}');
-        logger.info("Merged database: " + dbName)
-    }
+	public Integer getExecuteSortOrder() {
+		return Integer.MAX_VALUE;
+	}
+
+	public void execute(CommandContext context) {
+		String dbName = context.getAppConfig().getContentDatabaseName();
+		logger.info("Merging database: " + dbName);
+		context.getManageClient().postJson("/manage/v2/databases/" + dbName, '{"operation":"merge-database"}');
+		logger.info("Merged database: " + dbName)
+	}
 }
 
-
 /*
  * Example of including our custom command in the deployment process. The order in which it's invoked is determined by
  * the command's "getExecuteSortOrder" method.
  */
 ext {
-    //mlAppDeployer.commands.add(new MergeContentDatabaseCommand())
+	//mlAppDeployer.commands.add(new MergeContentDatabaseCommand())
 }
 
-
 /*
  * Below is an example of a custom task that merges a database - just like the command above. The benefit of creating a
  * task versus a command is that we can invoke this without running a full mlDeploy. The MarkLogicTask class provides
  * access to a number of helpful objects via methods like getAppConfig() and getManageClient().
  */
 task mergeContentDatabase(type: com.marklogic.gradle.task.MarkLogicTask) {
-    description = "Call this task to initiate a merge on the content database"
-    doLast {
-        getManageClient().postJson("/manage/v2/databases/" + getAppConfig().getContentDatabaseName(), '{"operation":"merge-database"}')
-    }
+	description = "Call this task to initiate a merge on the content database"
+	doLast {
+		getManageClient().postJson("/manage/v2/databases/" + getAppConfig().getContentDatabaseName(), '{"operation":"merge-database"}')
+	}
 }
 
 /*

examples/sample-project/src/test/java/sample/GetClientConfigTest.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import com.marklogic.client.helper.DatabaseClientConfig;
+import com.marklogic.client.ext.helper.DatabaseClientConfig;
 
 public class GetClientConfigTest extends AbstractSampleProjectTest {
 

examples/sample-project/src/test/java/sample/SampleProjectTestConfig.java

@@ -4,7 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import com.marklogic.client.helper.DatabaseClientConfig;
+import com.marklogic.client.ext.helper.DatabaseClientConfig;
 import com.marklogic.junit.spring.BasicTestConfig;
 
 @Configuration

examples/sample-project/src/test/java/sample/SearchDocumentsViaRestAssuredTest.java

@@ -9,7 +9,7 @@
 import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.path.json.JsonPath;
 import com.marklogic.client.document.XMLDocumentManager;
-import com.marklogic.client.helper.DatabaseClientConfig;
+import com.marklogic.client.ext.helper.DatabaseClientConfig;
 import com.marklogic.client.io.DocumentMetadataHandle;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;
@@ -27,9 +27,9 @@ public void initializeRestAssured() {
         logger.info("Initializing RestAssured...");
 
         String protocol = "http://";
-        
+
         /*
-         * If SSL were enabled on the REST API server, would need to uncomment these lines. 
+         * If SSL were enabled on the REST API server, would need to uncomment these lines.
          */
         // protocol = "https://";
         // RestAssured.config = RestAssured.config().sslConfig(
@@ -39,7 +39,7 @@ public void initializeRestAssured() {
         RestAssured.baseURI = protocol + config.getHost();
         RestAssured.port = config.getPort();
         RestAssured.authentication = basic(config.getUsername(), config.getPassword());
-        
+
 
         logger.info("RestAssured URI: " + RestAssured.baseURI);
         logger.info("RestAssured port: " + RestAssured.port);

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=2.9.0
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:2.9.0
+version=3.0.0
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.0.0
 mlcpUtilDependency=com.marklogic:mlcp-util:0.3.0