Skip to content

Commit 05a270c

Browse files
marko-bekhtakoentsje
marko-bekhta
authored and
koentsje
committed
HBX-2992: Backport automated releases to branch 6.5
 - Use JReleaser to publish artifacts
1 parent bda3cae commit 05a270c

File tree

5 files changed

+110
-140
lines changed

5 files changed

+110
-140
lines changed

‎.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

‎ci/release/Jenkinsfile‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ pipeline {
7474

7575
def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION)
7676
def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION)
77+
env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN
7778
echo "Performing full release for version ${releaseVersion.toString()}"
7879

7980
withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven',
@@ -82,14 +83,21 @@ pipeline {
8283
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) {
8384
// using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin)
8485
withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
85-
string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE'),
86-
usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'GRADLE_PUBLISH_SECRET', usernameVariable: 'GRADLE_PUBLISH_KEY')]) {
86+
string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
87+
// TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
88+
// to use the following env variable names to set the user/password:
89+
// JRELEASER_MAVENCENTRAL_USERNAME
90+
// JRELEASER_MAVENCENTRAL_TOKEN
91+
usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
92+
usernamePassword(credentialsId: 'gradle-plugin-portal-api-key', passwordVariable: 'GRADLE_PUBLISH_SECRET', usernameVariable: 'GRADLE_PUBLISH_KEY'),
93+
string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) {
8794
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
8895
sh 'cat $HOME/.ssh/config'
89-
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'
90-
env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'
96+
dir('.release/scripts') {
97+
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
98+
}
9199
sh """
92-
bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \
100+
bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \
93101
tools ${releaseVersion.toString()} ${developmentVersion.toString()}
94102
"""
95103
}

‎gradle/plugin/build.gradle‎

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ plugins {
55
}
66

77
group = 'org.hibernate.tool'
8+
project.description = 'Gradle plugin to provide hibernate-tools reverse engineering and code/schema generation abilities.'
89

