Merge pull request #753 from marklogic/feature/version

MLE-12345 Bumping version to 6.0-SNAPSHOT

Author: rjrudin

build.gradle

@@ -4,7 +4,7 @@ subprojects {
 	apply plugin: "maven-publish"
 
 	group = "com.marklogic"
-	version = "5.1-SNAPSHOT"
+	version = "6.0-SNAPSHOT"
 
 	java {
 		sourceCompatibility = 17

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=5.1-SNAPSHOT
+mlGradleVersion=6.0-SNAPSHOT
 
 mlHost=localhost
 mlAppName=example

ml-app-deployer/src/main/java/com/marklogic/appdeployer/AppConfig.java

@@ -1873,14 +1873,14 @@ public void setAppServicesTrustStoreAlgorithm(String appServicesTrustStoreAlgori
 	}
 
 	/**
-	 * @since 5.1.0
+	 * @since 6.0.0
 	 */
 	public Map<String, String> getHostCertificatePassphrases() {
 		return hostCertificatePassphrases;
 	}
 
 	/**
-	 * @since 5.1.0
+	 * @since 6.0.0
 	 */
 	public void setHostCertificatePassphrases(Map<String, String> hostCertificatePassphrases) {
 		this.hostCertificatePassphrases = hostCertificatePassphrases;

ml-app-deployer/src/main/java/com/marklogic/appdeployer/DefaultAppConfigFactory.java

@@ -48,7 +48,7 @@ public AppConfig newAppConfig() {
 		final AppConfig appConfig = new AppConfig(this.projectDir);
 		for (String propertyName : propertyConsumerMap.keySet()) {
 			String value = getProperty(propertyName);
-			// In 5.1.0, the value must not be whitespace. But we have this hack here to preserve documented and tested
+			// In 6.0.0, the value must not be whitespace. But we have this hack here to preserve documented and tested
 			// functionality for allowing for mlModuleTimestampsPath to be set to an empty string to disable its functionality.
 			if (StringUtils.hasText(value) || (value != null && "mlModuleTimestampsPath".equalsIgnoreCase(propertyName))) {
 				try {
@@ -1001,7 +1001,6 @@ public void initialize() {
 		registerDataLoadingProperties();
 		registerPluginProperties();
 
-		// Added in 5.1.0
 		propertyConsumerMap.put("mlHostCertificatePassphrases", (config, prop) -> {
 			String customDelimiter = this.getPropertySource().getProperty("mlHostCertificatePassphrasesDelimiter");
 			final String delimiter = StringUtils.hasText(customDelimiter) ? customDelimiter : ",";

ml-app-deployer/src/main/java/com/marklogic/mgmt/resource/security/CertificateTemplateManager.java

@@ -105,7 +105,7 @@ public ResponseEntity<String> insertHostCertificate(String templateIdOrName, Str
 	}
 
 	/**
-	 * @since 5.1.0
+	 * @since 6.0.0
 	 */
 	public ResponseEntity<String> insertHostCertificate(String templateIdOrName, String pubCert, String privateKey, String passphrase) {
 		ObjectNode command = ObjectMapperFactory.getObjectMapper().createObjectNode();

ml-javaclient-util/src/main/java/com/marklogic/client/ext/file/DefaultDocumentFileReader.java

@@ -66,7 +66,7 @@ public List<DocumentFile> readDocumentFiles(String... paths) {
 			Path p = constructPath(path);
 			if (p != null) {
 				this.currentRootPath = p;
-				// Fixed in 5.0.1 / 5.1.0 - symlinks are now followed and thus work properly.
+				// Fixed in 6.0.0 - symlinks are now followed and thus work properly.
 				Set<FileVisitOption> options = EnumSet.of(FileVisitOption.FOLLOW_LINKS);
 				try {
 					Files.walkFileTree(this.currentRootPath, options, Integer.MAX_VALUE, this);

ml-javaclient-util/src/main/java/com/marklogic/client/ext/ssl/SslUtil.java

@@ -29,7 +29,7 @@
 
 public abstract class SslUtil {
 
-	// Defaulting this to "TLS" in 5.1.0 so that clients connecting to MarkLogic 12 will default to TLSv1.3, while
+	// Defaulting this to "TLS" in 6.0.0 so that clients connecting to MarkLogic 12 will default to TLSv1.3, while
 	// clients connecting to MarkLogic 11 or older will default to TLSv1.2.
 	public final static String DEFAULT_SSL_PROTOCOL = "TLS";
 

ml-javaclient-util/src/test/java/com/marklogic/client/ext/ssl/SslUtilTest.java

@@ -31,7 +31,7 @@ public void configureWithDefaults() {
 		assertTrue(certs.length > 0);
 
 		SSLContext context = config.getSslContext();
-		assertEquals("TLS", context.getProtocol(), "As of 5.1.0, the default is TLS so that clients connecting to " +
+		assertEquals("TLS", context.getProtocol(), "As of 6.0.0, the default is TLS so that clients connecting to " +
 			"MarkLogic 12 will default to TLSv1.3.");
 	}