From 019b83b4bb7f778950b0b99274b20b3055ae49ee Mon Sep 17 00:00:00 2001 From: Jason Han Date: Tue, 16 Feb 2021 21:03:51 -0800 Subject: [PATCH 1/2] Update to use maven-publish --- build.gradle | 116 +++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 68 deletions(-) diff --git a/build.gradle b/build.gradle index 580eba809..f42fbfa20 100644 --- a/build.gradle +++ b/build.gradle @@ -65,18 +65,16 @@ subprojects { apply plugin: 'io.spring.dependency-management' apply plugin: "com.jfrog.artifactory" apply plugin: 'com.jfrog.bintray' - apply plugin: 'maven' apply plugin: 'signing' group = "org.openmbee.mms" - archivesBaseName = project.name version = rootProject.version Map commonDependencies = rootProject.ext.commonDependencies task javadocJar(type: Jar) { archiveClassifier = "javadoc" - from javadoc + from javadoc.destinationDir } task sourcesJar(type: Jar) { @@ -96,32 +94,68 @@ subprojects { } artifacts { - archives javadocJar, sourcesJar - } - - signing { - if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) { - sign configurations.archives - } + archives jar, javadocJar, sourcesJar } //https://docs.gradle.org/current/userguide/publishing_maven.html publishing { publications { mavenJava(MavenPublication) { - from components.java + from project.components.java + pom { + name = project.name + description = project.description + url = 'http://github.com/OpenMBEE/mms' + licenses { + license { + name = 'The Apache License, Version 2.0' + url = 'http://www.apache.org/licenses/LICENSE-2.0.txt' + } + } + developers { + developer { + id = 'huijun' + name = 'Jason Han' + } + developer { + id = 'dlam' + name = 'Doris Lam' + } + developer { + id = 'ward' + name = 'Ward Schweitzer' + } + } + scm { + connection = 'scm:git:https://github.com/Open-MBEE/mms.git' + developerConnection = 'scm:git:https://github.com/Open-MBEE/mms.git' + url = 'https://github.com/Open-MBEE/mms.git' + } + } } } repositories { maven { - def releasesRepoUrl = "$buildDir/repos/releases" - def snapshotsRepoUrl = "$buildDir/repos/snapshots" + def releasesRepoUrl = "https://oss.sonatype.org/service/local/staging/deploy/maven2/" + def snapshotsRepoUrl = "https://oss.sonatype.org/content/repositories/snapshots/" url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl + if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) { + credentials { + username = ossrhUsername + password = ossrhPassword + } + } } } } + signing { + if (project.hasProperty('signing.keyId') && project.hasProperty('signing.password') && project.hasProperty('signing.secretKeyRingFile')) { + sign publishing.publications.mavenJava + } + } + //https://www.jfrog.com/confluence/display/JFROG/Gradle+Artifactory+Plugin //can use this or set artifactory info directly under publishing/repositories? artifactory { @@ -157,61 +191,7 @@ subprojects { vcsUrl = 'https://github.com/Open-MBEE/mms.git' } } - - uploadArchives { - repositories { - if (project.hasProperty('ossrhUsername') && project.hasProperty('ossrhPassword')) { - mavenDeployer { - beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } - - repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") { - authentication(userName: ossrhUsername, password: ossrhPassword) - } - - pom.project { - name project.name - packaging 'jar' - // optionally artifactId can be defined here - description project.description - url 'http://github.com/OpenMBEE/mms' - - scm { - connection 'scm:git:https://github.com/Open-MBEE/mms.git' - developerConnection 'scm:git:https://github.com/Open-MBEE/mms.git' - url 'https://github.com/Open-MBEE/mms.git' - } - - licenses { - license { - name 'The Apache License, Version 2.0' - url 'http://www.apache.org/licenses/LICENSE-2.0.txt' - } - } - - developers { - developer { - id 'huijun' - name 'Jason Han' - } - developer { - id 'dlam' - name 'Doris Lam' - } - developer { - id 'ward' - name 'Ward Schweitzer' - } - } - } - } - } - } - } } project('example') { - uploadArchives.enabled = false + publishing.publications.remove(publishing.publications.mavenJava) } \ No newline at end of file From 49908160e37b3e6368471086017e8c9a93bf0f40 Mon Sep 17 00:00:00 2001 From: Jason Han Date: Wed, 17 Feb 2021 07:48:55 -0800 Subject: [PATCH 2/2] Fix description and move signing config --- build.gradle | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index f42fbfa20..2742a3896 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ subprojects { from project.components.java pom { name = project.name - description = project.description + description = project.name + ', a module of the MMS' url = 'http://github.com/OpenMBEE/mms' licenses { license { @@ -191,7 +191,4 @@ subprojects { vcsUrl = 'https://github.com/Open-MBEE/mms.git' } } -} -project('example') { - publishing.publications.remove(publishing.publications.mavenJava) } \ No newline at end of file