diff --git a/examples/README.md b/examples/README.md index a572789f96..46fd8fc82a 100644 --- a/examples/README.md +++ b/examples/README.md @@ -13,7 +13,7 @@ the "testing" property on the command line - e.g. After initializing the project, you may want to add "testing=true" to the gradle.properties file so that you do not need to include it as a command line property. If you are trying to use a snapshot version of the Gradle plugin and get an error about not being able to find the -plugin - e.g. "Could not find com.marklogic:ml-data-hub:6.0-SNAPSHOT" - then run the following Gradle task from the root +plugin - e.g. "Could not find com.marklogic:ml-data-hub:6.0.0" - then run the following Gradle task from the root of this repository (this is also described in the CONTRIBUTING.md guide in the section named "Testing changes to the Data Hub Gradle plugin"): diff --git a/examples/SLED/build.gradle b/examples/SLED/build.gradle index b16c1636ae..2eab271400 100644 --- a/examples/SLED/build.gradle +++ b/examples/SLED/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } @@ -37,7 +37,7 @@ dependencies { // Makes the DHF JUnit5 library available for tests if (project.hasProperty("testing")) { - testImplementation "com.marklogic:marklogic-data-hub-junit5:6.0-SNAPSHOT" + testImplementation "com.marklogic:marklogic-data-hub-junit5:6.0.0" } else { testImplementation "com.marklogic:marklogic-data-hub-junit5:5.7.1" } diff --git a/examples/dh-5-example/build.gradle b/examples/dh-5-example/build.gradle index 809f804710..9ca0889f4e 100644 --- a/examples/dh-5-example/build.gradle +++ b/examples/dh-5-example/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } @@ -26,7 +26,7 @@ repositories { dependencies { if (project.hasProperty("testing")) { - implementation "com.marklogic:marklogic-data-hub:6.0-SNAPSHOT" + implementation "com.marklogic:marklogic-data-hub:6.0.0" } else { implementation "com.marklogic:marklogic-data-hub:5.7.1" } diff --git a/examples/dhf5-custom-hook/build.gradle b/examples/dhf5-custom-hook/build.gradle index 0e1d85e9d6..4934b11373 100644 --- a/examples/dhf5-custom-hook/build.gradle +++ b/examples/dhf5-custom-hook/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.5.0" } diff --git a/examples/insurance/build.gradle b/examples/insurance/build.gradle index 86a1efb9c6..6eeb197714 100644 --- a/examples/insurance/build.gradle +++ b/examples/insurance/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } diff --git a/examples/mapping-example/build.gradle b/examples/mapping-example/build.gradle index 988907e257..9f9b676ff6 100644 --- a/examples/mapping-example/build.gradle +++ b/examples/mapping-example/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } diff --git a/examples/patient-hub/build.gradle b/examples/patient-hub/build.gradle index 86a1efb9c6..6eeb197714 100755 --- a/examples/patient-hub/build.gradle +++ b/examples/patient-hub/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } diff --git a/examples/reference-entity-model/build.gradle b/examples/reference-entity-model/build.gradle index 2524e5ce42..77000c84cc 100644 --- a/examples/reference-entity-model/build.gradle +++ b/examples/reference-entity-model/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } @@ -37,7 +37,7 @@ dependencies { // Makes the DHF JUnit5 library available for tests if (project.hasProperty("testing")) { - testImplementation "com.marklogic:marklogic-data-hub-junit5:6.0-SNAPSHOT" + testImplementation "com.marklogic:marklogic-data-hub-junit5:6.0.0" } else { testImplementation "com.marklogic:marklogic-data-hub-junit5:5.7.1" } diff --git a/examples/smart-mastering-complete/build.gradle b/examples/smart-mastering-complete/build.gradle index c913d999d1..2381359ad5 100644 --- a/examples/smart-mastering-complete/build.gradle +++ b/examples/smart-mastering-complete/build.gradle @@ -8,7 +8,7 @@ buildscript { dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } diff --git a/examples/snapshot-testing/build.gradle b/examples/snapshot-testing/build.gradle index e4717ee4e5..d624cf46c7 100644 --- a/examples/snapshot-testing/build.gradle +++ b/examples/snapshot-testing/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } } diff --git a/examples/step-interceptors/build.gradle b/examples/step-interceptors/build.gradle index 060e139954..1c156b38fa 100644 --- a/examples/step-interceptors/build.gradle +++ b/examples/step-interceptors/build.gradle @@ -7,7 +7,7 @@ buildscript { dependencies { classpath "net.saliman:gradle-properties-plugin:1.5.1" if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } diff --git a/gradle.properties b/gradle.properties index 6de5c1dc85..927ffc9d19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -version=6.0-SNAPSHOT +version=6.0.0 publishUrl=file:../marklogic-data-hub/releases systemProp.file.encoding=utf-8 # disabling TLSv3 as a workaround for the bug in openJDK 11(https://bugs.openjdk.java.net/browse/JDK-8213202) diff --git a/marklogic-data-hub-central/src/main/resources/application.properties b/marklogic-data-hub-central/src/main/resources/application.properties index a8b6d9a990..106e7f32ab 100644 --- a/marklogic-data-hub-central/src/main/resources/application.properties +++ b/marklogic-data-hub-central/src/main/resources/application.properties @@ -38,5 +38,5 @@ log.path=./logs # Uncomment below to show details for all health indicators #management.endpoint.health.show-details=always spring.mvc.pathmatch.matching-strategy=ant_path_matcher -hubCentralVersion=6.0-SNAPSHOT +hubCentralVersion=6.0.0 mlAuthentication=local diff --git a/marklogic-data-hub-central/ui/e2e/hc-qa-project/build.gradle b/marklogic-data-hub-central/ui/e2e/hc-qa-project/build.gradle index d69f59f903..78fc90576d 100644 --- a/marklogic-data-hub-central/ui/e2e/hc-qa-project/build.gradle +++ b/marklogic-data-hub-central/ui/e2e/hc-qa-project/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.7.1" } diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/VersionInfo.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/VersionInfo.java index 93950bd982..09d062a26d 100644 --- a/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/VersionInfo.java +++ b/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/VersionInfo.java @@ -82,6 +82,6 @@ public static String getBuildVersion() { } String version = properties.getProperty("version"); - return "${project.version}".equals(version) ? "6.0-SNAPSHOT" : version; + return "${project.version}".equals(version) ? "6.0.0" : version; } } diff --git a/marklogic-data-hub/src/main/resources/hub-internal-config/security/roles/data-hub-admin.json b/marklogic-data-hub/src/main/resources/hub-internal-config/security/roles/data-hub-admin.json index efa7e30655..53b1ee086d 100644 --- a/marklogic-data-hub/src/main/resources/hub-internal-config/security/roles/data-hub-admin.json +++ b/marklogic-data-hub/src/main/resources/hub-internal-config/security/roles/data-hub-admin.json @@ -1,6 +1,6 @@ { "role-name": "data-hub-admin", - "description": "6.0-SNAPSHOT: Permits actions pertaining to administering a Data Hub application", + "description": "6.0.0: Permits actions pertaining to administering a Data Hub application", "role": [ "data-hub-developer" ], diff --git a/marklogic-data-hub/src/main/resources/scaffolding/build_gradle b/marklogic-data-hub/src/main/resources/scaffolding/build_gradle index a76e0cf06e..d049f35e2d 100644 --- a/marklogic-data-hub/src/main/resources/scaffolding/build_gradle +++ b/marklogic-data-hub/src/main/resources/scaffolding/build_gradle @@ -8,5 +8,5 @@ plugins { // Applies the Data Hub Gradle plugin, which extends ml-gradle with behavior specific to Data Hub. // For more information on this plugin, see https://docs.marklogic.com/datahub/tools/gradle/dhf-gradle-plugin.html . // For more information on ml-gradle, see https://github.com/marklogic-community/ml-gradle . - id 'com.marklogic.ml-data-hub' version '6.0-SNAPSHOT' + id 'com.marklogic.ml-data-hub' version '6.0.0' } diff --git a/performance-tests/projects/commoncrawl/build.gradle b/performance-tests/projects/commoncrawl/build.gradle index 7d1fa5aa4d..468833304b 100644 --- a/performance-tests/projects/commoncrawl/build.gradle +++ b/performance-tests/projects/commoncrawl/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { if (project.hasProperty("testing")) { - classpath "com.marklogic:ml-data-hub:6.0-SNAPSHOT" + classpath "com.marklogic:ml-data-hub:6.0.0" } else { classpath "com.marklogic:ml-data-hub:5.2.1"