diff --git a/README.md b/README.md index a95c31378..1e3910c53 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.4.0" } + plugins { id "com.marklogic.ml-gradle" version "4.5.0" } Then run: diff --git a/build.gradle b/build.gradle index 8312a0c87..3e52adc63 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,8 @@ plugins { id "maven-publish" id "signing" - id "com.github.jk1.dependency-license-report" version "2.1" + // Ignored as it depends on Java 11; can uncomment and use Java 11 when it needs to be run + // id "com.github.jk1.dependency-license-report" version "2.1" id "com.gradle.plugin-publish" version "0.20.0" id "java-gradle-plugin" @@ -12,7 +13,7 @@ plugins { } group = "com.marklogic" -version = "4.5-SNAPSHOT" +version = "4.5.0" java { sourceCompatibility = 1.8 @@ -20,41 +21,16 @@ java { } repositories { - mavenLocal() - maven { - url "https://nexus.marklogic.com/repository/maven-snapshots/" - } mavenCentral() } -// Do not cache changing modules -configurations.all { - resolutionStrategy { - cacheChangingModulesFor 0, 'seconds' - } -} - dependencies { implementation gradleApi() implementation localGroovy() - // Temporarily adding these until ready to release - api('com.marklogic:marklogic-client-api:6.1-SNAPSHOT') { - changing = true - } - api('com.marklogic:ml-javaclient-util:4.5-SNAPSHOT') { - changing = true - } - - // Will update this when ready to release - api('com.marklogic:ml-app-deployer:4.5-SNAPSHOT') { - changing = true - } - + api 'com.marklogic:ml-app-deployer:4.5.0' implementation "com.marklogic:mlcp-util:1.0.1" - // TODO Will need to update this to 2.6.0 once it's released; the only planned change for this is to bump up the - // Java Client to 6.1.0 - implementation "com.marklogic:marklogic-data-movement-components:2.5.0" + implementation "com.marklogic:marklogic-data-movement-components:2.6.0" implementation "commons-io:commons-io:2.11.0" compileOnly "com.marklogic:marklogic-unit-test-client:1.2.1" diff --git a/examples/alert-project/build.gradle b/examples/alert-project/build.gradle index 27b2020a7..5cd393b1e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } repositories { diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle index 9cd5051fb..bb31794b9 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } repositories { diff --git a/examples/cpf-project/build.gradle b/examples/cpf-project/build.gradle index b2a0e5960..6f9259b81 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } repositories { diff --git a/examples/custom-rest-rewriter-project/build.gradle b/examples/custom-rest-rewriter-project/build.gradle index b34034f9e..3c061be43 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } task generateCustomRewriterModules { diff --git a/examples/data-services/build.gradle b/examples/data-services/build.gradle index 5410a4e82..0960c200a 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.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 aa8ef923c..099afef90 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.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 935e82322..e4457fb0f 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.4.0' + id 'com.marklogic.ml-gradle' version "4.5.0" } repositories { diff --git a/examples/disconnected-project/gradle.properties b/examples/disconnected-project/gradle.properties index 259c6e30a..453324987 100644 --- a/examples/disconnected-project/gradle.properties +++ b/examples/disconnected-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleDependency=com.marklogic:ml-gradle:4.4.0 +mlGradleDependency=com.marklogic:ml-gradle:4.5.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 1a717b37c..9e1e671c6 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.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 203d4d299..c2cdb1375 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.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 7fede31de..deb34460d 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.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 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/external-security/build.gradle b/examples/external-security/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle index 0b019000d..00345b35e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } ext { diff --git a/examples/flexrep-with-path-project/build.gradle b/examples/flexrep-with-path-project/build.gradle index c051bf18e..0ea0239fd 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.4.0" + classpath "com.marklogic:ml-gradle:4.5.0" } } diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle index be51054b3..fd976109a 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } /* diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle index 01942a77d..e669213c1 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } ext { diff --git a/examples/jdbc-project/build.gradle b/examples/jdbc-project/build.gradle index d832efcc9..52de5bdcf 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" id "java" } diff --git a/examples/local-testing-project/gradle.properties b/examples/local-testing-project/gradle.properties index 950ddf189..6ae717181 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-SNAPSHOT +mlGradleVersion=4.5.0 mlHost=localhost mlAppName=example diff --git a/examples/marklogic-cloud-project/gradle.properties b/examples/marklogic-cloud-project/gradle.properties index 58a9ccd9d..0c04e21be 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-SNAPSHOT +mlGradleVersion=4.5.0 mlAppName=cloud-test diff --git a/examples/maven-project/build.gradle b/examples/maven-project/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle index da906b584..243814238 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle index 04b60d723..5573e4438 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/mlcp-project/build.gradle b/examples/mlcp-project/build.gradle index 35ec69bcb..08aa8a35f 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.4.0" + classpath "com.marklogic:ml-gradle:4.5.0" } } diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle index da906b584..243814238 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties index aaeea23df..d8bb08b26 100644 --- a/examples/partition-project/gradle.properties +++ b/examples/partition-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.4.0 +mlGradleVersion=4.5.0 mlHost=localhost mlAppName=partition-example diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle index 7f01a9bfb..c89293afa 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } task printHost { diff --git a/examples/redaction-ruleset-project/build.gradle b/examples/redaction-ruleset-project/build.gradle index 36545aebe..f44cb15d3 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } repositories { diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/roxy-project/build.gradle b/examples/roxy-project/build.gradle index 37406a205..cfa12f91a 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.4.0" + classpath "com.marklogic:ml-gradle:4.5.0" } } diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle index f3f40e8f8..7fba3f30c 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.4.0" + classpath "com.marklogic:ml-gradle:4.5.0" } } diff --git a/examples/schemas-project/build.gradle b/examples/schemas-project/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle index a3ed051c8..4fdaa7ed3 100644 --- a/examples/ssl-2way-project/build.gradle +++ b/examples/ssl-2way-project/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/ssl-project/build.gradle b/examples/ssl-project/build.gradle index 26adbe48a..56c8819d3 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } /* diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle index 203edd7d1..d8cb6a64e 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/triggers-project/build.gradle b/examples/triggers-project/build.gradle index 2a53c3622..b03ab85d7 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.4.0" + classpath "com.marklogic:ml-gradle:4.5.0" } } diff --git a/examples/uni-temporal-project/build.gradle b/examples/uni-temporal-project/build.gradle index da906b584..243814238 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } diff --git a/examples/unit-test-project/gradle.properties b/examples/unit-test-project/gradle.properties index 2f44f3f15..cac05fa9e 100644 --- a/examples/unit-test-project/gradle.properties +++ b/examples/unit-test-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.4.0 +mlGradleVersion=4.5.0 marklogicUnitTestVersion=1.1.0 mlHost=localhost diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle index caa9a8e9d..11f9b1c09 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.4.0" + id "com.marklogic.ml-gradle" version "4.5.0" } ext { diff --git a/pom.xml b/pom.xml index cb96ff0c6..e00d4e721 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.4.0 + 4.5.0 com.marklogic:ml-gradle Gradle plugin for automating everything involving MarkLogic https://github.com/marklogic-community/ml-gradle @@ -40,7 +40,7 @@ It is not intended to be used to build this project. com.marklogic ml-app-deployer - 4.4.0 + 4.5.0 compile @@ -52,7 +52,7 @@ It is not intended to be used to build this project. com.marklogic marklogic-data-movement-components - 2.5.0 + 2.6.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 889e097e9..648a4831c 100644 --- a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy +++ b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy @@ -59,7 +59,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.4.0"' + + '\n id "com.marklogic.ml-gradle" version "4.5.0"' + '\n}' println "Updating build.gradle so that the Gradle properties plugin can be applied" writeFile("build.gradle", text)