🔧 allow configuration of scm organizationi in pom attributes (#22)

* 🔧 allow configuration of scm organizationi in pom attributes

* ♻️ rename maven publication to clarify that it is going to maven central

* 👌 avoid explicitly resolving providers

Author: ryandens

hypertrace-gradle-publish-maven-central-plugin/src/main/java/org/hypertrace/gradle/publishing/HypertracePublishMavenCentralExtension.java

@@ -1,6 +1,5 @@
 package org.hypertrace.gradle.publishing;
 
-import org.hypertrace.gradle.publishing.License;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.api.provider.Property;
@@ -15,6 +14,7 @@ public abstract class HypertracePublishMavenCentralExtension implements Extensio
   private static final String DEFAULT_DEVELOPER_ORG = "Hypertrace";
   private static final String DEFAULT_DEVELOPER_ORG_URL = "https://www.hypertrace.org";
   private static final String DEFAULT_PACKAGE_GROUP = "org.hypertrace";
+  private static final String DEFAULT_SCM_ORGANIZATION = "hypertrace";
 
   public final Property<String> url;
   public final Property<String> repoName;
@@ -25,6 +25,7 @@ public abstract class HypertracePublishMavenCentralExtension implements Extensio
   public final Property<String> developerOrganizationUrl;
   public final Property<License> license;
   public final Property<String> packageGroup;
+  public final Property<String> scmOrganization;
 
   @Inject
   public HypertracePublishMavenCentralExtension(ObjectFactory objectFactory) {
@@ -37,5 +38,6 @@ public HypertracePublishMavenCentralExtension(ObjectFactory objectFactory) {
     this.developerOrganizationUrl = objectFactory.property(String.class).convention(DEFAULT_DEVELOPER_ORG_URL);
     this.license = objectFactory.property(License.class);
     this.packageGroup = objectFactory.property(String.class).convention(DEFAULT_PACKAGE_GROUP);
+    this.scmOrganization = objectFactory.property(String.class).convention(DEFAULT_SCM_ORGANIZATION);
   }
 }

hypertrace-gradle-publish-maven-central-plugin/src/main/java/org/hypertrace/gradle/publishing/PublishMavenCentralPlugin.java

@@ -9,6 +9,7 @@
 import org.gradle.api.Project;
 import org.gradle.api.UnknownDomainObjectException;
 import org.gradle.api.plugins.JavaPluginExtension;
+import org.gradle.api.provider.Provider;
 import org.gradle.api.publish.PublicationContainer;
 import org.gradle.api.publish.PublishingExtension;
 import org.gradle.api.publish.maven.MavenPublication;
@@ -104,6 +105,7 @@ private void addPublishRepository() {
     if (user.isPresent() && password.isPresent()) {
       getPublishingExtension().repositories(artifactRepositories ->
         artifactRepositories.maven(mavenArtifactRepository -> {
+          mavenArtifactRepository.setName("mavenCentral");
           mavenArtifactRepository.setUrl(url);
           mavenArtifactRepository.credentials(passwordCredentials -> {
             passwordCredentials.setUsername(user.get());
@@ -155,14 +157,21 @@ private void addJavaLibraryPublicationWhenApplied(PublicationContainer publicati
           mavenPom.getDescription().set(project.getDescription());
 
           // scm
-          String repoName = this.extension.repoName.get();
-          String scmConnection = String.format("scm:git:git://github.com/hypertrace/%s.git", repoName);
-          String scmDeveloperConnection = String.format("scm:git:ssh://github.com:hypertrace/%s.git", repoName);
-          String scmUrl = String.format("https://github.com/hypertrace/%s/tree/main", repoName);
+          Provider<String> qualifiedRepoProvider =
+              this.extension.scmOrganization.flatMap(
+                  repoName ->
+                      this.extension.repoName.map(
+                          orgName -> String.format("%s/%s", orgName, repoName)));
+          Provider<String> scmConnectionProvider =
+              qualifiedRepoProvider.map(qualifiedRepo -> String.format("scm:git:git://github.com/%s.git", qualifiedRepo));
+          Provider<String> scmDeveloperConnectionProvider =
+              qualifiedRepoProvider.map(qualifiedRepo -> String.format("scm:git:ssh://github.com:%s.git", qualifiedRepo));
+          Provider<String> scmUrlProvider =
+              qualifiedRepoProvider.map(qualifiedRepo ->  String.format("https://github.com/%s/tree/main", qualifiedRepo));
           mavenPom.scm(mavenPomScm -> {
-            mavenPomScm.getConnection().set(scmConnection);
-            mavenPomScm.getDeveloperConnection().set(scmDeveloperConnection);
-            mavenPomScm.getUrl().set(scmUrl);
+            mavenPomScm.getConnection().set(scmConnectionProvider);
+            mavenPomScm.getDeveloperConnection().set(scmDeveloperConnectionProvider);
+            mavenPomScm.getUrl().set(scmUrlProvider);
           });
 
           // developers