Skip to content

Commit 6cc86b1

Browse files
marko-bekhtaDavideD
marko-bekhta
authored and
DavideD
committed
[#2222] Add a simple JReleaser configuration
1 parent 4782948 commit 6cc86b1

File tree

8 files changed

+114
-121
lines changed

8 files changed

+114
-121
lines changed

‎.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,3 @@ bin
4343
# Vim
4444
*.swp
4545
*.swo
46-
47-
# Release scripts downloaded from hibernate/hibernate-release-scripts
48-
.release

‎.release/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# The folder into which we checkout our release scripts into
2+
*
3+
!.gitignore

‎build.gradle

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,6 @@ ext {
3030
logger.lifecycle "Vert.x SQL Client Version: " + project.vertxSqlClientVersion
3131
}
3232

33-
// Publishing to Sonatype (Maven Central):
34-
nexusPublishing {
35-
repositories {
36-
sonatype()
37-
}
38-
}
39-
4033
subprojects {
4134
apply plugin: 'java-library'
4235
apply plugin: 'com.diffplug.spotless'

‎ci/release/Jenkinsfile

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,10 @@ pipeline {
119119
echo "Release was triggered automatically"
120120

121121
// Avoid doing an automatic release for commits from a release
122-
def lastCommitter = sh(script: 'git show -s --format=\'%an\'', returnStdout: true)
123-
def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true)
122+
def lastCommitter = sh(script: 'git show -s --format=\'%an\'', returnStdout: true).trim()
123+
def secondLastCommitter = sh(script: 'git show -s --format=\'%an\' HEAD~1', returnStdout: true).trim()
124+
echo "Last two commits were performed by '${lastCommitter}'/'${secondLastCommitter}'."
125+
124126
if (lastCommitter == 'Hibernate-CI' && secondLastCommitter == 'Hibernate-CI') {
125127
print "INFO: Automatic release skipped because last commits were for the previous release"
126128
currentBuild.result = 'ABORTED'
@@ -149,6 +151,7 @@ pipeline {
149151
env.DEVELOPMENT_VERSION = developmentVersion.toString()
150152
// Dry run is not supported at the moment
151153
env.SCRIPT_OPTIONS = params.RELEASE_DRY_RUN ? "-d" : ""
154+
env.JRELEASER_DRY_RUN = true
152155

153156
// Determine version id to check if Jira version exists
154157
// This step doesn't work for Hibernate Reactive (the project has been created with a different type on JIRA)
@@ -172,11 +175,10 @@ pipeline {
172175
// tags the version
173176
// changes the version to the provided development version
174177
withEnv([
175-
"BRANCH=${env.GIT_BRANCH}",
176178
// Increase the amount of memory for this part since asciidoctor doc rendering consumes a lot of metaspace
177179
"GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'"
178180
]) {
179-
sh ".release/scripts/prepare-release.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION}"
181+
sh ".release/scripts/prepare-release.sh -b ${env.GIT_BRANCH} -d ${env.DEVELOPMENT_VERSION} ${env.PROJECT} ${env.RELEASE_VERSION}"
180182
}
181183
}
182184
}
@@ -193,11 +195,17 @@ pipeline {
193195
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: "${env.HOME}/.ssh/known_hosts")
194196
]) {
195197
withCredentials([
196-
// https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
197-
usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'ORG_GRADLE_PROJECT_sonatypePassword', usernameVariable: 'ORG_GRADLE_PROJECT_sonatypeUsername'),
198-
file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_GPG_PRIVATE_KEY_PATH'),
199-
string(credentialsId: 'release.gpg.passphrase', variable: 'SIGNING_GPG_PASSPHRASE'),
200-
gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default')
198+
// TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
199+
// to use the following env variable names to set the user/password:
200+
// - JRELEASER_MAVENCENTRAL_USERNAME
201+
// - JRELEASER_MAVENCENTRAL_TOKEN
202+
// Also use the new `credentialsId` for Maven Central, e.g.:
203+
// usernamePassword(credentialsId: '???????', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
204+
usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
205+
gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default'),
206+
file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
207+
string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
208+
string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')
201209
]) {
202210
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
203211
// performs documentation upload and Sonatype release
@@ -217,4 +225,4 @@ pipeline {
217225
}
218226
}
219227
}
220-
}
228+
}

