Skip to content

Commit 4df5643

Browse files
committed
publish to oss.sonatype.org
1 parent 63d0225 commit 4df5643

2 files changed

Lines changed: 34 additions & 30 deletions

File tree

build.gradle

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
id 'groovy'
66
id 'java-library'
77
id 'maven-publish'
8+
id 'signing'
89
id "org.sonarqube" version "3.0"
910
id 'org.jetbrains.dokka' version '1.4.20'
1011
id 'org.jetbrains.kotlin.jvm' version '1.4.20'
@@ -20,15 +21,23 @@ java {
2021
targetCompatibility = JavaVersion.VERSION_1_8
2122
}
2223

24+
String getBuildProperty(String property) {
25+
project.findProperty (property) ?: System.getenv (property) ?: 'n/a'
26+
}
2327

2428
ext {
2529
processorApiVersion = '2021.1'
2630
processorCoreVersion = '2021.1-SNAPSHOT'
2731
processorTestVersion = '2021.1'
2832
jacksonVersion = '2.12.0'
2933

30-
bintrayUser = project.findProperty ('BINTRAY_USER') ?: System.getenv ("BINTRAY_USER") ?: 'n/a'
31-
bintrayKey = project.findProperty ('BINTRAY_KEY') ?: System.getenv ("BINTRAY_KEY") ?: 'n/a'
34+
publishUser = getBuildProperty ('PUBLISH_USER')
35+
publishKey = getBuildProperty ('PUBLISH_KEY')
36+
37+
signKey = getBuildProperty ('SIGN_KEY')
38+
signPwd = getBuildProperty ('SIGN_PWD')
39+
40+
isReleaseVersion = !version.endsWith("SNAPSHOT")
3241
}
3342

3443

@@ -38,26 +47,6 @@ repositories {
3847
maven {
3948
url "https://oss.sonatype.org/content/repositories/snapshots"
4049
}
41-
42-
maven {
43-
url "https://dl.bintray.com/openapi-processor/primary"
44-
content {
45-
includeGroup "io.openapiprocessor"
46-
}
47-
mavenContent {
48-
releasesOnly()
49-
}
50-
}
51-
52-
maven {
53-
url "https://oss.jfrog.org/artifactory/oss-snapshot-local"
54-
content {
55-
includeGroup "io.openapiprocessor"
56-
}
57-
mavenContent {
58-
snapshotsOnly()
59-
}
60-
}
6150
}
6251

6352
sourceSets {

gradle/publishing.gradle

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// does not work on oss.sonatype.org
2+
tasks.withType(GenerateModuleMetadata) {
3+
enabled = false
4+
}
5+
16
publishing {
27
publications {
38
OpenApiProcessor (MavenPublication) {
@@ -11,8 +16,7 @@ publishing {
1116

1217
pom {
1318
name = project.projectTitle
14-
// description = project.projectDesc
15-
description = "${project.projectTitle} - ${project.projectDesc} - ${project.name} module".toString()
19+
description = project.projectDesc
1620
url = project.projectUrl
1721

1822
licenses {
@@ -39,16 +43,27 @@ publishing {
3943
}
4044

4145
repositories {
42-
4346
maven {
44-
def releaseRepository = uri("https://api.bintray.com/maven/openapi-processor/primary/${project.name}/;publish=1;override=0")
45-
def snapshotRepository = uri("https://oss.jfrog.org/oss-snapshot-local/")
46-
url = version.endsWith('SNAPSHOT') ? snapshotRepository : releaseRepository
47+
def releaseRepository = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
48+
def snapshotRepository = uri("https://oss.sonatype.org/content/repositories/snapshots")
49+
url = project.isReleaseVersion ? releaseRepository : snapshotRepository
4750

4851
credentials {
49-
username = bintrayUser
50-
password = bintrayKey
52+
username = publishUser
53+
password = publishKey
5154
}
5255
}
5356
}
5457
}
58+
59+
tasks.withType(Sign) {
60+
onlyIf { project.isReleaseVersion }
61+
}
62+
63+
signing {
64+
useInMemoryPgpKeys(signKey, signPwd)
65+
66+
signing {
67+
sign publishing.publications.OpenApiProcessor
68+
}
69+
}

0 commit comments

Comments
 (0)