Merge pull request #504 from BillFarber/task/updateDependencies

Updating dependencies

Author: BillFarber

build.gradle

@@ -3,12 +3,12 @@ plugins {
 	id "maven-publish"
 	id "signing"
   id "com.github.jk1.dependency-license-report" version "1.17"
-	id "net.saliman.properties" version "1.5.1"
+	id "net.saliman.properties" version "1.5.2"
 	id "io.snyk.gradle.plugin.snykplugin" version "0.4"
 }
 
 group = "com.marklogic"
-version = "4.7.0"
+version = "4.8.0-SNAPSHOT"
 
 java {
 	sourceCompatibility = 1.8
@@ -24,8 +24,8 @@ repositories {
 }
 
 dependencies {
-	api 'com.marklogic:ml-javaclient-util:4.7-SNAPSHOT'
-	api 'org.springframework:spring-web:5.3.31'
+	api 'com.marklogic:ml-javaclient-util:4.8-SNAPSHOT'
+	api 'org.springframework:spring-web:5.3.34'
 	api 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
 
 	implementation 'jaxen:jaxen:1.2.0'
@@ -37,7 +37,7 @@ dependencies {
 	implementation 'org.jdom:jdom2:2.0.6.1'
 
 	// Forcing httpclient to use this to address https://snyk.io/vuln/SNYK-JAVA-COMMONSCODEC-561518
-	implementation 'commons-codec:commons-codec:1.15'
+	implementation 'commons-codec:commons-codec:1.16.1'
 
 	// For EqualsBuilder; added in 3.8.1 to support detecting if a mimetype's properties have changed or not
 	implementation "org.apache.commons:commons-lang3:3.14.0"
@@ -57,15 +57,15 @@ dependencies {
 	compileOnly "com.beust:jcommander:1.82"
 	compileOnly "ch.qos.logback:logback-classic:1.3.14"
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
-	testImplementation 'org.springframework:spring-test:5.3.31'
-	testImplementation 'commons-io:commons-io:2.15.1'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+	testImplementation 'org.springframework:spring-test:5.3.34'
+	testImplementation 'commons-io:commons-io:2.16.1'
 	testImplementation 'xmlunit:xmlunit:1.6'
 
 	// Forcing Spring to use logback for testing instead of commons-logging
 	testImplementation "ch.qos.logback:logback-classic:1.3.14"
-	testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
-	testImplementation "org.slf4j:slf4j-api:1.7.36"
+	testImplementation "org.slf4j:jcl-over-slf4j:2.0.13"
+	testImplementation "org.slf4j:slf4j-api:2.0.13"
 }
 
 // This ensures that Gradle includes in the published jar any non-java files under src/main/java

src/test/java/com/marklogic/appdeployer/command/modules/LoadModulesTest.java

@@ -161,7 +161,7 @@ public void loadModulesWithAssetFileFilterAndTokenReplacement() {
 	@Test
 	public void testServerExists() {
 		appConfig.getFirstConfigDir().setBaseDir(new File(("src/test/resources/sample-app/db-only-config")));
-		appConfig.setTestRestPort(8541);
+		appConfig.setTestRestPort(8003);
 		initializeAppDeployer(new DeployRestApiServersCommand(true), buildLoadModulesCommand());
 
 		appDeployer.deploy(appConfig);