Skip to content

Commit d4aabc9

Browse files
marko-bekhtamarko-bekhta
committed
HV-2096 Use JReleaser to publish hibernate artifacts
1 parent 2994865 commit d4aabc9

File tree

9 files changed

+32
-131
lines changed

9 files changed

+32
-131
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

‎build/enforcer/pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@
4545

4646
<build>
4747
<plugins>
48-
<plugin>
49-
<artifactId>maven-gpg-plugin</artifactId>
50-
<configuration>
51-
<skip>true</skip>
52-
</configuration>
53-
</plugin>
5448
<plugin>
5549
<groupId>org.apache.maven.plugins</groupId>
5650
<artifactId>maven-enforcer-plugin</artifactId>

‎build/reports/pom.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -118,42 +118,6 @@
118118
</dependency>
119119
</dependencies>
120120

121-
<build>
122-
<plugins>
123-
<!--
124-
Hack to deploy in the "reports" module without deploying the "reports" module itself.
125-
The default lifecycle bindings of the plugin is to "stage locally" every artifact throughout
126-
the maven execution, and only actually deploy the "locally staged" artifacts
127-
in the very last executed module, which happens to be this "reports" module.
128-
However, this "reports" module does not generate any artifact we want to deploy.
129-
Thus, we'd like to prevent even its POM from being deployed: just deploy the "locally staged" artifacts,
130-
without adding the POM from the "reports" module to these artifacts.
131-
The default lifecycle bindings of the plugin does not offer a configuration option to do that,
132-
so we have to explicitly bind it
133-
-->
134-
<plugin>
135-
<groupId>org.sonatype.plugins</groupId>
136-
<artifactId>nexus-staging-maven-plugin</artifactId>
137-
<extensions>false</extensions>
138-
<!-- The <configuration> element is inherited from the parent module. -->
139-
<executions>
140-
<!-- Skip the default deployment, as explained above we don't want it. -->
141-
<execution>
142-
<id>default-deploy</id>
143-
<phase>none</phase>
144-
</execution>
145-
<!-- ... but execute the deferred deployment for the other modules -->
146-
<execution>
147-
<id>deferred-deploy</id>
148-
<phase>deploy</phase>
149-
<goals>
150-
<goal>deploy-staged</goal>
151-
</goals>
152-
</execution>
153-
</executions>
154-
</plugin>
155-
</plugins>
156-
</build>
157121
<profiles>
158122
<profile>
159123
<id>coverage-report</id>

‎distribution/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
<description>Builds the distribution bundles</description>
2020

2121
<properties>
22-
<!-- Skip artifact deployment -->
23-
<maven.deploy.skip>true</maven.deploy.skip>
24-
<gpg.skip>true</gpg.skip>
2522
<!--
2623
Any javadoc warnings should've been caught already while the previous modules were built.
2724
Also see additional explanations on this property in the `hibernate-search-mapper-orm-jakarta-batch-core` module.

‎documentation/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@
3030
<html.meta.project-key>validator</html.meta.project-key>
3131
<html.outdated-content.project-key>${html.meta.project-key}</html.outdated-content.project-key>
3232

33-
<!-- Skip artifact deployment -->
34-
<maven.deploy.skip>true</maven.deploy.skip>
35-
<gpg.skip>true</gpg.skip>
3633
<surefire.jvm.args.additional>-Duser.language=en -Duser.country=US</surefire.jvm.args.additional>
3734

3835
<forbiddenapis-junit.path>forbidden-allow-junit.txt</forbiddenapis-junit.path>

‎jenkins/release/Jenkinsfile‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ pipeline {
6060

6161
def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION)
6262
def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION)
63+
env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN
6364
echo "Performing full release for version ${releaseVersion.toString()}"
6465

6566
withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven',
@@ -68,13 +69,20 @@ pipeline {
6869
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) {
6970
// using MAVEN_GPG_PASSPHRASE (the default env variable name for passphrase in maven gpg plugin)
7071
withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
71-
string(credentialsId: 'release.gpg.passphrase', variable: 'MAVEN_GPG_PASSPHRASE')]) {
72+
string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
73+
// TODO: Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
74+
// to use the following env variable names to set the user/password:
75+
// JRELEASER_MAVENCENTRAL_USERNAME
76+
// JRELEASER_MAVENCENTRAL_TOKEN
77+
usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
78+
string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) {
7279
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
7380
sh 'cat $HOME/.ssh/config'
74-
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git'
75-
env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'
81+
dir('.release/scripts') {
82+
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
83+
}
7684
sh """
77-
bash -xe hibernate-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \
85+
bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \
7886
validator ${releaseVersion.toString()} ${developmentVersion.toString()}
7987
"""
8088
}