‎ci/snapshot-publish.Jenkinsfile

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ if (currentBuild.getBuildCauses().toString().contains('BranchIndexingCause')) {
1010
return
1111
}
1212

13+
def checkoutReleaseScripts() {
14+
dir('.release/scripts') {
15+
checkout scmGit(branches: [[name: '*/main']], extensions: [],
16+
userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com',
17+
url: 'https://github.com/hibernate/hibernate-release-scripts.git']])
18+
}
19+
}
20+
1321
pipeline {
1422
agent {
1523
label 'Release'
@@ -30,13 +38,27 @@ pipeline {
3038
}
3139
stage('Publish') {
3240
steps {
33-
withCredentials([
34-
// https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
35-
usernamePassword(credentialsId: 'ossrh.sonatype.org', usernameVariable: 'ORG_GRADLE_PROJECT_sonatypeUsername', passwordVariable: 'ORG_GRADLE_PROJECT_sonatypePassword'),
36-
file(credentialsId: 'release.gpg.private-key', variable: 'SIGNING_GPG_PRIVATE_KEY_PATH'),
37-
string(credentialsId: 'release.gpg.passphrase', variable: 'SIGNING_GPG_PASSPHRASE')
38-
]) {
39-
sh "./gradlew clean publish --no-scan"
41+
script {
42+
withCredentials([
43+
// https://github.com/gradle-nexus/publish-plugin#publishing-to-maven-central-via-sonatype-ossrh
44+
// TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
45+
// to use the following env variable names to set the user/password:
46+
// - JRELEASER_MAVENCENTRAL_USERNAME
47+
// - JRELEASER_MAVENCENTRAL_TOKEN
48+
// Also use the new `credentialsId` for Maven Central, e.g.:
49+
// usernamePassword(credentialsId: '???????', passwordVariable: 'JRELEASER_MAVENCENTRAL_TOKEN', usernameVariable: 'JRELEASER_MAVENCENTRAL_USERNAME'),
50+
usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
51+
gitUsernamePassword(credentialsId: 'username-and-token.Hibernate-CI.github.com', gitToolName: 'Default'),
52+
string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')
53+
]) {
54+
checkoutReleaseScripts()
55+
def version = sh(
56+
script: ".release/scripts/determine-current-version.sh orm",
57+
returnStdout: true
58+
).trim()
59+
echo "Current version: '${version}'"
60+
sh "bash -xe .release/scripts/snapshot-deploy.sh reactive ${version}"
61+
}
4062
}
4163
}
4264
}
@@ -48,4 +70,4 @@ pipeline {
4870
}
4971
}
5072
}
51-
}
73+
}

‎jreleaser.yml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
project:
2+
languages:
3+
java:
4+
groupId: org.hibernate.reactive
5+
6+
release:
7+
github:
8+
skipTag: true
9+
skipRelease: true
10+
tagName: '{{projectVersion}}'
11+
12+
# File signing is always active
13+
signing:
14+
mode: COMMAND
15+
active: RELEASE
16+
armored: true
17+
18+
deploy:
19+
maven:
20+
# TODO: Remove the entire nexus2 section when switching to maven central publishing (see below):
21+
nexus2:
22+
maven-central:
23+
active: RELEASE
24+
url: https://oss.sonatype.org/service/local
25+
snapshotUrl: https://oss.sonatype.org/content/repositories/snapshots/
26+
closeRepository: true
27+
releaseRepository: false
28+
stagingRepositories:
29+
- build/staging-deploy/maven
30+
maven-central-snapshot:
31+
active: SNAPSHOT
32+
url: https://oss.sonatype.org/service/local
33+
snapshotUrl: https://oss.sonatype.org/content/repositories/snapshots/
34+
closeRepository: true
35+
releaseRepository: true
36+
javadocJar: false
37+
sign: false
38+
stagingRepositories:
39+
- build/staging-deploy/maven
40+
mavenCentral:
41+
maven-central:
42+
# TODO: Change to RELEASE once switching to Maven-Central:
43+
# Note, this is an untested configuration, hence might need further adjustments
44+
active: NEVER
45+
url: https://central.sonatype.com/api/v1/publisher
46+
snapshotSupported: false
47+
applyMavenCentralRules: true
48+
stagingRepositories:
49+
- build/staging-deploy/maven
50+
maven-central-snapshot:
51+
# TODO: Change to SNAPSHOT once switching to Maven-Central:
52+
active: NEVER
53+
url: https://central.sonatype.com/api/v1/publisher
54+
snapshotSupported: true
55+
applyMavenCentralRules: true
56+
javadocJar: false
57+
sign: false
58+
stagingRepositories:
59+
- build/staging-deploy/maven

