Progress

Author: rjrudin

gradle.properties

@@ -1,6 +1,5 @@
 group=com.marklogic
 version=8.0-SNAPSHOT
-describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases
 
 okhttpVersion=5.1.0

marklogic-client-api/build.gradle

@@ -140,14 +140,14 @@ publishing {
 		mainJava(MavenPublication) {
 			from components.java
 			pom {
-				name = "${group}:${project.name}"
+				name = "${project.group}:${project.name}"
 				description = "The MarkLogic Java Client API"
 				packaging = "jar"
 				url = "https://github.com/marklogic/java-client-api"
 				licenses {
 					license {
 						name = "The Apache License, Version 2.0"
-						url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+						url = "https://www.apache.org/licenses/LICENSE-2.0.txt"
 					}
 				}
 				developers {
@@ -160,7 +160,7 @@ publishing {
 					}
 				}
 				scm {
-					url = "git@github.com:marklogic/java-client-api.git"
+					url = "https://github.com/marklogic/java-client-api"
 					connection = "scm:git:git@github.com:marklogic/java-client-api.git"
 					developerConnection = "scm:git:git@github.com:marklogic/java-client-api.git"
 				}
@@ -174,7 +174,7 @@ publishing {
 					username = mavenUser
 					password = mavenPassword
 				}
-				url publishUrl
+				url = publishUrl
 				allowInsecureProtocol = true
 			} else {
 				name = "central"

ml-development-tools/build.gradle

@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 /*
  * Copyright (c) 2010-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
  */
@@ -29,7 +31,7 @@ dependencies {
 // Added to avoid problem where processResources fails because - somehow - the plugin properties file is getting
 // copied twice. This started occurring with the upgrade of Gradle from 6.x to 7.x.
 tasks.processResources {
-	duplicatesStrategy = "exclude"
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
 }
 
 tasks.register("mlDevelopmentToolsJar", Jar) {
@@ -45,15 +47,15 @@ gradlePlugin {
 			id = 'com.marklogic.ml-development-tools'
 			displayName = 'ml-development-tools MarkLogic Data Service Tools'
 			description = 'ml-development-tools plugin for developing data services on MarkLogic'
-			tags.set(['marklogic', 'progress'])
+			tags = ['marklogic', 'progress']
 			implementationClass = 'com.marklogic.client.tools.gradle.ToolsPlugin'
 		}
 	}
 }
 
 publishing {
 	publications {
-		main(MavenPublication) {
+		mainJava(MavenPublication) {
 			from components.java
 		}
 	}
@@ -70,11 +72,10 @@ publishing {
 	}
 }
 
-compileKotlin {
-	kotlinOptions.jvmTarget = '17'
-}
-compileTestKotlin {
-	kotlinOptions.jvmTarget = '17'
+tasks.withType(KotlinCompile).configureEach {
+	compilerOptions {
+		jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
+	}
 }
 
 tasks.register("generateTests", JavaExec) {