diff --git a/README.md b/README.md index ff1a73398..5cf2fdef3 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,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.6.1" } + plugins { id "com.marklogic.ml-gradle" version "4.7.0" } Then run: diff --git a/build.gradle b/build.gradle index 62ef35267..820616fde 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ if (project.hasProperty("signing.keyId")) { } group = "com.marklogic" -version = "4.7-SNAPSHOT" +version = "4.7.0" java { sourceCompatibility = 1.8 @@ -25,7 +25,7 @@ java { } repositories { - mavenLocal() +// mavenLocal() mavenCentral() maven { url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/" @@ -36,7 +36,7 @@ dependencies { implementation gradleApi() implementation localGroovy() - api 'com.marklogic:ml-app-deployer:4.7-SNAPSHOT' + api 'com.marklogic:ml-app-deployer:4.7.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" diff --git a/examples/alert-project/build.gradle b/examples/alert-project/build.gradle index 913c44875..0b5d8de4b 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } repositories { diff --git a/examples/corb2-project/build.gradle b/examples/corb2-project/build.gradle index 8e668aa9a..edeecb78c 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } repositories { diff --git a/examples/cpf-project/build.gradle b/examples/cpf-project/build.gradle index 9feaa8e5b..a76261378 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } repositories { diff --git a/examples/custom-forests-and-replicas-project/build.gradle b/examples/custom-forests-and-replicas-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/custom-rest-rewriter-project/build.gradle b/examples/custom-rest-rewriter-project/build.gradle index 6a3eba3f7..55e2f3b3c 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } task generateCustomRewriterModules { diff --git a/examples/data-services/build.gradle b/examples/data-services/build.gradle index b7b681334..5d148ebc9 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.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 fcd832700..9d44dced6 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.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 368ff0c9a..b78b2de7b 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.6.1" + id 'com.marklogic.ml-gradle' version "4.7.0" } repositories { diff --git a/examples/disconnected-project/gradle.properties b/examples/disconnected-project/gradle.properties index 5acbbf506..472e28e4d 100644 --- a/examples/disconnected-project/gradle.properties +++ b/examples/disconnected-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleDependency=com.marklogic:ml-gradle:4.6.1 +mlGradleDependency=com.marklogic:ml-gradle:4.7.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 a5adcdaa2..b4bcae109 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.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 ccec255a5..666e0c3eb 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.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 da57a6ed4..ab35bb62f 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.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 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/external-security/build.gradle b/examples/external-security/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/failover-project/build.gradle b/examples/failover-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/flexrep-project/build.gradle b/examples/flexrep-project/build.gradle index 9f5009032..e75a6bb4a 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } ext { diff --git a/examples/flexrep-with-path-project/build.gradle b/examples/flexrep-with-path-project/build.gradle index d3656a1ca..9f9d7c2ed 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.6.1" + classpath "com.marklogic:ml-gradle:4.7.0" } } diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 93f2370ca..448ae4728 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip diff --git a/examples/httpbuilder-project/build.gradle b/examples/httpbuilder-project/build.gradle index e6b8d1e31..3c69fd7eb 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } /* diff --git a/examples/ignore-resources-project/build.gradle b/examples/ignore-resources-project/build.gradle index acd81784e..a9910e228 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } ext { diff --git a/examples/jdbc-project/build.gradle b/examples/jdbc-project/build.gradle index 416593a9a..e1e8067c2 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" id "java" } diff --git a/examples/local-testing-project/gradle.properties b/examples/local-testing-project/gradle.properties index 23ac7cb9e..51ba31141 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.6.1 +mlGradleVersion=4.7.0 mlHost=localhost mlAppName=example diff --git a/examples/marklogic-cloud-project/gradle.properties b/examples/marklogic-cloud-project/gradle.properties index 93ee7211c..8db882d34 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.6.1 +mlGradleVersion=4.7.0 mlAppName=cloud-test diff --git a/examples/maven-project/build.gradle b/examples/maven-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/mimetypes-project/build.gradle b/examples/mimetypes-project/build.gradle index 7ec138880..5d4bc92f4 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/minimal-project/build.gradle b/examples/minimal-project/build.gradle index cc9233ce9..9a8583729 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/mlcp-project/build.gradle b/examples/mlcp-project/build.gradle index 6dc0d55ec..d38d53765 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.6.1" + classpath "com.marklogic:ml-gradle:4.7.0" } } diff --git a/examples/no-appservers-project/build.gradle b/examples/no-appservers-project/build.gradle index 7ec138880..5d4bc92f4 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/partition-project/gradle.properties b/examples/partition-project/gradle.properties index 442afdbcf..2e38638bd 100644 --- a/examples/partition-project/gradle.properties +++ b/examples/partition-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.6.1 +mlGradleVersion=4.7.0 mlHost=localhost mlAppName=partition-example diff --git a/examples/properties-project/build.gradle b/examples/properties-project/build.gradle index c86b4410b..973545e25 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } task printHost { diff --git a/examples/qbv-example/build.gradle b/examples/qbv-example/build.gradle index 596dc7543..8612e4f7a 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } repositories { diff --git a/examples/redaction-ruleset-project/build.gradle b/examples/redaction-ruleset-project/build.gradle index 94efee0d9..4c0b4f60b 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } repositories { diff --git a/examples/role-project/build.gradle b/examples/role-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/roxy-project/build.gradle b/examples/roxy-project/build.gradle index 0a0a288f6..df492f644 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.6.1" + classpath "com.marklogic:ml-gradle:4.7.0" } } diff --git a/examples/sample-project/build.gradle b/examples/sample-project/build.gradle index 73a8f19a4..0ee4210c8 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.6.1" + classpath "com.marklogic:ml-gradle:4.7.0" } } diff --git a/examples/sample-project/gradle.properties b/examples/sample-project/gradle.properties index db1da4ee0..60f44f1e9 100644 --- a/examples/sample-project/gradle.properties +++ b/examples/sample-project/gradle.properties @@ -5,11 +5,11 @@ mlHost=localhost mlAppName=sample-project # ml-gradle is geared towards applications that use the REST API, so a port number is needed for a new REST API server -mlRestPort=8100 +mlRestPort=8050 # If specified, then a test database with app servers for that database will be created, which can then be used for # automated tests. -mlTestRestPort=8101 +mlTestRestPort=8051 # You can define just mlUsername and mlPassword, and that user will be used for all deployment operations, but that's # generally not a good practice, as this user will need the admin role in order to create security resources. Generally, diff --git a/examples/sample-project/src/test/java/sample/GetClientConfigTest.java b/examples/sample-project/src/test/java/sample/GetClientConfigTest.java index d20e80059..68072db73 100644 --- a/examples/sample-project/src/test/java/sample/GetClientConfigTest.java +++ b/examples/sample-project/src/test/java/sample/GetClientConfigTest.java @@ -20,7 +20,7 @@ public class GetClientConfigTest extends AbstractSampleProjectTest { public void testConfig() { DatabaseClientConfig config = applicationContext.getBean(DatabaseClientConfig.class); assertEquals("localhost", config.getHost()); - assertEquals(8101, config.getPort()); + assertEquals(8051, config.getPort()); } } diff --git a/examples/schemas-project/build.gradle b/examples/schemas-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/ssl-2way-project/build.gradle b/examples/ssl-2way-project/build.gradle index 87ad9565b..f93121482 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/ssl-project/build.gradle b/examples/ssl-project/build.gradle index 40c896dbc..5c85d0997 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } /* diff --git a/examples/temporal-lsqt-project/build.gradle b/examples/temporal-lsqt-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/temporal-project/build.gradle b/examples/temporal-project/build.gradle index 219134fba..574291766 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/triggers-project/build.gradle b/examples/triggers-project/build.gradle index 004341796..a395ee3ac 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.6.1" + classpath "com.marklogic:ml-gradle:4.7.0" } } diff --git a/examples/uni-temporal-project/build.gradle b/examples/uni-temporal-project/build.gradle index 7ec138880..5d4bc92f4 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } diff --git a/examples/unit-test-project/gradle.properties b/examples/unit-test-project/gradle.properties index d9a328969..749b53003 100644 --- a/examples/unit-test-project/gradle.properties +++ b/examples/unit-test-project/gradle.properties @@ -1,4 +1,4 @@ -mlGradleVersion=4.6-SNAPSHOT +mlGradleVersion=4.7.0 marklogicUnitTestVersion=1.4.0 mlHost=localhost diff --git a/examples/use-modulesdb-project/build.gradle b/examples/use-modulesdb-project/build.gradle index 075a50f9e..8b784a121 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.6.1" + id "com.marklogic.ml-gradle" version "4.7.0" } ext { diff --git a/pom.xml b/pom.xml index ad7dc60ff..4b77b8143 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.6.1 + 4.7.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.6.1 + 4.7.0 compile @@ -58,7 +58,7 @@ It is not intended to be used to build this project. commons-io commons-io - 2.11.0 + 2.15.1 runtime diff --git a/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy b/src/main/groovy/com/marklogic/gradle/task/NewProjectTask.groovy index c4b006b9a..a28774308 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.6.1"' + + '\n id "com.marklogic.ml-gradle" version "4.7.0"' + '\n}' println "Updating build.gradle so that the Gradle properties plugin can be applied" writeFile("build.gradle", text)