#424 Upgrading dependencies and supporting Java 8 again

Author: rjrudin

.gitignore

@@ -13,4 +13,5 @@ src/test/resources/scaffold-test/
 src/test/resources/entity-services-project/src
 *.iml
 target
-
+gradle-local.properties
+snyk

build.gradle

@@ -5,10 +5,13 @@ plugins {
   id "idea"
   id "com.jfrog.bintray" version "1.8.4"
   id "com.github.jk1.dependency-license-report" version "1.3"
+
+	id "net.saliman.properties" version "1.5.1"
+	id "io.snyk.gradle.plugin.snykplugin" version "0.4"
 }
 
-sourceCompatibility = "9"
-targetCompatibility = "9"
+sourceCompatibility = "8"
+targetCompatibility = "8"
 
 repositories {
 	mavenLocal()
@@ -17,10 +20,13 @@ repositories {
 }
 
 dependencies {
-  api 'com.marklogic:ml-javaclient-util:4.1.0-rc1'
+  api 'com.marklogic:ml-javaclient-util:4.1.0-SNAPSHOT'
   api 'jaxen:jaxen:1.1.6'
-  api 'org.apache.httpcomponents:httpclient:4.5.12'
-  api 'org.springframework:spring-web:5.2.8.RELEASE'
+  api 'org.apache.httpcomponents:httpclient:4.5.13'
+  api 'org.springframework:spring-web:5.2.9.RELEASE'
+
+	// Forcing httpclient to use this to address https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518
+	api 'commons-codec:commons-codec:1.13'
 
 	// For EqualsBuilder; added in 3.8.1 to support detecting if a mimetype's properties have changed or not
 	api "org.apache.commons:commons-lang3:3.11"
@@ -38,7 +44,7 @@ dependencies {
 
   testImplementation 'com.marklogic:ml-junit:3.2.0'
 	// Force ml-junit to use 5.2.8 instead of 4.1.5
-	testImplementation "org.springframework:spring-test:5.2.8.RELEASE"
+	testImplementation "org.springframework:spring-test:5.2.9.RELEASE"
 	testImplementation 'commons-io:commons-io:2.8.0'
 
   // Forcing Spring to use logback instead of commons-logging
@@ -123,3 +129,12 @@ task executableJar(type: Jar) {
 		}
 	}
 }
+
+// See https://github.com/snyk/gradle-plugin for more information
+snyk {
+	//arguments = '--all-sub-projects'
+	severity = 'low'
+	api = snykToken
+	autoDownload = true
+	autoUpdate = true
+}

gradle.properties

@@ -1,4 +1,4 @@
 group=com.marklogic
 javadocsDir=../gh-pages-marklogic-java/javadocs
-version=4.1.0-rc1
+version=4.1.0-SNAPSHOT
 

src/main/java/com/marklogic/mgmt/resource/tasks/TaskManager.java

@@ -200,7 +200,7 @@ protected void updateNewTaskIfItShouldBeDisabled(String payload, SaveReceipt rec
 	 * Per ticket #367, when a task is updated, it is first deleted. This is to workaround Manage API behavior which
 	 * does not allow for any property besides "task-enabled" to be updated on a scheduled task. But it's often handy
 	 * during a deployment to update some other property of a scheduled task. Unfortunately, that throws an error.
-	 *
+	 * <p>
 	 * So to work around that, when a scheduled task is updated, it's first deleted. Then the task is created, which
 	 * includes making another call to disable the task if task-enabled is set to false.
 	 *
@@ -256,8 +256,9 @@ public void deleteAllTasks() {
 	/**
 	 * @param taskPath
 	 */
-	@Deprecated(since = "Deprecated since 4.0.2, as the taskPath may not suffice for uniquely identifying a task. " +
-		"This now assumes a task root of '/' to at least avoid an error being thrown.")
+	// Deprecated since 4.0.2, as the taskPath may not suffice for uniquely identifying a task.
+	// This now assumes a task root of '/' to at least avoid an error being thrown.
+	@Deprecated
 	public void deleteTaskWithPath(String taskPath) {
 		deleteTaskWithPath(taskPath, "/");
 	}