simpler publishing

Author: hauner

build.gradle

@@ -3,8 +3,6 @@ plugins {
     id 'groovy'
     id 'java-library'
     id 'maven-publish'
-    id 'com.jfrog.bintray' version '1.8.5'
-    id 'com.jfrog.artifactory' version '4.15.2'
     id 'org.jetbrains.dokka' version '0.10.1'
     id 'org.jetbrains.kotlin.jvm' version '1.3.72'
     id 'org.unbroken-dome.test-sets' version '3.0.1'
@@ -35,8 +33,25 @@ repositories {
     maven {
         url "https://oss.sonatype.org/content/repositories/snapshots"
     }
+
     maven {
         url "https://dl.bintray.com/openapi-processor/primary"
+        content {
+           includeGroup "io.openapiprocessor"
+        }
+        mavenContent {
+            releasesOnly()
+        }
+    }
+
+    maven {
+        url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
+        content {
+           includeGroup "io.openapiprocessor"
+        }
+        mavenContent {
+            snapshotsOnly()
+        }
     }
 }
 

gradle.properties

@@ -6,3 +6,5 @@ projectTitle=openapi-processor
 projectDesc=converts OpenAPI yaml descriptions to a target format, e.g. Java code (Spring) or json
 
 projectGithubRepo=openapi-processor/openapi-processor-core
+
+systemProp.org.gradle.internal.publish.checksums.insecure=true

gradle/publishing.gradle

@@ -1,81 +1,53 @@
-def pomConfig = {
-    licenses {
-        license {
-            name 'The Apache Software License, Version 2.0'
-            url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-            distribution "repo"
-        }
-    }
-    developers {
-        developer {
-            id 'hauner'
-            name 'Martin Hauner'
-        }
-    }
-
-    scm {
-       url "https://github.com/${project.projectGithubRepo}".toString ()
-    }
-}
-
 publishing {
     publications {
-        projectArtifacts (MavenPublication) {
-            from components.java
-            artifact sourcesJar
-            artifact javadocJar
-
+        OpenApiProcessor (MavenPublication) {
             groupId project.group
             artifactId project.name
             version project.version
 
-            pom.withXml {
-                def root = asNode()
-                root.appendNode('name', project.projectTitle)
-                root.appendNode('description', project.projectDesc)
-                root.appendNode('url', project.projectUrl)
-                root.children().last() + pomConfig
-            }
-        }
-    }
-}
+            from components.java
+            artifact sourcesJar
+            artifact javadocJar
 
+            pom {
+                name = project.projectTitle
+                description = "${project.projectTitle} - ${project.projectDesc} - ${project.name} module".toString()
+                url = project.projectUrl
+
+                licenses {
+                    license {
+                        name = 'The Apache Software License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                        distribution = "repo"
+                    }
+                }
+
+                developers {
+                    developer {
+                        id = 'hauner'
+                        name  = 'Martin Hauner'
+                    }
+                }
+
+                scm {
+                   url = "https://github.com/${project.projectGithubRepo}".toString ()
+                }
+            }
 
-artifactory {
-    contextUrl = 'https://oss.jfrog.org'
-    publish {
-        repository {
-            repoKey = 'oss-snapshot-local'
-            username = bintrayUser
-            password = bintrayKey
-        }
-        defaults {
-            publications('projectArtifacts')
-            publishArtifacts = true
-            publishPom = true
         }
     }
-    resolve {
-        repoKey = 'jcenter'
-    }
-}
 
+    repositories {
 
-bintray {
-    user = bintrayUser
-    key = bintrayKey
-    publications = ['projectArtifacts']
+        maven {
+            def releaseRepository = uri("https://api.bintray.com/maven/openapi-processor/primary/${project.name}/;publish=1;override=0")
+            def snapshotRepository = uri("https://oss.jfrog.org/oss-snapshot-local/")
+            url = version.endsWith('SNAPSHOT') ? snapshotRepository : releaseRepository
 
-    pkg {
-        repo = 'primary'
-        name = project.name
-        userOrg = 'openapi-processor'
-        licenses = ['Apache-2.0']
-        vcsUrl = "https://github.com/${project.projectGithubRepo}".toString ()
-        websiteUrl = projectUrl
-        desc = "${project.projectTitle} - ${project.projectDesc} - ${project.name} module".toString()
-        version {
-            name = project.version
+            credentials {
+                username = bintrayUser
+                password = bintrayKey
+            }
         }
     }
 }