Skip to content

Commit 6e02df3

Browse files
committed
[#1956] Rename properties with OSSRH credentials
We want to be consistent with ORM
1 parent 06db25b commit 6e02df3

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ group = "org.hibernate.reactive"
1313
version = project.projectVersion.fullName
1414

1515
ext {
16-
if ( !project.hasProperty( 'sonatypeOssrhUser' ) ) {
17-
sonatypeOssrhUser = null
16+
if ( !project.hasProperty( 'hibernatePublishUsername' ) ) {
17+
hibernatePublishUsername = null
1818
}
19-
if ( !project.hasProperty( 'sonatypeOssrhPassword' ) ) {
20-
sonatypeOssrhPassword = null
19+
if ( !project.hasProperty( 'hibernatePublishPassword' ) ) {
20+
hibernatePublishPassword = null
2121
}
2222
}
2323

@@ -41,12 +41,12 @@ ext {
4141

4242
// To release, see task ciRelease in release/build.gradle
4343
// To publish on Sonatype (Maven Central):
44-
// ./gradlew publishToSonatype closeAndReleaseStagingRepository -PsonatypeOssrhUser="<YOUR USERNAME>" -PsonatypeOssrhPassword="<YOUR PASSWORD>"
44+
// ./gradlew publishToSonatype closeAndReleaseStagingRepository -PhibernatePublishUsername="<YOUR USERNAME>" -PhibernatePublishPassword="<YOUR PASSWORD>"
4545
nexusPublishing {
4646
repositories {
4747
sonatype {
48-
username = project.sonatypeOssrhUser
49-
password = project.sonatypeOssrhPassword
48+
username = project.hibernatePublishUsername
49+
password = project.hibernatePublishPassword
5050
}
5151
}
5252
}

ci/snapshot-publish.Jenkinsfile

-5
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,13 @@ pipeline {
3232
steps {
3333
withCredentials([
3434
usernamePassword(credentialsId: 'ossrh.sonatype.org', usernameVariable: 'hibernatePublishUsername', passwordVariable: 'hibernatePublishPassword'),
35-
usernamePassword(credentialsId: 'plugins.gradle.org', usernameVariable: 'hibernatePluginPortalUsername', passwordVariable: 'hibernatePluginPortalPassword'),
3635
string(credentialsId: 'release.gpg.passphrase', variable: 'SIGNING_PASS'),
3736
file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_KEYRING')
3837
]) {
3938
sh '''./gradlew clean publish \
4039
-PhibernatePublishUsername=$hibernatePublishUsername \
4140
-PhibernatePublishPassword=$hibernatePublishPassword \
42-
-Pgradle.publish.key=$hibernatePluginPortalUsername \
43-
-Pgradle.publish.secret=$hibernatePluginPortalPassword \
4441
--no-scan \
45-
-DsigningPassword=$SIGNING_PASS \
46-
-DsigningKeyFile=$SIGNING_KEYRING \
4742
'''
4843
}
4944
}

0 commit comments

Comments
 (0)