From ea915e98fa407539c648bb61dbec219baa4b3298 Mon Sep 17 00:00:00 2001 From: Ben Hale Date: Wed, 9 May 2018 15:24:04 -0700 Subject: [PATCH] Upload to Bintray and Maven Central Previously, an update to the build system took a stab at uploading releases to Bintray and them promoting them to Maven Central. Unsurprisingly, without a release to test against, this didn't work on the first try. The first change required a move of the bintray configuration from the top-level project to each subproject that would be published. Unlike before, this is now a subset of projects excluding things like the integration tests. Second, this change finishes improvements to the Maven POM in order to meet the Maven Central requirements for publication. Specifically three developers were added to the POMs in order for Sonatype to reach them if necessary. --- bintray.gradle | 69 ++++++++++++++++++++++++-------------------------- build.gradle | 18 +++++++++++++ 2 files changed, 51 insertions(+), 36 deletions(-) diff --git a/bintray.gradle b/bintray.gradle index c0eb437f1..fd3207af7 100644 --- a/bintray.gradle +++ b/bintray.gradle @@ -17,45 +17,42 @@ if (project.hasProperty('bintrayUser') && project.hasProperty('bintrayKey') && project.hasProperty('sonatypeUsername') && project.hasProperty('sonatypePassword')) { - bintray { - user = project.property('bintrayUser') - key = project.property('bintrayKey') - - publish = true - - pkg { - repo = 'RSocket' - name = 'rsocket-java' - licenses = ['Apache-2.0'] - - issueTrackerUrl = 'https://github.com/rsocket/rsocket-java/issues' - websiteUrl = 'https://github.com/rsocket/rsocket-java' - vcsUrl = 'https://github.com/rsocket/rsocket-java.git' - - githubRepo = 'rsocket/rsocket-java' //Optional Github repository - githubReleaseNotesFile = 'README.md' //Optional Github readme file - - version { - name = project.version - released = new Date() - vcsTag = project.version - - gpg { - sign = true - } - - mavenCentralSync { - user = project.property('sonatypeUsername') - password = project.property('sonatypePassword') - } - } - } - } - subprojects { plugins.withId('com.jfrog.bintray') { bintray { - publications('maven') + user = project.property('bintrayUser') + key = project.property('bintrayKey') + + publications = ['maven'] + publish = true + + pkg { + repo = 'RSocket' + name = 'rsocket-java' + licenses = ['Apache-2.0'] + + issueTrackerUrl = 'https://github.com/rsocket/rsocket-java/issues' + websiteUrl = 'https://github.com/rsocket/rsocket-java' + vcsUrl = 'https://github.com/rsocket/rsocket-java.git' + + githubRepo = 'rsocket/rsocket-java' //Optional Github repository + githubReleaseNotesFile = 'README.md' //Optional Github readme file + + version { + name = project.version + released = new Date() + vcsTag = project.version + + gpg { + sign = true + } + + mavenCentralSync { + user = project.property('sonatypeUsername') + password = project.property('sonatypePassword') + } + } + } } } } diff --git a/build.gradle b/build.gradle index f4d107593..036b06744 100644 --- a/build.gradle +++ b/build.gradle @@ -130,6 +130,24 @@ subprojects { } } + developers { + developer { + id 'robertroeser' + name 'Robert Roeser' + email 'robert@netifi.com' + } + developer { + id 'rdegnan' + name 'Ryland Degnan' + email 'ryland@netifi.com' + } + developer { + id 'yschimke' + name 'Yuri Schimke' + email 'yuri@schimke.ee' + } + } + scm { connection 'scm:git:https://github.com/rsocket/rsocket-java.git' developerConnection 'scm:git:https://github.com/rsocket/rsocket-java.git'