From 7bf3a26ca373979557f9b3cae5fc60ce46841dd8 Mon Sep 17 00:00:00 2001
From: Scott Frederick <sfrederick@pivotal.io>
Date: Tue, 5 Oct 2021 13:53:29 -0500
Subject: [PATCH] Improve published pom backward compatibility

---
 publish-maven.gradle | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/publish-maven.gradle b/publish-maven.gradle
index 7247368..b93cacd 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -24,7 +24,6 @@ publishing {
 	}
 	publications {
 		mavenJava(MavenPublication) {
-//			suppressAllPomMetadataWarnings()
 			from components.java
 			pom {
 				afterEvaluate {
@@ -33,7 +32,7 @@ publishing {
 				}
 				url = "https://spring.io/projects/spring-credhub"
 				organization {
-					name = "Pivotal Software, Inc."
+					name = "Spring IO"
 					url = "https://spring.io"
 				}
 				licenses {
@@ -45,8 +44,8 @@ publishing {
 				}
 				scm {
 					url = "https://github.com/spring-projects/spring-credhub"
-					connection = "scm:git:git://github.com/spring-projects/spring-credhub"
-					developerConnection = "scm:git:git://github.com/spring-projects/spring-credhub"
+					connection = "scm:git:https://github.com/spring-projects/spring-credhub.git"
+					developerConnection = "scm:git:https://github.com/spring-projects/spring-credhub.git"
 				}
 				issueManagement {
 					system = "GitHub"
@@ -60,20 +59,6 @@ publishing {
 					}
 				}
 			}
-
-			// Published pom will use fully-qualified dependency versions and no BOMs
-			versionMapping {
-				usage('java-api') {
-					fromResolutionOf('runtimeClasspath')
-				}
-				usage('java-runtime') {
-					fromResolutionResult()
-				}
-			}
-			pom.withXml {
-				def dependencyManagementNode = asNode().get("dependencyManagement")
-				asNode().remove(dependencyManagementNode)
-			}
 		}
 	}
 }