Merge branch 'master' into dev

Author: rjrudin

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.marklogic"
-version = "4.6-SNAPSHOT"
+version = "4.6.0"
 
 java {
 	sourceCompatibility = 1.8
@@ -24,7 +24,7 @@ repositories {
 }
 
 dependencies {
-	api 'com.marklogic:ml-javaclient-util:4.6-SNAPSHOT'
+	api 'com.marklogic:ml-javaclient-util:4.6.0'
 	api 'org.springframework:spring-web:5.3.29'
 	api 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
 

pom.xml

@@ -12,7 +12,7 @@ It is not intended to be used to build this project.
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.marklogic</groupId>
   <artifactId>ml-app-deployer</artifactId>
-  <version>4.5.2</version>
+  <version>4.6.0</version>
   <name>com.marklogic:ml-app-deployer</name>
   <description>Java client for the MarkLogic REST Management API and for deploying applications to MarkLogic</description>
   <url>https://github.com/marklogic/ml-app-deployer</url>
@@ -40,19 +40,19 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>ml-javaclient-util</artifactId>
-      <version>4.5.1</version>
+      <version>4.6.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.3.27</version>
+      <version>5.3.29</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.14.1</version>
+      <version>2.15.2</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

src/main/java/com/marklogic/mgmt/resource/forests/ForestManager.java

@@ -69,7 +69,6 @@ public ForestManager(ManageClient client) {
 	 */
 	public Map<String, List<Forest>> getMapOfPrimaryForests() {
 		JsonNode json = new ConfigurationManager(getManageClient()).getResourcesAsJson("forest").getBody();
-
 		// Config is an array of objects, and it will have a single object based on our request.
 		ArrayNode allPrimaryForests = (ArrayNode) json.get("config").get(0).get("forest");
 		ResourceMapper mapper = new DefaultResourceMapper(new API(getManageClient()));