Merge pull request #746 from marklogic/feature/22458-black-duck

MLE-22458 More Black Duck fixes

Author: rjrudin

examples/maven-project/pom.xml

@@ -14,15 +14,6 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-	<dependencies>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.13.1</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>

examples/maven-project/src/main/java/com/marklogic/App.java

@@ -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>5.0.0</version>
+  <version>5.1.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,13 +40,13 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>ml-javaclient-util</artifactId>
-      <version>5.0.0</version>
+      <version>5.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-web</artifactId>
-      <version>5.3.39</version>
+      <version>6.2.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -70,7 +70,7 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.16.0</version>
+      <version>3.17.0</version>
       <scope>runtime</scope>
     </dependency>
     <dependency>

examples/maven-project/src/test/java/com/marklogic/AppTest.java

@@ -9,7 +9,10 @@ dependencies {
 	api project(":ml-app-deployer")
 
 	// For MlcpTask
-	implementation "com.marklogic:mlcp-util:1.0.1"
+	implementation ("com.marklogic:mlcp-util:1.0.1") {
+		// Prefer the Spring version from ml-app-deployer.
+		exclude module: "spring-beans"
+	}
 
 	// For the data movement tasks.
 	implementation ("com.marklogic:marklogic-data-movement-components:2.8.0") {

ml-app-deployer/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-javaclient-util</artifactId>
-  <version>5.0.0</version>
+  <version>5.1.0</version>
   <name>com.marklogic:ml-javaclient-util</name>
   <description>Library that adds functionality on top of the MarkLogic Java Client</description>
   <url>https://github.com/marklogic/ml-javaclient-util</url>
@@ -40,19 +40,19 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>marklogic-client-api</artifactId>
-      <version>7.0.0</version>
+      <version>7.1.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>marklogic-xcc</artifactId>
-      <version>11.3.0</version>
+      <version>11.3.1</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.3.39</version>
+      <version>6.2.8</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -70,7 +70,7 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>2.0.16</version>
+      <version>2.0.17</version>
       <scope>runtime</scope>
     </dependency>
   </dependencies>

ml-gradle/build.gradle

@@ -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-gradle</artifactId>
-	<version>5.0.0</version>
+	<version>5.1.0</version>
 	<name>com.marklogic:ml-gradle</name>
 	<description>Gradle plugin for automating everything involving MarkLogic</description>
 	<url>https://github.com/marklogic/ml-gradle</url>
@@ -40,25 +40,37 @@ It is not intended to be used to build this project.
 		<dependency>
 			<groupId>com.marklogic</groupId>
 			<artifactId>ml-app-deployer</artifactId>
-			<version>5.0.0</version>
+			<version>5.1.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.marklogic</groupId>
 			<artifactId>mlcp-util</artifactId>
 			<version>1.0.1</version>
 			<scope>runtime</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework</groupId>
+					<artifactId>spring-beans</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.marklogic</groupId>
 			<artifactId>marklogic-data-movement-components</artifactId>
 			<version>2.8.0</version>
 			<scope>runtime</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.marklogic</groupId>
+					<artifactId>marklogic-client-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
-			<version>2.16.1</version>
+			<version>2.19.0</version>
 			<scope>runtime</scope>
 		</dependency>
 	</dependencies>