‎jenkins/snapshot-publish/Jenkinsfile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ pipeline {
3333
stage('Publish') {
3434
steps {
3535
script {
36-
withMaven(mavenSettingsConfig: 'ci-hibernate.deploy.settings.maven',
37-
mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') {
38-
sh """mvn \
39-
-Pci-build \
40-
-DskipTests \
41-
clean deploy \
42-
"""
36+
withMaven(mavenSettingsConfig: 'ci-hibernate.deploy.settings.maven', mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') {
37+
dir('.release/scripts') {
38+
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
39+
}
40+
def version = sh(
41+
script: ".release/scripts/determine-current-version.sh validator",
42+
returnStdout: true
43+
).trim()
44+
echo "Current version: '${version}'"
45+
sh "bash -xe .release/scripts/snapshot-deploy.sh validator ${version}"
4346
}
4447
}
4548
}

‎parents/public/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@
5757
<groupId>org.apache.maven.plugins</groupId>
5858
<artifactId>maven-source-plugin</artifactId>
5959
</plugin>
60-
<plugin>
61-
<groupId>org.apache.maven.plugins</groupId>
62-
<artifactId>maven-gpg-plugin</artifactId>
63-
</plugin>
6460
</plugins>
6561
</build>
6662

‎pom.xml‎

Lines changed: 7 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@
246246
<!-- Note: when updating this version, consider reviewing the list of JDKs the forbidden API plugin is targeting. -->
247247
<version.forbiddenapis.plugin>3.9</version.forbiddenapis.plugin>
248248
<version.gmavenplus.plugin>4.2.0</version.gmavenplus.plugin>
249-
<version.gpg.plugin>3.2.7</version.gpg.plugin>
250249
<version.install.plugin>3.1.4</version.install.plugin>
251250
<version.japicmp.plugin>0.23.1</version.japicmp.plugin>
252251
<version.jar.plugin>3.4.2</version.jar.plugin>
@@ -260,7 +259,6 @@
260259
<version.surefire.plugin>3.5.3</version.surefire.plugin>
261260
<version.surefire.plugin.java-version.asm>9.8</version.surefire.plugin.java-version.asm>
262261
<version.failsafe.plugin>${version.surefire.plugin}</version.failsafe.plugin>
263-
<version.nexus-staging-maven-plugin>1.7.0</version.nexus-staging-maven-plugin>
264262
<version.flatten-maven-plugin>1.7.0</version.flatten-maven-plugin>
265263
<version.moditect.plugin>1.2.2.Final</version.moditect.plugin>
266264
<version.sisu-maven-plugin>0.9.0.M3</version.sisu-maven-plugin>
@@ -276,9 +274,9 @@
276274

277275
<!-- Repository Deployment URLs -->
278276

279-
<ossrh.releases.repo.id>ossrh</ossrh.releases.repo.id>
280-
<ossrh.releases.repo.url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</ossrh.releases.repo.url>
281-
<ossrh.releases.repo.baseUrl>https://oss.sonatype.org/</ossrh.releases.repo.baseUrl>
277+
<!-- We always publish to a local directory, JReleaser is supposed to take care of publishing to Nexus: -->
278+
<local.staging.releases.repo.id>staging-deploy</local.staging.releases.repo.id>
279+
<local.staging.releases.repo.url>file:${maven.multiModuleProjectDirectory}/target/staging-deploy/maven</local.staging.releases.repo.url>
282280
<ossrh.snapshots.repo.id>ossrh</ossrh.snapshots.repo.id>
283281
<ossrh.snapshots.repo.url>https://oss.sonatype.org/content/repositories/snapshots</ossrh.snapshots.repo.url>
284282

@@ -745,36 +743,6 @@
745743
</execution>
746744
</executions>
747745
</plugin>
748-
<!--
749-
Configure the nexus-staging-maven-plugin explicitly (without <extension>true</extension>)
750-
in order to work around a problem in the "reports" module (see that module's POM for more info).
751-
-->
752-
<plugin>
753-
<groupId>org.sonatype.plugins</groupId>
754-
<artifactId>nexus-staging-maven-plugin</artifactId>
755-
<extensions>false</extensions><!-- This is essential: do not put true here -->
756-
<configuration>
757-
<serverId>${ossrh.releases.repo.id}</serverId>
758-
<!-- The following, by default, is only used for actual releases, not for snapshot deployments -->
759-
<nexusUrl>${ossrh.releases.repo.baseUrl}</nexusUrl>
760-
<!-- oss.sonatype.org has been very slow when closing repositories lately;
761-
let's raise the timeout until we switch to s01.sonatype.org -->
762-
<stagingProgressTimeoutMinutes>60</stagingProgressTimeoutMinutes>
763-
</configuration>
764-
<executions>
765-
<execution>
766-
<id>default-deploy</id>
767-
<phase>deploy</phase>
768-
<goals>
769-
<!--
770-
This will only put artifacts in a staging directory.
771-
See the "reports" module for actual deployment, at the end of the build.
772-
-->
773-
<goal>deploy</goal>
774-
</goals>
775-
</execution>
776-
</executions>
777-
</plugin>
778746
</plugins>
779747
<pluginManagement>
780748
<plugins>
@@ -1199,13 +1167,9 @@
11991167
<version>${version.deploy.plugin}</version>
12001168
<configuration>
12011169
<!-- we use the nexus-staging plugin -->
1202-
<skip>${maven-deploy-plugin.skip}</skip>
1170+
<skip>${deploy.skip}</skip>
12031171
</configuration>
12041172
</plugin>
1205-
<plugin>
1206-
<artifactId>maven-gpg-plugin</artifactId>
1207-
<version>${version.gpg.plugin}</version>
1208-
</plugin>
12091173
<plugin>
12101174
<artifactId>maven-resources-plugin</artifactId>
12111175
<version>${version.resources.plugin}</version>
@@ -1563,14 +1527,6 @@
15631527
<artifactId>versions-maven-plugin</artifactId>
15641528
<version>${version.versions.plugin}</version>
15651529
</plugin>
1566-
<plugin>
1567-
<groupId>org.sonatype.plugins</groupId>
1568-
<artifactId>nexus-staging-maven-plugin</artifactId>
1569-
<version>${version.nexus-staging-maven-plugin}</version>
1570-
<configuration>
1571-
<skipNexusStagingDeployMojo>${deploy.skip}</skipNexusStagingDeployMojo>
1572-
</configuration>
1573-
</plugin>
15741530
<plugin>
15751531
<groupId>org.apache.maven.plugins</groupId>
15761532
<artifactId>maven-wrapper-plugin</artifactId>
@@ -1639,9 +1595,9 @@
16391595

16401596
<distributionManagement>
16411597
<repository>
1642-
<id>${ossrh.releases.repo.id}</id>
1643-
<name>OSSRH Releases Repository</name>
1644-
<url>${ossrh.releases.repo.url}</url>
1598+
<id>${local.staging.releases.repo.id}</id>
1599+
<name>Local Staging Directory Releases Repository</name>
1600+
<url>${local.staging.releases.repo.url}</url>
16451601
</repository>
16461602
<snapshotRepository>
16471603
<id>${ossrh.snapshots.repo.id}</id>
@@ -1700,23 +1656,6 @@
17001656
</execution>
17011657
</executions>
17021658
</plugin>
1703-
<plugin>
1704-
<groupId>org.apache.maven.plugins</groupId>
1705-
<artifactId>maven-gpg-plugin</artifactId>
1706-
<executions>
1707-
<execution>
1708-
<id>sign-artifacts</id>
1709-
<phase>verify</phase>
1710-
<goals>
1711-
<goal>sign</goal>
1712-
</goals>
1713-
<configuration>
1714-
<homedir>${env.RELEASE_GPG_HOMEDIR}</homedir>
1715-
<bestPractices>true</bestPractices>
1716-
</configuration>
1717-
</execution>
1718-
</executions>
1719-
</plugin>
17201659
</plugins>
17211660
</build>
17221661
</profile>

0 commit comments

Comments
 (0)