diff --git a/README.md b/README.md index 33afd2b10..a09034d40 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ First, [install Gradle](https://gradle.org/install/). 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.7.0" } + plugins { id "com.marklogic.ml-gradle" version "4.8.0" } Then run: diff --git a/build.gradle b/build.gradle index 820616fde..d1dd88bc8 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ plugins { id "com.gradle.plugin-publish" version "1.2.1" id "java-gradle-plugin" - id "net.saliman.properties" version "1.5.1" + id "net.saliman.properties" version "1.5.2" id "io.snyk.gradle.plugin.snykplugin" version "0.4" } @@ -17,7 +17,7 @@ if (project.hasProperty("signing.keyId")) { } group = "com.marklogic" -version = "4.7.0" +version = "4.8.0" java { sourceCompatibility = 1.8 @@ -36,10 +36,10 @@ dependencies { implementation gradleApi() implementation localGroovy() - api 'com.marklogic:ml-app-deployer:4.7.0' + api 'com.marklogic:ml-app-deployer:4.8.0' implementation "com.marklogic:mlcp-util:1.0.1" - implementation "com.marklogic:marklogic-data-movement-components:2.7.0" - implementation "commons-io:commons-io:2.15.1" + implementation "com.marklogic:marklogic-data-movement-components:2.8.0" + implementation "commons-io:commons-io:2.16.1" compileOnly "com.marklogic:marklogic-unit-test-client:1.4.0" @@ -49,7 +49,7 @@ dependencies { // Force spock-core to use 4.13.2 to avoid security issue in 4.11 testImplementation 'junit:junit:4.13.2' - testImplementation('org.spockframework:spock-core:2.1-groovy-3.0') { + testImplementation('org.spockframework:spock-core:2.3-groovy-3.0') { exclude module: 'groovy-all' } } diff --git a/examples/alert-project/build.gradle b/examples/alert-project/build.gradle index 0b5d8de4b..0a65ecd5d 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } repositories { diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle index edeecb78c..1f96f4b18 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } repositories { diff --git a/examples/cpf-project/build.gradle b/examples/cpf-project/build.gradle index a76261378..197c5c49c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } repositories { diff --git a/examples/custom-forests-and-replicas-project/build.gradle b/examples/custom-forests-and-replicas-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/custom-rest-rewriter-project/build.gradle b/examples/custom-rest-rewriter-project/build.gradle index 55e2f3b3c..025c8a464 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } task generateCustomRewriterModules { diff --git a/examples/data-services/build.gradle b/examples/data-services/build.gradle index 5d148ebc9..eaa49ace8 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.7.0" + id "net.saliman.properties" version "1.5.2" + id "com.marklogic.ml-gradle" version "4.8.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 9d44dced6..ffbb2c8ff 100644 --- a/examples/dependency-project/ml-gradle-client-project/build.gradle +++ b/examples/dependency-project/ml-gradle-client-project/build.gradle @@ -1,6 +1,6 @@ plugins { - id "net.saliman.properties" version "1.5.1" - id "com.marklogic.ml-gradle" version "4.7.0" + id "net.saliman.properties" version "1.5.2" + id "com.marklogic.ml-gradle" version "4.8.0" } repositories { diff --git a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle index b78b2de7b..ac267d2d2 100644 --- a/examples/disconnected-project-using-plugins-and-gradlew/build.gradle +++ b/examples/disconnected-project-using-plugins-and-gradlew/build.gradle @@ -13,8 +13,8 @@ buildscript { plugins { id 'java' //optional - delete if not needed - id 'net.saliman.properties' version '1.5.1' - id 'com.marklogic.ml-gradle' version "4.7.0" + id 'net.saliman.properties' version '1.5.2' + id 'com.marklogic.ml-gradle' version "4.8.0" } repositories { diff --git a/examples/disconnected-project/gradle.properties b/examples/disconnected-project/gradle.properties index 472e28e4d..286fa7712 100644 --- a/examples/disconnected-project/gradle.properties +++ b/examples/disconnected-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleDependency=com.marklogic:ml-gradle:4.7.0 +mlGradleDependency=com.marklogic:ml-gradle:4.8.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 b4bcae109..a123ee1d5 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.7.0" + id 'net.saliman.properties' version '1.5.2' + id "com.marklogic.ml-gradle" version "4.8.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 666e0c3eb..d8e821e34 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.7.0" + id 'net.saliman.properties' version '1.5.2' + id "com.marklogic.ml-gradle" version "4.8.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 ab35bb62f..c789f9dc1 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.7.0" + id 'net.saliman.properties' version '1.5.2' + id "com.marklogic.ml-gradle" version "4.8.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 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/external-security/build.gradle b/examples/external-security/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle index e75a6bb4a..c0f205d1d 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } ext { diff --git a/examples/flexrep-with-path-project/build.gradle b/examples/flexrep-with-path-project/build.gradle index 9f9d7c2ed..fd075ccf1 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.7.0" + classpath "com.marklogic:ml-gradle:4.8.0" } } diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle index 3c69fd7eb..342f687ae 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } /* diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle index a9910e228..8c77718c6 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } ext { diff --git a/examples/jdbc-project/build.gradle b/examples/jdbc-project/build.gradle index e1e8067c2..8da1956ae 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" id "java" } diff --git a/examples/local-testing-project/build.gradle b/examples/local-testing-project/build.gradle index 8b58227b2..dc537579e 100644 --- a/examples/local-testing-project/build.gradle +++ b/examples/local-testing-project/build.gradle @@ -12,7 +12,7 @@ buildscript { } plugins { - id "net.saliman.properties" version "1.5.1" + id "net.saliman.properties" version "1.5.2" id "java" } diff --git a/examples/local-testing-project/gradle.properties b/examples/local-testing-project/gradle.properties index 51ba31141..4d2da2f52 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.7.0 +mlGradleVersion=4.8.0 mlHost=localhost mlAppName=example diff --git a/examples/marklogic-cloud-project/build.gradle b/examples/marklogic-cloud-project/build.gradle index 959d83430..e12a53096 100644 --- a/examples/marklogic-cloud-project/build.gradle +++ b/examples/marklogic-cloud-project/build.gradle @@ -12,7 +12,7 @@ buildscript { } plugins { - id "net.saliman.properties" version "1.5.1" + id "net.saliman.properties" version "1.5.2" } apply plugin: "com.marklogic.ml-gradle" diff --git a/examples/marklogic-cloud-project/gradle.properties b/examples/marklogic-cloud-project/gradle.properties index 8db882d34..7539f7d1a 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.7.0 +mlGradleVersion=4.8.0 mlAppName=cloud-test diff --git a/examples/maven-project/build.gradle b/examples/maven-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle index 5d4bc92f4..6b96991c8 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle index 9a8583729..4bd1ac849 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/mlcp-project/build.gradle b/examples/mlcp-project/build.gradle index f2546d631..5a738760e 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.7.0" + classpath "com.marklogic:ml-gradle:4.8.0" } } diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle index 5d4bc92f4..6b96991c8 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties index 2e38638bd..8f44b5f87 100644 --- a/examples/partition-project/gradle.properties +++ b/examples/partition-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.7.0 +mlGradleVersion=4.8.0 mlHost=localhost mlAppName=partition-example diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle index 973545e25..1b91e0fab 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } task printHost { diff --git a/examples/qbv-example/build.gradle b/examples/qbv-example/build.gradle index 8612e4f7a..10d60b3e5 100644 --- a/examples/qbv-example/build.gradle +++ b/examples/qbv-example/build.gradle @@ -1,5 +1,5 @@ plugins { - id "com.marklogic.ml-gradle" version "4.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } repositories { diff --git a/examples/redaction-ruleset-project/build.gradle b/examples/redaction-ruleset-project/build.gradle index 4c0b4f60b..92940c51d 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } repositories { diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/roxy-project/build.gradle b/examples/roxy-project/build.gradle index df492f644..dd5a3e04e 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.7.0" + classpath "com.marklogic:ml-gradle:4.8.0" } } diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle index 0ee4210c8..38e1046a5 100644 --- a/examples/sample-project/build.gradle +++ b/examples/sample-project/build.gradle @@ -8,14 +8,14 @@ buildscript { mavenCentral() } dependencies { - classpath "com.marklogic:ml-gradle:4.7.0" + classpath "com.marklogic:ml-gradle:4.8.0" } } plugins { // The following plugins are optional - id "net.saliman.properties" version "1.5.1" + id "net.saliman.properties" version "1.5.2" // The Java plugin is used to compile and run JUnit tests id "java" diff --git a/examples/schemas-project/build.gradle b/examples/schemas-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle index f93121482..ecd22960c 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.7.0" + id "net.saliman.properties" version "1.5.2" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/ssl-project/build.gradle b/examples/ssl-project/build.gradle index 5c85d0997..3935318fe 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.7.0" + id "net.saliman.properties" version "1.5.2" + id "com.marklogic.ml-gradle" version "4.8.0" } /* diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle index 574291766..34628f77c 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/triggers-project/build.gradle b/examples/triggers-project/build.gradle index a395ee3ac..1420aec73 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.7.0" + classpath "com.marklogic:ml-gradle:4.8.0" } } diff --git a/examples/uni-temporal-project/build.gradle b/examples/uni-temporal-project/build.gradle index 5d4bc92f4..6b96991c8 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } diff --git a/examples/unit-test-project/gradle.properties b/examples/unit-test-project/gradle.properties index 749b53003..a451fb19c 100644 --- a/examples/unit-test-project/gradle.properties +++ b/examples/unit-test-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.7.0 +mlGradleVersion=4.8.0 marklogicUnitTestVersion=1.4.0 mlHost=localhost diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle index 8b784a121..6013f24b8 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.7.0" + id "com.marklogic.ml-gradle" version "4.8.0" } ext { diff --git a/pom.xml b/pom.xml index 4b77b8143..68dec2002 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.7.0 + 4.8.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.7.0 + 4.8.0 compile @@ -52,7 +52,7 @@ It is not intended to be used to build this project. com.marklogic marklogic-data-movement-components - 2.7.0 + 2.8.0 runtime diff --git a/src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy b/src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy index a93c36149..e72a09ef4 100644 --- a/src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy +++ b/src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy @@ -295,6 +295,7 @@ class MarkLogicPlugin implements Plugin { project.task("mlDeployExternalSecurity", type: DeployExternalSecurityTask, group: securityGroup, description: "Deploy external security configurations, updating each if it exists, in the configuration directory") project.task("mlDeployHostCertificateTemplates", type: DeployHostCertificateTemplatesTask, group: securityGroup, description: "Deploy host certificate templates, updating each if it exists, in the configuration directory") project.task("mlDeploySecureCredentials", type: DeploySecureCredentialsTask, group: securityGroup, description: "Deploy secure credentials configurations, updating each if it exists, in the configuration directory") + project.task("mlDeployCredentials", type: DeployCredentialsTask, group: securityGroup, description: "Deploy AWS or Azure credentials configurations, updating each if it exists, in the configuration directory") project.task("mlDeployPrivileges", type: DeployPrivilegesTask, group: securityGroup, description: "Deploy each privilege, updating it if it exists, in the configuration directory") project.task("mlDeployProtectedCollections", type: DeployProtectedCollectionsTask, group: securityGroup, description: "Deploy each protected collection, updating it if it exists, in the configuration directory") project.task("mlDeployProtectedPaths", type: DeployProtectedPathsTask, group: securityGroup, description: "Deploy each protected path, updating it if it exists, in the configuration directory") @@ -306,6 +307,7 @@ class MarkLogicPlugin implements Plugin { project.task("mlUndeployCertificateTemplates", type: UndeployCertificateTemplatesTask, group: securityGroup, description: "Undeploy (delete) each certificate template in the configuration directory") project.task("mlUndeployExternalSecurity", type: UndeployExternalSecurityTask, group: securityGroup, description: "Undeploy (delete) each external security configuration in the configuration directory") project.task("mlUndeploySecureCredentials", type: UndeploySecureCredentialsTask, group: securityGroup, description: "Undeploy (delete) each secure credentials configuration in the configuration directory") + project.task("mlUndeployCredentials", type: UndeployCredentialsTask, group: securityGroup, description: "Undeploy (delete) each AWS or Azure credentials configuration in the configuration directory") project.task("mlUndeployPrivileges", type: UndeployPrivilegesTask, group: securityGroup, description: "Undeploy (delete) each privilege in the configuration directory") project.task("mlUndeployProtectedCollections", type: UndeployProtectedCollectionsTask, group: securityGroup, description: "Undeploy (delete) each protected collection in the configuration directory") project.task("mlUndeployProtectedPaths", type: UndeployProtectedPathsTask, group: securityGroup, description: "Undeploy (delete) each protected path in the configuration directory") diff --git a/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy b/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy index 904acbfa6..97a53845d 100644 --- a/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy +++ b/src/main/groovy/com/marklogic/gradle/task/MlcpTask.groovy @@ -208,7 +208,11 @@ class MlcpTask extends JavaExec { File logOutputFile = null if (logOutputUri) { println "Will write mlcp log output to URI: " + logOutputUri - logOutputFile = new File(getProject().getBuildDir(), "mlcp-log-output-" + System.currentTimeMillis() + ".txt") + def buildDir = getProject().layout.buildDirectory.asFile.get() + if (!buildDir.exists()) { + buildDir.mkdir() + } + logOutputFile = new File(buildDir, "mlcp-log-output-" + System.currentTimeMillis() + ".txt") setStandardOutput(logOutputFile.newOutputStream()) } diff --git a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy index a28774308..95fa00a5d 100644 --- a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy +++ b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy @@ -57,8 +57,8 @@ 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.7.0"' + + '\n id "net.saliman.properties" version "1.5.2"' + + '\n id "com.marklogic.ml-gradle" version "4.8.0"' + '\n}' println "Updating build.gradle so that the Gradle properties plugin can be applied" writeFile("build.gradle", text) diff --git a/src/main/groovy/com/marklogic/gradle/task/security/DeployCredentialsTask.groovy b/src/main/groovy/com/marklogic/gradle/task/security/DeployCredentialsTask.groovy new file mode 100644 index 000000000..524cb8647 --- /dev/null +++ b/src/main/groovy/com/marklogic/gradle/task/security/DeployCredentialsTask.groovy @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2023 MarkLogic Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.marklogic.gradle.task.security + +import com.marklogic.gradle.task.MarkLogicTask +import org.gradle.api.tasks.TaskAction + +class DeployCredentialsTask extends MarkLogicTask { + + @TaskAction + void deployCredentials() { + invokeDeployerCommandWithClassName("DeployCredentialsCommand") + } +} diff --git a/src/main/groovy/com/marklogic/gradle/task/security/UndeployCredentialsTask.groovy b/src/main/groovy/com/marklogic/gradle/task/security/UndeployCredentialsTask.groovy new file mode 100644 index 000000000..ae7b12115 --- /dev/null +++ b/src/main/groovy/com/marklogic/gradle/task/security/UndeployCredentialsTask.groovy @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2023 MarkLogic Corporation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.marklogic.gradle.task.security + +import com.marklogic.gradle.task.MarkLogicTask +import org.gradle.api.tasks.TaskAction + +class UndeployCredentialsTask extends MarkLogicTask { + + @TaskAction + void undeployCredentialsSecurity() { + undeployWithCommandWithClassName("DeployCredentialsCommand") + } +}