‎publish.gradle

Lines changed: 4 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'java'
22
apply plugin: 'maven-publish'
3-
apply plugin: 'signing'
43

54
// Java / publishing
65

@@ -75,97 +74,10 @@ publishing {
7574
}
7675
}
7776
}
78-
}
79-
80-
81-
// Signing
82-
83-
var signingExtension = project.getExtensions().getByType(SigningExtension) as SigningExtension
84-
85-
var publishingExtension = project.getExtensions().getByType(PublishingExtension) as PublishingExtension
86-
signingExtension.sign publishingExtension.publications.publishedArtifacts
87-
88-
var signingKey = resolveSigningKey()
89-
var signingPassphrase = resolveSigningPassphrase()
90-
signingExtension.useInMemoryPgpKeys(signingKey, signingPassphrase)
91-
92-
gradle.taskGraph.whenReady { TaskExecutionGraph graph ->
93-
boolean wasPublishingRequested = false
94-
95-
graph.allTasks.each {task ->
96-
if ( task instanceof PublishToMavenRepository ) {
97-
logger.lifecycle( "Found PublishToMavenRepository task : {}", task.path )
98-
wasPublishingRequested = true
77+
repositories {
78+
maven {
79+
name = "staging"
80+
url = rootProject.layout.buildDirectory.dir("staging-deploy${File.separator}maven")
9981
}
10082
}
101-
102-
if ( wasPublishingRequested ) {
103-
def publishUser = resolvePublishUser()
104-
def publishPass = resolvePublishPass()
105-
if ( publishUser == null || publishPass == null ) {
106-
throw new RuntimeException( "Cannot perform publishing to OSSRH without credentials." )
107-
}
108-
109-
logger.lifecycle "Publishing {} : {} : {}", project.group, project.name, project.version
110-
111-
// require signing if publishing to OSSRH
112-
signingExtension.required = true
113-
}
114-
else if ( signingKey == null || signingPassphrase == null ) {
115-
tasks.withType( Sign ).each { t-> t.enabled = false }
116-
}
11783
}
118-
119-
120-
static String resolveSigningKey() {
121-
var key = System.getenv().get( "SIGNING_GPG_PRIVATE_KEY" )
122-
if ( key != null ) {
123-
return key
124-
}
125-
126-
var keyFile = System.getenv().get( "SIGNING_GPG_PRIVATE_KEY_PATH" )
127-
if ( keyFile != null ) {
128-
return new File( keyFile ).text
129-
}
130-
131-
return null
132-
}
133-
134-
static String resolveSigningPassphrase() {
135-
return System.getenv().get( "SIGNING_GPG_PASSPHRASE" )
136-
}
137-
138-
String resolvePublishUser() {
139-
var envVar = System.getenv().get( "ORG_GRADLE_PROJECT_sonatypeUsername" )
140-
if ( envVar != null ) {
141-
return envVar
142-
}
143-
144-
def projectProp = projectPropOrNull( "sonatypeUsername" )
145-
if ( projectProp != null ) {
146-
return projectProp
147-
}
148-
149-
return null
150-
}
151-
152-
String resolvePublishPass() {
153-
var envVar = System.getenv().get( "ORG_GRADLE_PROJECT_sonatypePassword" )
154-
if ( envVar != null ) {
155-
return envVar
156-
}
157-
158-
def projectProp = projectPropOrNull( "sonatypePassword" )
159-
if ( projectProp != null ) {
160-
return projectProp
161-
}
162-
163-
return null
164-
}
165-
166-
String projectPropOrNull(String name) {
167-
if ( project.hasProperty( name ) ) {
168-
return project.findProperty( name )
169-
}
170-
return null;
171-
}

‎release/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ void updateVersionFile(var version) {
236236

237237
def publishReleaseArtifactsTask = tasks.register( 'publishReleaseArtifacts' ) {
238238
dependsOn uploadDocumentationTask
239-
dependsOn ":hibernate-reactive-core:publishToSonatype"
240239

241240
mustRunAfter gitPreparationForReleaseTask
242241
}

0 commit comments

Comments
 (0)