Merge pull request #500 from marklogic/release/4.7

Release/4.7

build.gradle

@@ -8,7 +8,7 @@ plugins {
 }
 
 group = "com.marklogic"
-version = "4.6.1"
+version = "4.7.0"
 
 java {
 	sourceCompatibility = 1.8
@@ -19,20 +19,18 @@ repositories {
 	mavenLocal()
 	mavenCentral()
 	maven {
-		url "https://nexus.marklogic.com/repository/maven-snapshots/"
+		url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 	}
 }
 
 dependencies {
-	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'
+	api 'com.marklogic:ml-javaclient-util:4.7.0'
+	api 'org.springframework:spring-web:5.3.31'
+	api 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
 
 	implementation 'jaxen:jaxen:1.2.0'
 
-	// Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002
-	implementation 'com.squareup.okio:okio:3.4.0'
-	implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+	implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 	implementation 'io.github.rburgst:okhttp-digest:2.7'
 
 	implementation 'org.apache.httpcomponents:httpclient:4.5.14'
@@ -42,10 +40,10 @@ dependencies {
 	implementation 'commons-codec:commons-codec:1.15'
 
 	// 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.12.0"
+	implementation "org.apache.commons:commons-lang3:3.14.0"
 
 	// For PreviewInterceptor; can be excluded if that feature is not used
-	implementation("com.flipkart.zjsonpatch:zjsonpatch:0.4.14") {
+	implementation("com.flipkart.zjsonpatch:zjsonpatch:0.4.16") {
 		// Prefer the api version declared above
 		exclude module: "jackson-databind"
 	}
@@ -57,15 +55,15 @@ dependencies {
 
 	// Don't want to include this in the published jar, just the executable jar
 	compileOnly "com.beust:jcommander:1.82"
-	compileOnly "ch.qos.logback:logback-classic:1.3.5"
+	compileOnly "ch.qos.logback:logback-classic:1.3.14"
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
-	testImplementation 'org.springframework:spring-test:5.3.29'
-	testImplementation 'commons-io:commons-io:2.11.0'
+	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 'xmlunit:xmlunit:1.6'
 
 	// Forcing Spring to use logback for testing instead of commons-logging
-	testImplementation "ch.qos.logback:logback-classic:1.3.5"
+	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"
 }
@@ -74,14 +72,14 @@ dependencies {
 sourceSets.main.resources.srcDir 'src/main/java'
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-  classifier 'sources'
+  archiveClassifier = 'sources'
   from sourceSets.main.allSource
 	// For unknown reasons, Gradle 7.1 (but not 6.x) is complaining that AbstractManager.java is a duplicate.
 	duplicatesStrategy = "exclude"
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-	classifier "javadoc"
+	archiveClassifier = "javadoc"
 	from javadoc
 }
 javadoc.failOnError = false
@@ -131,9 +129,9 @@ publishing {
 					}
 				}
 				scm {
-					url = "[email protected]:marklogic-community/${project.name}.git"
-					connection = "scm:[email protected]:marklogic-community/${project.name}.git"
-					developerConnection = "scm:[email protected]:marklogic-community/${project.name}.git"
+					url = "[email protected]:marklogic/${project.name}.git"
+					connection = "scm:[email protected]:marklogic/${project.name}.git"
+					developerConnection = "scm:[email protected]:marklogic/${project.name}.git"
 				}
 			}
 			from components.java

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip