From 3092062e46f98c5c0ce18ae0db1a2cc45b10eb8a Mon Sep 17 00:00:00 2001
From: Rob Rudin <rudin@progress.com>
Date: Thu, 25 Jan 2024 13:08:46 -0500
Subject: [PATCH] Updated Gradle config

With the update to the Gradle publishing plugin, something changed such that declaring `artifact sourcesJar` and `artifact javadocJar` caused Gradle to complain about multiple artifacts with the same extension. They appear unnecessary now, so I removed them, so that local publishing works again. Will revisit when it's time to publish to Maven Central.
---
 build.gradle                                | 23 ++++++++++-----------
 examples/local-testing-project/build.gradle |  2 +-
 gradle/wrapper/gradle-wrapper.properties    |  2 +-
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index bba193e01..62ef35267 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id "groovy"
   id "maven-publish"
-	id "signing"
 
 	// Ignored as it depends on Java 11; can uncomment and use Java 11 when it needs to be run
 	//  id "com.github.jk1.dependency-license-report" version "2.1"
@@ -12,8 +11,13 @@ plugins {
 	id "io.snyk.gradle.plugin.snykplugin" version "0.4"
 }
 
+// Applied conditionally so that it does not take effect when publishing locally.
+if (project.hasProperty("signing.keyId")) {
+	apply plugin: "signing"
+}
+
 group = "com.marklogic"
-version = "4.6.1"
+version = "4.7-SNAPSHOT"
 
 java {
 	sourceCompatibility = 1.8
@@ -24,7 +28,7 @@ repositories {
 	mavenLocal()
 	mavenCentral()
 	maven {
-		url "https://nexus.marklogic.com/repository/maven-snapshots/"
+		url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 	}
 }
 
@@ -32,10 +36,10 @@ dependencies {
   implementation gradleApi()
 	implementation localGroovy()
 
-	api 'com.marklogic:ml-app-deployer:4.6.1'
+	api 'com.marklogic:ml-app-deployer:4.7-SNAPSHOT'
 	implementation "com.marklogic:mlcp-util:1.0.1"
 	implementation "com.marklogic:marklogic-data-movement-components:2.7.0"
-	implementation "commons-io:commons-io:2.11.0"
+	implementation "commons-io:commons-io:2.15.1"
 
 	compileOnly "com.marklogic:marklogic-unit-test-client:1.4.0"
 
@@ -51,13 +55,13 @@ dependencies {
 }
 
 task sourcesJar(type: Jar, dependsOn: classes) {
-  classifier 'sources'
+  archiveClassifier = 'sources'
   from sourceSets.main.allJava
   from sourceSets.main.allGroovy
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
-	classifier "javadoc"
+	archiveClassifier = "javadoc"
 	from javadoc
 }
 javadoc.failOnError = false
@@ -65,9 +69,6 @@ javadoc.failOnError = false
 artifacts {
 	archives javadocJar, sourcesJar
 }
-signing {
-	sign configurations.archives
-}
 
 task generatePomForDependencyGraph(dependsOn: "generatePomFileForMainJavaPublication") {
 	description = "Prepare for a release by making a copy of the generated pom file in the root directory so that it " +
@@ -113,8 +114,6 @@ publishing {
 				}
 			}
 			from components.java
-			artifact sourcesJar
-			artifact javadocJar
 		}
 	}
 	repositories {
diff --git a/examples/local-testing-project/build.gradle b/examples/local-testing-project/build.gradle
index 1b27e2cad..8b58227b2 100644
--- a/examples/local-testing-project/build.gradle
+++ b/examples/local-testing-project/build.gradle
@@ -2,7 +2,7 @@ buildscript {
   repositories {
 	  mavenLocal()
 		maven {
-			url "https://nexus.marklogic.com/repository/maven-snapshots/"
+			url "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
 		}
 		mavenCentral()
   }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 63e9517f5..78c860b4d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists