From 6266241e7b8707fed79017d70cc4ce78fb9c70bb Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@gmail.com>
Date: Sat, 24 Apr 2021 22:29:48 +0200
Subject: [PATCH] [publishing] set packaging to 'pom' when project has the
 java-platform plugin. Fixes #468

---
 .../base/model/DefaultPomOptions.groovy       | 136 ------------------
 .../plugin/publishing/PublishingPlugin.groovy |   4 +
 2 files changed, 4 insertions(+), 136 deletions(-)
 delete mode 100644 plugins/base-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/base/model/DefaultPomOptions.groovy

diff --git a/plugins/base-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/base/model/DefaultPomOptions.groovy b/plugins/base-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/base/model/DefaultPomOptions.groovy
deleted file mode 100644
index 779cf6a67..000000000
--- a/plugins/base-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/base/model/DefaultPomOptions.groovy
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * SPDX-License-Identifier: Apache-2.0
- *
- * Copyright 2018-2021 Andres Almiray.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.kordamp.gradle.plugin.base.model
-
-import groovy.transform.CompileStatic
-import org.kordamp.gradle.util.CollectionUtils
-
-import static org.kordamp.gradle.util.StringUtils.isNotBlank
-
-/**
- * @author Andres Almiray
- * @since 0.13.0
- */
-@CompileStatic
-class DefaultPomOptions implements PomOptions {
-    String packaging
-    Map<String, String> properties = new LinkedHashMap<>()
-
-    String parent
-    boolean overwriteInceptionYear
-    boolean overwriteUrl
-    boolean overwriteLicenses
-    boolean overwriteScm
-    boolean overwriteOrganization
-    boolean overwriteDevelopers
-    boolean overwriteContributors
-    boolean overwriteIssueManagement
-    boolean overwriteCiManagement
-    boolean overwriteMailingLists
-
-    private boolean overwriteInceptionYearSet
-    private boolean overwriteUrlSet
-    private boolean overwriteLicensesSet
-    private boolean overwriteScmSet
-    private boolean overwriteOrganizationSet
-    private boolean overwriteDevelopersSet
-    private boolean overwriteContributorsSet
-    private boolean overwriteIssueManagementSet
-    private boolean overwriteCiManagementSet
-    private boolean overwriteMailingListsSet
-
-    boolean isOverwriteInceptionYearSet() {
-        return overwriteInceptionYearSet
-    }
-
-    boolean isOverwriteUrlSet() {
-        return overwriteUrlSet
-    }
-
-    boolean isOverwriteLicensesSet() {
-        return overwriteLicensesSet
-    }
-
-    boolean isOverwriteScmSet() {
-        return overwriteScmSet
-    }
-
-    boolean isOverwriteOrganizationSet() {
-        return overwriteOrganizationSet
-    }
-
-    boolean isOverwriteDevelopersSet() {
-        return overwriteDevelopersSet
-    }
-
-    boolean isOverwriteContributorsSet() {
-        return overwriteContributorsSet
-    }
-
-    boolean isOverwriteIssueManagementSet() {
-        return overwriteIssueManagementSet
-    }
-
-    boolean isOverwriteCiManagementSet() {
-        return overwriteCiManagementSet
-    }
-
-    boolean isOverwriteMailingListsSet() {
-        return overwriteMailingListsSet
-    }
-
-    @Override
-    Map<String, Object> toMap() {
-        Map<String, Object> map = new LinkedHashMap<String, Object>(
-            packaging: packaging,
-            properties: properties)
-        if (isNotBlank(parent)) {
-            map.putAll([
-                parent                  : parent,
-                overwriteInceptionYear  : overwriteInceptionYear,
-                overwriteUrl            : overwriteUrl,
-                overwriteLicenses       : overwriteLicenses,
-                overwriteScm            : overwriteScm,
-                overwriteOrganization   : overwriteOrganization,
-                overwriteDevelopers     : overwriteDevelopers,
-                overwriteContributors   : overwriteContributors,
-                overwriteIssueManagement: overwriteIssueManagementSet,
-                overwriteCiManagement   : overwriteCiManagementSet,
-                overwriteMailingLists   : overwriteMailingListsSet
-            ])
-        }
-
-        map
-    }
-
-    static void merge(DefaultPomOptions o1, DefaultPomOptions o2) {
-        o1.packaging = (o1.packaging ?: o2.packaging) ?: 'jar'
-        o1.properties = CollectionUtils.merge(o1.properties, o2.properties, false)
-        o1.parent = o1.parent ?: o2.parent
-        o1.setOverwriteInceptionYear((boolean) (o1.overwriteInceptionYearSet ? o1.overwriteInceptionYear : o2.overwriteInceptionYear))
-        o1.setOverwriteUrl((boolean) (o1.overwriteUrlSet ? o1.overwriteUrl : o2.overwriteUrl))
-        o1.setOverwriteLicenses((boolean) (o1.overwriteLicensesSet ? o1.overwriteLicenses : o2.overwriteLicenses))
-        o1.setOverwriteScm((boolean) (o1.overwriteScmSet ? o1.overwriteScm : o2.overwriteScm))
-        o1.setOverwriteOrganization((boolean) (o1.overwriteOrganizationSet ? o1.overwriteOrganization : o2.overwriteOrganization))
-        o1.setOverwriteDevelopers((boolean) (o1.overwriteDevelopersSet ? o1.overwriteDevelopers : o2.overwriteDevelopers))
-        o1.setOverwriteContributors((boolean) (o1.overwriteContributorsSet ? o1.overwriteContributors : o2.overwriteContributors))
-        o1.setOverwriteIssueManagement((boolean) (o1.overwriteIssueManagementSet ? o1.overwriteIssueManagement : o2.overwriteIssueManagement))
-        o1.setOverwriteCiManagement((boolean) (o1.overwriteCiManagementSet ? o1.overwriteCiManagement : o2.overwriteCiManagement))
-        o1.setOverwriteMailingLists((boolean) (o1.overwriteMailingListsSet ? o1.overwriteMailingLists : o2.overwriteMailingLists))
-    }
-}
\ No newline at end of file
diff --git a/plugins/publishing-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/publishing/PublishingPlugin.groovy b/plugins/publishing-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/publishing/PublishingPlugin.groovy
index b5e9652c7..07e83570f 100644
--- a/plugins/publishing-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/publishing/PublishingPlugin.groovy
+++ b/plugins/publishing-gradle-plugin/src/main/groovy/org/kordamp/gradle/plugin/publishing/PublishingPlugin.groovy
@@ -167,6 +167,10 @@ class PublishingPlugin extends AbstractKordampPlugin {
             return
         }
 
+        if (project.pluginManager.hasPlugin('java-platform')) {
+            config.publishing.pom.packaging = 'pom'
+        }
+
         project.publishing {
             publications {
                 for (String pub : config.publishing.publications) {