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

MLE-22458 Updated dependencies in example projects

Author: rjrudin

examples/alert-project/build.gradle

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation "com.marklogic:marklogic-junit5:1.1.0"
+	testImplementation "com.marklogic:marklogic-junit5:1.5.0"
 }
 
 test {

examples/corticon-example/settings.gradle

@@ -10,7 +10,7 @@ repositories {
 }
 
 dependencies {
-	testImplementation "com.marklogic:marklogic-junit5:1.1.0"
+	testImplementation "com.marklogic:marklogic-junit5:1.5.0"
 }
 
 test {

examples/cpf-project/build.gradle

@@ -2,7 +2,7 @@ plugins {
 	id "java"
 	id "net.saliman.properties" version "1.5.2"
 	id "com.marklogic.ml-gradle" version "5.0.0"
-	id 'com.marklogic.ml-development-tools' version '6.0.0'
+	id 'com.marklogic.ml-development-tools' version '7.1.0'
 }
 
 task generateHelloWorld(type: com.marklogic.client.tools.gradle.EndpointProxiesGenTask) {
@@ -19,13 +19,13 @@ test {
 }
 
 dependencies {
-	implementation 'org.slf4j:slf4j-api:1.7.31'
-	implementation 'com.marklogic:marklogic-client-api:6.0.0'
+	implementation 'org.slf4j:slf4j-api:2.0.17'
+	implementation 'com.marklogic:marklogic-client-api:7.1.0'
 
-	testImplementation "org.junit.jupiter:junit-jupiter:5.9.1"
+	testImplementation "org.junit.jupiter:junit-jupiter:5.12.2"
 
 	// Force usage of logback for logging
-	testImplementation "ch.qos.logback:logback-classic:1.3.5"
-	testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
-	testImplementation "org.slf4j:slf4j-api:1.7.36"
+	testImplementation "ch.qos.logback:logback-classic:1.3.14"
+	testImplementation "org.slf4j:jcl-over-slf4j:2.0.17"
+	testImplementation "org.slf4j:slf4j-api:2.0.17"
 }

examples/data-services/build.gradle

@@ -28,15 +28,6 @@ repositories {
 	}
 }
 
-configurations {
-	mlcp //example if you want to use mlcp. Delete otherwise
-}
-
-dependencies {
-	//sample mlcp dependency. Remove if not required
-	mlcp "com.marklogic:mlcp:10.0.6.2"
-}
-
 /**
  * START: Disconnected gradle tasks
  */
@@ -57,7 +48,6 @@ task downloadToProjectMavenRepo(type: Copy) {
 	 * These are defined in the 'dependencies' block. E.g. you need to include
 	 * configurations.implementation.files if you want your java 'implementation' dependencies downloaded
 	 */
-	configurations.mlcp.files //includes 'mlcp' dependencies. Remove if not needed
 
 	from new File(gradle.gradleUserHomeDir, 'caches/modules-2/files-2.1') // correct as of gradle 4.7
 	into new File(rootDir, projectMavenRepo)
@@ -71,8 +61,8 @@ task downloadToProjectMavenRepo(type: Copy) {
 task makeOfflineZip(type: Zip, dependsOn: downloadToProjectMavenRepo) {
 	from rootDir
 	excludes = ['.tmp', '.gradle', 'build/gradle-home', 'build/distributions', 'build/offline/gradle/wrapper/dists']
-	destinationDir(file('build/distributions'))
-	archiveName = 'offline.zip'
+	destinationDirectory = file('build/distributions')
+	archiveFileName = 'offline.zip'
 	doLast {
 		println "Created offline project zip at build/distributions/offline.zip"
 	}

examples/disconnected-project-using-plugins-and-gradlew/build.gradle

@@ -13,125 +13,107 @@
  * against a file tree.
  */
 buildscript {
-    if (project.hasProperty("disconnected")) {
-        dependencies {
-            classpath fileTree(dir: "ml-gradle-dependencies", include: "*.jar")
-        }
-    }
-    else {
-        repositories {
-            mavenCentral()
-        }
-        dependencies {
-            classpath mlGradleDependency
-            classpath mlSalimanDependency
-        }
-    }
+	if (project.hasProperty("disconnected")) {
+		dependencies {
+			classpath fileTree(dir: "ml-gradle-dependencies", include: "*.jar")
+		}
+	} else {
+		repositories {
+			mavenCentral()
+		}
+		dependencies {
+			classpath mlGradleDependency
+			classpath mlSalimanDependency
+		}
+	}
 }
 
 apply plugin: "com.marklogic.ml-gradle"
 
 configurations {
-    mlcp
-    mlDeployer
+	mlDeployer
 }
 
 ext {
-    mlDeployerDir = "build/ml-deployer"
-    mlDeployerGroup = "ML Deployer"
-    mlDeployerZipFilename = "ml-deployer.zip"
+	mlDeployerDir = "build/ml-deployer"
+	mlDeployerGroup = "ML Deployer"
+	mlDeployerZipFilename = "ml-deployer.zip"
 }
 
 /*
- * If the project has the "disconnected" property defined, then we look for mlcp dependencies in a directory
- * instead of retrieving them from a repository.
+ * If the project has the "disconnected" property defined, then no repositories are registered.
  */
 if (project.hasProperty("disconnected")) {
-    println "\nRUNNING IN DISCONNECTED MODE"
-
-    dependencies {
-        mlcp fileTree(dir: "mlcp-dependencies", include: "*.jar")
-    }
+	println "\nRUNNING IN DISCONNECTED MODE"
 }
 
 /*
  * If we're not in disconnected mode, then we grab dependencies from repositories, and we define a set of tasks
  * for creating the "mlDeployer" zip file that can be used in a disconnected environment.
  */
 else {
-    repositories {
-			mavenCentral()
-        maven {url "http://developer.marklogic.com/maven2/"}
-        maven {url "http://repository.cloudera.com/artifactory/cloudera-repos/" }
-    }
-
-    configurations { mlgradle }
-
-    dependencies {
-        mlcp "com.marklogic:mlcp-Hadoop2:1.3-2"
-        mlcp "com.marklogic:marklogic-mapreduce2:2.1.2"
-
-        mlgradle mlGradleDependency
-    }
-
-    task copyGradleFiles(type: Copy, group: mlDeployerGroup) {
-        from "build.gradle", "gradle.properties"
-        into mlDeployerDir
-    }
-
-    task copyAppModules(type: Copy, group: mlDeployerGroup) {
-        from "src/main/ml-modules"
-        into mlDeployerDir + "/src/main/ml-modules"
-    }
-
-    task copyAppConfig(type: Copy, group: mlDeployerGroup) {
-        from "src/main/ml-config"
-        into mlDeployerDir + "/src/main/ml-config"
-    }
-
-    task copyMlGradleDependencies(type: Copy, group: mlDeployerGroup) {
-        from configurations.mlgradle
-        into mlDeployerDir + "/ml-gradle-dependencies"
-    }
-
-    task copyMlcpDependencies(type: Copy, group: mlDeployerGroup) {
-        from configurations.mlcp
-        into mlDeployerDir + "/mlcp-dependencies"
-    }
-
-    task addDisconnectedToGradleProperties {
-        doLast {
-            ant.propertyfile(file: "build/ml-deployer/gradle.properties") {
-                entry(key: "disconnected", value: "true")
-            }
-        }
-    }
-
-    addDisconnectedToGradleProperties.mustRunAfter copyGradleFiles
-
-    task copyMlDeployerFiles(group: mlDeployerGroup) {
-        dependsOn = [
-            "copyGradleFiles",
-            "copyAppModules",
-            "copyAppConfig",
-            "copyMlGradleDependencies",
-            "copyMlcpDependencies",
-            "addDisconnectedToGradleProperties"
-        ]
-    }
-
-    task deleteMlDeployer(type: Delete, group: mlDeployerGroup) { delete mlDeployerDir, "build/${mlDeployerZipFilename}" }
-
-    task buildMlDeployer (type: Zip, group: mlDeployerGroup) {
-        description "Create a zip of this project's Gradle dependencies and source code so that it can be deployer without Internet access"
-        dependsOn = ["deleteMlDeployer", "copyMlDeployerFiles"]
-        from mlDeployerDir
-        into 'ml-deployer'
-        destinationDir file('build')
-        archiveName mlDeployerZipFilename
-    }
-
-    copyMlDeployerFiles.mustRunAfter deleteMlDeployer
+	repositories {
+		mavenCentral()
+	}
+
+	configurations { mlgradle }
+
+	dependencies {
+		mlgradle mlGradleDependency
+	}
+
+	task copyGradleFiles(type: Copy, group: mlDeployerGroup) {
+		from "build.gradle", "gradle.properties"
+		into mlDeployerDir
+	}
+
+	task copyAppModules(type: Copy, group: mlDeployerGroup) {
+		from "src/main/ml-modules"
+		into mlDeployerDir + "/src/main/ml-modules"
+	}
+
+	task copyAppConfig(type: Copy, group: mlDeployerGroup) {
+		from "src/main/ml-config"
+		into mlDeployerDir + "/src/main/ml-config"
+	}
+
+	task copyMlGradleDependencies(type: Copy, group: mlDeployerGroup) {
+		from configurations.mlgradle
+		into mlDeployerDir + "/ml-gradle-dependencies"
+	}
+
+	task addDisconnectedToGradleProperties {
+		doLast {
+			ant.propertyfile(file: "build/ml-deployer/gradle.properties") {
+				entry(key: "disconnected", value: "true")
+			}
+		}
+	}
+
+	addDisconnectedToGradleProperties.mustRunAfter copyGradleFiles
+
+	task copyMlDeployerFiles(group: mlDeployerGroup) {
+		dependsOn = [
+			"copyGradleFiles",
+			"copyAppModules",
+			"copyAppConfig",
+			"copyMlGradleDependencies",
+			"addDisconnectedToGradleProperties"
+		]
+	}
+
+	task deleteMlDeployer(type: Delete, group: mlDeployerGroup) { delete mlDeployerDir, "build/${mlDeployerZipFilename}" }
+
+	task buildMlDeployer(type: Zip, group: mlDeployerGroup) {
+		description "Create a zip of this project's Gradle dependencies and source code so that it can be deployer without Internet access"
+		dependsOn = ["deleteMlDeployer", "copyMlDeployerFiles"]
+		from mlDeployerDir
+		into 'ml-deployer'
+		destinationDirectory = file('build')
+		archiveFileName = mlDeployerZipFilename
+	}
+
+	copyMlDeployerFiles.mustRunAfter deleteMlDeployer
 }
 
 /*