910
java {
1011
toolchain {
@@ -37,7 +38,7 @@ gradlePlugin {
3738
id = 'org.hibernate.tool.hibernate-tools-gradle'
3839
implementationClass = 'org.hibernate.tool.gradle.Plugin'
3940
displayName = 'Hibernate Tools Gradle Plugin'
40-
description = 'Gradle plugin to provide hibernate-tools reverse engineering and code/schema generation abilities.'
41+
description = project.description
4142
tags = ['hibernate','tools','reverse engineering','reveng','generation']
4243
}
4344
}
@@ -66,3 +67,68 @@ tasks.named('check') {
6667
tasks.named('test') {
6768
useJUnitPlatform()
6869
}
70+
71+
publishing {
72+
publications {
73+
pluginMaven(MavenPublication) {
74+
pom {
75+
name = project.name
76+
groupId = 'org.hibernate.tool'
77+
artifactId = project.name
78+
version = project.version
79+
80+
description = project.description
81+
url = 'https://hibernate.org/tools'
82+
83+
organization {
84+
name = 'Hibernate.org'
85+
url = 'https://hibernate.org'
86+
}
87+
88+
licenses {
89+
license {
90+
name = 'Apache License, version 2.0'
91+
url = 'https://www.apache.org/licenses/LICENSE-2.0'
92+
}
93+
}
94+
95+
scm {
96+
url = 'https://github.com/hibernate/hibernate-tools'
97+
connection = 'scm:git:https://github.com/hibernate/hibernate-tools.git'
98+
developerConnection = 'scm:git:[email protected]:hibernate/hibernate-tools.git'
99+
}
100+
101+
developers {
102+
developer {
103+
id = 'maxandersen'
104+
name = 'Max Andersen'
105+
email = '[email protected]'
106+
url = 'https://in.relation.to/Bloggers/Max'
107+
}
108+
developer {
109+
id = 'koentsje'
110+
name = 'Koen Aers'
111+
email = '[email protected]'
112+
url = 'https://koentsje.blogspot.be'
113+
}
114+
}
115+
116+
issueManagement {
117+
system = 'jira'
118+
url = 'https://hibernate.atlassian.net/browse/HBX'
119+
}
120+
}
121+
}
122+
}
123+
repositories {
124+
maven {
125+
name = "staging"
126+
var mavenPath = findProperty("mavenStagingDirectory")
127+
if (mavenPath == null) {
128+
url = rootProject.layout.buildDirectory.dir("staging-deploy${File.separator}maven")
129+
} else {
130+
url = URI.create(mavenPath).toURL()
131+
}
132+
}
133+
}
134+
}

‎gradle/pom.xml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,14 @@
5353

5454
<build>
5555
<plugins>
56+
<!-- Maven deploy is skipped on purpose as Gradle build will stage the artifact itself. -->
57+
<plugin>
58+
<groupId>org.apache.maven.plugins</groupId>
59+
<artifactId>maven-deploy-plugin</artifactId>
60+
<configuration>
61+
<skip>true</skip>
62+
</configuration>
63+
</plugin>
5664
<!-- execute Gradle command -->
5765
<plugin>
5866
<groupId>org.codehaus.mojo</groupId>
@@ -76,28 +84,6 @@
7684
</execution>
7785
</executions>
7886
</plugin>
79-
<!-- As the artifact is built by Gradle, we attach it with the helper plugin so that it gets published: -->
80-
<plugin>
81-
<groupId>org.codehaus.mojo</groupId>
82-
<artifactId>build-helper-maven-plugin</artifactId>
83-
<executions>
84-
<execution>
85-
<id>attach-artifacts</id>
86-
<phase>package</phase>
87-
<goals>
88-
<goal>attach-artifact</goal>
89-
</goals>
90-
<configuration>
91-
<artifacts>
92-
<artifact>
93-
<file>${project.basedir}/plugin/build/libs/${project.artifactId}-${project.version}.jar</file>
94-
<type>jar</type>
95-
</artifact>
96-
</artifacts>
97-
</configuration>
98-
</execution>
99-
</executions>
100-
</plugin>
10187
</plugins>
10288
</build>
10389

@@ -123,8 +109,10 @@
123109
<executable>${gradle.executable}</executable>
124110
<arguments>
125111
<argument>publishPlugins</argument>
112+
<argument>publishPluginMavenPublicationToStagingRepository</argument>
126113
<argument>-Pversion=${project.version}</argument>
127114
<argument>-Dmaven.repo.local=${settings.localRepository}</argument>
115+
<argument>-PmavenStagingDirectory=${local.staging.releases.repo.url}</argument>
128116
</arguments>
129117
</configuration>
130118
<goals>

‎pom.xml‎

Lines changed: 17 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,20 @@
104104

105105
<!-- Plugins not managed by the JBoss parent POM: -->
106106
<maven-wrapper-plugin.version>3.3.2</maven-wrapper-plugin.version>
107-
<nexus-staging.plugin.version>1.7.0</nexus-staging.plugin.version>
108-
<flatten-maven-plugin.version>1.5.0</flatten-maven-plugin.version>
107+
<flatten-maven-plugin.version>1.7.0</flatten-maven-plugin.version>
109108

110109
<!--
111110
We don't want to publish or sign any modules by default.
112111
Specific modules will override the setting at their own level.
113112
-->
114113
<deploy.skip>true</deploy.skip>
115-
<maven-deploy-plugin.skip>true</maven-deploy-plugin.skip>
116114

117115
<!-- Repository Deployment URLs -->
118-
<ossrh.releases.repo.id>ossrh</ossrh.releases.repo.id>
119-
<ossrh.releases.repo.name>Sonatype OSSRH Releases</ossrh.releases.repo.name>
120-
<ossrh.releases.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2</ossrh.releases.repo.url>
121-
<ossrh.releases.repo.baseUrl>https://oss.sonatype.org</ossrh.releases.repo.baseUrl>
116+
117+
<!-- We always publish to a local directory, JReleaser is supposed to take care of publishing to Nexus: -->
118+
<local.staging.releases.repo.id>staging-deploy</local.staging.releases.repo.id>
119+
<local.staging.releases.repo.name>Local Staging Directory Releases Repository</local.staging.releases.repo.name>
120+
<local.staging.releases.repo.url>file:${maven.multiModuleProjectDirectory}/target/staging-deploy/maven</local.staging.releases.repo.url>
122121
<ossrh.snapshots.repo.id>ossrh</ossrh.snapshots.repo.id>
123122
<ossrh.snapshots.repo.name>Sonatype OSSRH Snapshots</ossrh.snapshots.repo.name>
124123
<ossrh.snapshots.repo.url>https://oss.sonatype.org/content/repositories/snapshots</ossrh.snapshots.repo.url>
@@ -247,16 +246,16 @@
247246
</dependencyManagement>
248247

249248
<distributionManagement>
250-
<repository>
251-
<id>${ossrh.releases.repo.id}</id>
252-
<name>${ossrh.releases.repo.name}</name>
253-
<url>${ossrh.releases.repo.url}</url>
254-
</repository>
255-
<snapshotRepository>
256-
<id>${ossrh.snapshots.repo.id}</id>
257-
<name>${ossrh.snapshots.repo.name}</name>
258-
<url>${ossrh.snapshots.repo.url}</url>
259-
</snapshotRepository>
249+
<repository>
250+
<id>${local.staging.releases.repo.id}</id>
251+
<name>${local.staging.releases.repo.name}</name>
252+
<url>${local.staging.releases.repo.url}</url>
253+
</repository>
254+
<snapshotRepository>
255+
<id>${ossrh.snapshots.repo.id}</id>
256+
<name>${ossrh.snapshots.repo.name}</name>
257+
<url>${ossrh.snapshots.repo.url}</url>
258+
</snapshotRepository>
260259
</distributionManagement>
261260

262261
<build>
@@ -271,39 +270,6 @@
271270
<distributionType>bin</distributionType>
272271
</configuration>
273272
</plugin>
274-
<!-- Published artifacts have to be signed: -->
275-
<plugin>
276-
<groupId>org.apache.maven.plugins</groupId>
277-
<artifactId>maven-gpg-plugin</artifactId>
278-
<executions>
279-
<execution>
280-
<id>sign-artifacts</id>
281-
<phase>verify</phase>
282-
<goals>
283-
<goal>sign</goal>
284-
</goals>
285-
<configuration>
286-
<skip>${deploy.skip}</skip>
287-
<homedir>${env.RELEASE_GPG_HOMEDIR}</homedir>
288-
</configuration>
289-
</execution>
290-
</executions>
291-
</plugin>
292-
<plugin>
293-
<groupId>org.sonatype.plugins</groupId>
294-
<artifactId>nexus-staging-maven-plugin</artifactId>
295-
<version>${nexus-staging.plugin.version}</version>
296-
<extensions>false</extensions><!-- This is essential: do not put true here -->
297-
<configuration>
298-
<skipNexusStagingDeployMojo>${deploy.skip}</skipNexusStagingDeployMojo>
299-
<serverId>${ossrh.releases.repo.id}</serverId>
300-
<!-- The following, by default, is only used for actual releases, not for snapshot deployments -->
301-
<nexusUrl>${ossrh.releases.repo.baseUrl}</nexusUrl>
302-
<!-- oss.sonatype.org has been very slow when closing repositories lately;
303-
let's raise the timeout until we switch to s01.sonatype.org -->
304-
<stagingProgressTimeoutMinutes>60</stagingProgressTimeoutMinutes>
305-
</configuration>
306-
</plugin>
307273
<plugin>
308274
<groupId>org.codehaus.mojo</groupId>
309275
<artifactId>flatten-maven-plugin</artifactId>
@@ -334,30 +300,9 @@
334300
<groupId>org.apache.maven.plugins</groupId>
335301
<artifactId>maven-deploy-plugin</artifactId>
336302
<configuration>
337-
<skip>${maven-deploy-plugin.skip}</skip>
303+
<skip>${deploy.skip}</skip>
338304
</configuration>
339305
</plugin>
340-
<!--
341-
Configure the nexus-staging-maven-plugin explicitly (without <extension>true</extension>)
342-
in order to work around a problem in the "reports" module (see that module's POM for more info).
343-
-->
344-
<plugin>
345-
<groupId>org.sonatype.plugins</groupId>
346-
<artifactId>nexus-staging-maven-plugin</artifactId>
347-
<executions>
348-
<execution>
349-
<id>default-deploy</id>
350-
<phase>deploy</phase>
351-
<goals>
352-
<!--
353-
This will only put artifacts in a staging directory.
354-
See the "reports" module for actual deployment, at the end of the build.
355-
-->
356-
<goal>deploy</goal>
357-
</goals>
358-
</execution>
359-
</executions>
360-
</plugin>
361306
<plugin>
362307
<groupId>org.codehaus.mojo</groupId>
363308
<artifactId>flatten-maven-plugin</artifactId>
@@ -388,44 +333,4 @@
388333
</plugins>
389334
</build>
390335

391-
<profiles>
392-
<profile>
393-
<id>release</id>
394-
<activation>
395-
<property>
396-
<name>performRelease</name>
397-
<value>true</value>
398-
</property>
399-
</activation>
400-
<build>
401-
<plugins>
402-
<plugin>
403-
<groupId>org.apache.maven.plugins</groupId>
404-
<artifactId>maven-gpg-plugin</artifactId>
405-
</plugin>
406-
</plugins>
407-
</build>
408-
</profile>
409-
410-
<!--
411-
WARNING: this MUST be the very last profile,
412-
so that the "report" module is the very last module,
413-
in particular when deploying artifacts to a Nexus repository.
414-
See the "build/reports" module POM for more information.
415-
-->
416-
<profile>
417-
<id>build-reports-as-last-module</id>
418-
<activation>
419-
<property>
420-
<name>!some.property.that.will.never.exist</name>
421-
</property>
422-
</activation>
423-
<modules>
424-
<module>reports</module>
425-
</modules>
426-
</profile>
427-
428-
<!-- DO NOT ADD ANY PROFILE AFTER THIS: see above -->
429-
</profiles>
430-
431336
</project>

0 commit comments

Comments
 (0)