diff --git a/README.md b/README.md index cd1773960..69d45d0be 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ running Gradle 7 or higher, you'll need to use ml-gradle 4.3.0 or higher. Then, in an empty directory, create a file named "build.gradle" with your favorite text editor and enter the following: - plugins { id "com.marklogic.ml-gradle" version "4.5.3" } + plugins { id "com.marklogic.ml-gradle" version "4.6.0" } Then run: diff --git a/build.gradle b/build.gradle index 4c97f8e44..5d9bf68db 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ plugins { } group = "com.marklogic" -version = "4.6-SNAPSHOT" +version = "4.6.0" java { sourceCompatibility = 1.8 diff --git a/examples/alert-project/build.gradle b/examples/alert-project/build.gradle index 51a4b8ca8..385b87418 100644 --- a/examples/alert-project/build.gradle +++ b/examples/alert-project/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "eclipse" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } repositories { diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle index 648b27358..becb81ba4 100644 --- a/examples/corb2-project/build.gradle +++ b/examples/corb2-project/build.gradle @@ -21,7 +21,7 @@ buildscript { } plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } repositories { diff --git a/examples/cpf-project/build.gradle b/examples/cpf-project/build.gradle index 0a8468208..5b9ac8fac 100644 --- a/examples/cpf-project/build.gradle +++ b/examples/cpf-project/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "eclipse" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } repositories { diff --git a/examples/custom-forests-and-replicas-project/build.gradle b/examples/custom-forests-and-replicas-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/custom-forests-and-replicas-project/build.gradle +++ b/examples/custom-forests-and-replicas-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/custom-rest-rewriter-project/build.gradle b/examples/custom-rest-rewriter-project/build.gradle index 7acc230bd..9379ef6ff 100644 --- a/examples/custom-rest-rewriter-project/build.gradle +++ b/examples/custom-rest-rewriter-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } task generateCustomRewriterModules { diff --git a/examples/data-services/build.gradle b/examples/data-services/build.gradle index bd7b04bc6..6d0f60500 100644 --- a/examples/data-services/build.gradle +++ b/examples/data-services/build.gradle @@ -1,7 +1,7 @@ plugins { id "java" id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" id 'com.marklogic.ml-development-tools' version '6.0.0' } diff --git a/examples/dependency-project/ml-gradle-client-project/build.gradle b/examples/dependency-project/ml-gradle-client-project/build.gradle index 9c0fd5307..77e7a1a58 100644 --- a/examples/dependency-project/ml-gradle-client-project/build.gradle +++ b/examples/dependency-project/ml-gradle-client-project/build.gradle @@ -10,7 +10,7 @@ plugins { id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } //apply plugin: "com.marklogic.ml-gradle" diff --git a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle index e60bd9764..6657aabb9 100644 --- a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle +++ b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle @@ -14,7 +14,7 @@ buildscript { plugins { id 'java' //optional - delete if not needed id 'net.saliman.properties' version '1.5.1' - id 'com.marklogic.ml-gradle' version "4.5.3" + id 'com.marklogic.ml-gradle' version "4.6.0" } repositories { diff --git a/examples/disconnected-project/gradle.properties b/examples/disconnected-project/gradle.properties index e58185d69..185e59810 100644 --- a/examples/disconnected-project/gradle.properties +++ b/examples/disconnected-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleDependency=com.marklogic:ml-gradle:4.5.3 +mlGradleDependency=com.marklogic:ml-gradle:4.6.0 mlSalimanDependency=net.saliman:gradle-properties-plugin:1.4.6 mlHost=localhost diff --git a/examples/docker-projects/single-node-with-nifi/build.gradle b/examples/docker-projects/single-node-with-nifi/build.gradle index c7c94f59b..dde8d3895 100644 --- a/examples/docker-projects/single-node-with-nifi/build.gradle +++ b/examples/docker-projects/single-node-with-nifi/build.gradle @@ -1,7 +1,7 @@ plugins { // gradle -PenvironmentName=x ... id 'net.saliman.properties' version '1.5.1' - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" id 'com.avast.gradle.docker-compose' version "0.6.11" } dockerCompose { diff --git a/examples/docker-projects/single-node/build.gradle b/examples/docker-projects/single-node/build.gradle index ed6f26b86..d22dff8a9 100644 --- a/examples/docker-projects/single-node/build.gradle +++ b/examples/docker-projects/single-node/build.gradle @@ -1,7 +1,7 @@ plugins { // gradle -PenvironmentName=x ... id 'net.saliman.properties' version '1.5.1' - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" id 'com.avast.gradle.docker-compose' version "0.6.11" } dockerCompose { diff --git a/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle b/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle index f8c28a545..c6e1d77ac 100644 --- a/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle +++ b/examples/docker-projects/three-node-cluster-with-ha-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'net.saliman.properties' version '1.5.1' - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" id 'com.avast.gradle.docker-compose' version "0.6.11" } dockerCompose { diff --git a/examples/entity-services-project/build.gradle b/examples/entity-services-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/entity-services-project/build.gradle +++ b/examples/entity-services-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/external-security/build.gradle b/examples/external-security/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/external-security/build.gradle +++ b/examples/external-security/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/failover-project/build.gradle +++ b/examples/failover-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle index 354b1fc55..92b33b1d6 100644 --- a/examples/flexrep-project/build.gradle +++ b/examples/flexrep-project/build.gradle @@ -11,7 +11,7 @@ */ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } ext { diff --git a/examples/flexrep-with-path-project/build.gradle b/examples/flexrep-with-path-project/build.gradle index d7956671a..7cc762106 100644 --- a/examples/flexrep-with-path-project/build.gradle +++ b/examples/flexrep-with-path-project/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "com.marklogic:ml-gradle:4.5.3" + classpath "com.marklogic:ml-gradle:4.6.0" } } diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle index 760e96a7f..44713db45 100644 --- a/examples/httpbuilder-project/build.gradle +++ b/examples/httpbuilder-project/build.gradle @@ -5,7 +5,7 @@ buildscript { } plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } /* diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle index 3ce4f1782..3371ce547 100644 --- a/examples/ignore-resources-project/build.gradle +++ b/examples/ignore-resources-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } ext { diff --git a/examples/jdbc-project/build.gradle b/examples/jdbc-project/build.gradle index c2f1005f7..c24f0bc5e 100644 --- a/examples/jdbc-project/build.gradle +++ b/examples/jdbc-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" id "java" } diff --git a/examples/local-testing-project/gradle.properties b/examples/local-testing-project/gradle.properties index 6fb448352..9cf3099c4 100644 --- a/examples/local-testing-project/gradle.properties +++ b/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=4.5.3 +mlGradleVersion=4.6.0 mlHost=localhost mlAppName=example diff --git a/examples/marklogic-cloud-project/gradle.properties b/examples/marklogic-cloud-project/gradle.properties index 6d9ba6235..f1f833cea 100644 --- a/examples/marklogic-cloud-project/gradle.properties +++ b/examples/marklogic-cloud-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=4.5.3 +mlGradleVersion=4.6.0 mlAppName=cloud-test diff --git a/examples/maven-project/build.gradle b/examples/maven-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/maven-project/build.gradle +++ b/examples/maven-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle index a8fb45bce..709676acc 100644 --- a/examples/mimetypes-project/build.gradle +++ b/examples/mimetypes-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle index 4c8a9d8ca..8e1dc85e4 100644 --- a/examples/minimal-project/build.gradle +++ b/examples/minimal-project/build.gradle @@ -7,5 +7,5 @@ */ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/mlcp-project/build.gradle b/examples/mlcp-project/build.gradle index 8599a505c..fe93d33c1 100644 --- a/examples/mlcp-project/build.gradle +++ b/examples/mlcp-project/build.gradle @@ -10,7 +10,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.marklogic:ml-gradle:4.5.3" + classpath "com.marklogic:ml-gradle:4.6.0" } } diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle index a8fb45bce..709676acc 100644 --- a/examples/no-appservers-project/build.gradle +++ b/examples/no-appservers-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties index 318145231..3b1c3c6fd 100644 --- a/examples/partition-project/gradle.properties +++ b/examples/partition-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.5.3 +mlGradleVersion=4.6.0 mlHost=localhost mlAppName=partition-example diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle index ee4be0c57..be8445ca5 100644 --- a/examples/properties-project/build.gradle +++ b/examples/properties-project/build.gradle @@ -3,7 +3,7 @@ plugins { // processing the gradle-(environmentName).properties files. id "net.saliman.properties" version "1.4.6" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } task printHost { diff --git a/examples/redaction-ruleset-project/build.gradle b/examples/redaction-ruleset-project/build.gradle index d4b102c17..d2dd36ea0 100644 --- a/examples/redaction-ruleset-project/build.gradle +++ b/examples/redaction-ruleset-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } repositories { diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/role-project/build.gradle +++ b/examples/role-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/roxy-project/build.gradle b/examples/roxy-project/build.gradle index 53700fbf2..bb79e0493 100644 --- a/examples/roxy-project/build.gradle +++ b/examples/roxy-project/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "com.marklogic:ml-gradle:4.5.3" + classpath "com.marklogic:ml-gradle:4.6.0" } } diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle index a806eaf4f..3769b55f5 100644 --- a/examples/sample-project/build.gradle +++ b/examples/sample-project/build.gradle @@ -8,7 +8,7 @@ buildscript { mavenCentral() } dependencies { - classpath "com.marklogic:ml-gradle:4.5.3" + classpath "com.marklogic:ml-gradle:4.6.0" } } @@ -54,7 +54,7 @@ configurations { * using that library in tests that must invoke MarkLogic HTTP endpoints. */ dependencies { - testImplementation "com.marklogic:marklogic-junit5:1.1.0" + testImplementation "com.marklogic:marklogic-junit5:1.4.0" testImplementation "com.jayway.restassured:rest-assured:2.4.1" corb "com.marklogic:marklogic-corb:2.4.5" diff --git a/examples/schemas-project/build.gradle b/examples/schemas-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/schemas-project/build.gradle +++ b/examples/schemas-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle index 915d90316..094ce67bd 100644 --- a/examples/ssl-2way-project/build.gradle +++ b/examples/ssl-2way-project/build.gradle @@ -1,6 +1,6 @@ plugins { id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/ssl-project/build.gradle b/examples/ssl-project/build.gradle index 08d9e09fe..8526fed93 100644 --- a/examples/ssl-project/build.gradle +++ b/examples/ssl-project/build.gradle @@ -1,6 +1,6 @@ plugins { id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } /* diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/temporal-lsqt-project/build.gradle +++ b/examples/temporal-lsqt-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle index 9f47d9c46..953ee2e2e 100644 --- a/examples/temporal-project/build.gradle +++ b/examples/temporal-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/triggers-project/build.gradle b/examples/triggers-project/build.gradle index 961100758..8d603a628 100644 --- a/examples/triggers-project/build.gradle +++ b/examples/triggers-project/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenLocal() } dependencies { - classpath "com.marklogic:ml-gradle:4.5.3" + classpath "com.marklogic:ml-gradle:4.6.0" } } diff --git a/examples/uni-temporal-project/build.gradle b/examples/uni-temporal-project/build.gradle index a8fb45bce..709676acc 100644 --- a/examples/uni-temporal-project/build.gradle +++ b/examples/uni-temporal-project/build.gradle @@ -1,3 +1,3 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } diff --git a/examples/unit-test-project/gradle.properties b/examples/unit-test-project/gradle.properties index d364166e0..d9a328969 100644 --- a/examples/unit-test-project/gradle.properties +++ b/examples/unit-test-project/gradle.properties @@ -1,5 +1,5 @@ mlGradleVersion=4.6-SNAPSHOT -marklogicUnitTestVersion=1.4-SNAPSHOT +marklogicUnitTestVersion=1.4.0 mlHost=localhost mlAppName=unit-test-example diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle index 43d37e5b3..daec9bed3 100644 --- a/examples/use-modulesdb-project/build.gradle +++ b/examples/use-modulesdb-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.5.3" + id "com.marklogic.ml-gradle" version "4.6.0" } ext { diff --git a/pom.xml b/pom.xml index 09cb24f68..272616e9f 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ It is not intended to be used to build this project. 4.0.0 com.marklogic ml-gradle - 4.5.3 + 4.6.0 com.marklogic:ml-gradle Gradle plugin for automating everything involving MarkLogic https://github.com/marklogic/ml-gradle @@ -40,7 +40,7 @@ It is not intended to be used to build this project. com.marklogic ml-app-deployer - 4.5.3 + 4.6.0 compile @@ -52,7 +52,7 @@ It is not intended to be used to build this project. com.marklogic marklogic-data-movement-components - 2.6.0 + 2.7.0 runtime diff --git a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy index 1e07dec2c..16eb82544 100644 --- a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy +++ b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy @@ -58,7 +58,7 @@ class NewProjectTask extends MarkLogicTask { if (ant.mlPropertiesPlugin == "y") { def text = 'plugins {' + '\n id "net.saliman.properties" version "1.5.1"' + - '\n id "com.marklogic.ml-gradle" version "4.5.3"' + + '\n id "com.marklogic.ml-gradle" version "4.6.0"' + '\n}' println "Updating build.gradle so that the Gradle properties plugin can be applied" writeFile("build.gradle", text)