Skip to content

Commit 87baeab

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-5351 Switch to JReleaser for nexus publishing
(cherry picked from commit 46f8046)
1 parent 0ff749f commit 87baeab

File tree

48 files changed

+172
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+172
-186
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@ atlassian-ide-plugin.xml
4444
# Maven wrapper files
4545
.mvn
4646
mvnw*
47+
48+
# Cache folders for formatting plugins:
49+
.cache

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

‎backends/jgroups/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<name>Hibernate Search JGroups Backend</name>
2121
<description>Hibernate Search JGroup based backend</description>
22+
<url>http://search.hibernate.org</url>
2223

2324
<dependencies>
2425
<dependency>

‎backends/jgroups/src/main/java/org/hibernate/search/backend/jgroups/HibernateSearchJgroupsExtension.java

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/*
2+
* Hibernate Search, full-text search for your domain model
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
5+
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
*/
7+
package org.hibernate.search.backend.jgroups;
8+
9+
/**
10+
* This module provides the Hibernate Search JGroup based backend.
11+
*/
12+
// DO NOT actually remove this one! We need it to let the javadoc plugin to generate the "empty" javadoc jar to comply with the publishign rules.
13+
// (since = "5.10", forRemoval = true)
14+
@Deprecated
15+
public interface HibernateSearchJgroupsExtension {
16+
}

‎backends/jms/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<name>Hibernate Search JMS Backend</name>
2121
<description>Hibernate Search JGroup based backend</description>
22+
<url>http://search.hibernate.org</url>
2223

2324
<dependencies>
2425
<dependency>

‎build-config/pom.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
<name>Hibernate Search Build Configuration</name>
1818
<description>Configuration for the build of Hibernate Search</description>
19+
<url>http://search.hibernate.org</url>
1920

2021
<properties>
2122
<!--
@@ -34,13 +35,6 @@
3435
<skip>true</skip>
3536
</configuration>
3637
</plugin>
37-
<plugin>
38-
<groupId>org.apache.maven.plugins</groupId>
39-
<artifactId>maven-gpg-plugin</artifactId>
40-
<configuration>
41-
<skip>true</skip>
42-
</configuration>
43-
</plugin>
4438
<plugin>
4539
<artifactId>maven-javadoc-plugin</artifactId>
4640
<configuration>

‎ci/release/Jenkinsfile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,20 +62,29 @@ pipeline {
6262

6363
def releaseVersion = Version.parseReleaseVersion(params.RELEASE_VERSION)
6464
def developmentVersion = Version.parseDevelopmentVersion(params.DEVELOPMENT_VERSION)
65+
env.JRELEASER_DRY_RUN = params.RELEASE_DRY_RUN
6566
echo "Performing full release for version ${releaseVersion.toString()}"
6667

6768
withMaven(mavenSettingsConfig: params.RELEASE_DRY_RUN ? null : 'ci-hibernate.deploy.settings.maven',
6869
mavenLocalRepo: env.WORKSPACE_TMP + '/.m2repository') {
6970
configFileProvider([configFile(fileId: 'release.config.ssh', targetLocation: env.HOME + '/.ssh/config'),
7071
configFile(fileId: 'release.config.ssh.knownhosts', targetLocation: env.HOME + '/.ssh/known_hosts')]) {
7172
withCredentials([file(credentialsId: 'release.gpg.private-key', variable: 'RELEASE_GPG_PRIVATE_KEY_PATH'),
72-
string(credentialsId: 'release.gpg.passphrase', variable: 'RELEASE_GPG_PASSPHRASE')]) {
73+
string(credentialsId: 'release.gpg.passphrase', variable: 'JRELEASER_GPG_PASSPHRASE'),
74+
// TODO: HSEARCH-5354
75+
// Once we switch to maven-central publishing (from nexus2) we need to add a new credentials
76+
// to use the following env variable names to set the user/password:
77+
// JRELEASER_MAVENCENTRAL_USERNAME
78+
// JRELEASER_MAVENCENTRAL_TOKEN
79+
usernamePassword(credentialsId: 'ossrh.sonatype.org', passwordVariable: 'JRELEASER_NEXUS2_PASSWORD', usernameVariable: 'JRELEASER_NEXUS2_USERNAME'),
80+
string(credentialsId: 'Hibernate-CI.github.com', variable: 'JRELEASER_GITHUB_TOKEN')]) {
7381
sshagent(['ed25519.Hibernate-CI.github.com', 'hibernate.filemgmt.jboss.org', 'hibernate-ci.frs.sourceforge.net']) {
7482
sh 'cat $HOME/.ssh/config'
75-
sh 'git clone https://github.com/hibernate/hibernate-noorm-release-scripts.git'
76-
env.RELEASE_GPG_HOMEDIR = env.WORKSPACE_TMP + '/.gpg'
83+
dir('.release/scripts') {
84+
sh 'git clone https://github.com/hibernate/hibernate-release-scripts.git .'
85+
}
7786
sh """
78-
bash -xe hibernate-noorm-release-scripts/release.sh ${params.RELEASE_DRY_RUN ? '-d' : ''} \
87+
bash -xe .release/scripts/release.sh -j ${params.RELEASE_DRY_RUN ? '-d' : ''} \
7988
search ${releaseVersion.toString()} ${developmentVersion.toString()}
8089
"""
8190
}

‎ci/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 search",
42+
returnStdout: true
43+
).trim()
44+
echo "Current version: '${version}'"
45+
sh "bash -xe .release/scripts/snapshot-deploy.sh search ${version}"
4346
}
4447
}
4548
}

‎distribution/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
<name>Hibernate Search Distribution</name>
2121
<description>Builds the distribution bundles</description>
22+
<url>http://search.hibernate.org</url>
2223
<packaging>pom</packaging>
2324

2425
<properties>
2526
<!-- Skip artifact deployment -->
2627
<maven.deploy.skip>true</maven.deploy.skip>
27-
<gpg.skip>true</gpg.skip>
2828
</properties>
2929

3030
<dependencies>

‎distribution/src/main/assembly/dist.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,8 @@
214214
<exclude>copyright.txt</exclude>
215215
<exclude>lgpl.txt</exclude>
216216

217-
<!-- only needed for documentation and helper scripts, no need to include them -->
218-
<exclude>hibernate-noorm-release-scripts/**</exclude>
217+
<!-- only needed for documentation and helper scripts, no need to include them -->
218+
<exclude>.release/**</exclude>
219219

220220
<!-- actual files which should be ignored -->
221221
<exclude>.git</exclude>

‎documentation/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<name>Hibernate Search Manual</name>
2222
<description>The Hibernate Search reference manual</description>
23+
<url>http://search.hibernate.org</url>
2324

2425
<properties>
2526
<asciidoctor.base-output-dir>${project.build.directory}/asciidoctor/en-US</asciidoctor.base-output-dir>
@@ -33,7 +34,6 @@
3334

3435
<!-- Skip artifact deployment -->
3536
<maven.deploy.skip>true</maven.deploy.skip>
36-
<gpg.skip>true</gpg.skip>
3737
<!-- Skip javadoc generation -->
3838
<maven.javadoc.skip>true</maven.javadoc.skip>
3939
</properties>

‎elasticsearch-aws/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<name>Hibernate Search Elasticsearch AWS integration</name>
2121
<description>Configurer for the Hibernate Search Elasticsearch backend enabling connection to an AWS-hosted Elasticsearch cluster</description>
22+
<url>http://search.hibernate.org</url>
2223

2324
<dependencies>
2425
<dependency>

‎elasticsearch-aws/src/main/java/org/hibernate/search/elasticsearch/aws/HibernateSearchElasticsearchAwsExtension.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/*
2+
* Hibernate Search, full-text search for your domain model
3+
*
4+
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
5+
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
6+
*/
7+
package org.hibernate.search.elasticsearch.aws;
8+
9+
/**
10+
* Hibernate Search Elasticsearch AWS is an extension that is the
11+
* configurer for the Hibernate Search Elasticsearch backend enabling connection to an AWS-hosted Elasticsearch cluster
12+
*/
13+
// DO NOT actually remove this one! We need it to let the javadoc plugin to generate the "empty" javadoc jar to comply with the publishign rules.
14+
// (since = "5.10", forRemoval = true)
15+
@Deprecated
16+
public interface HibernateSearchElasticsearchAwsExtension {
17+
}

‎elasticsearch/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<name>Hibernate Search Elasticsearch</name>
2121
<description>Hibernate Search backend which has indexing operations forwarded to Elasticsearch</description>
22+
<url>http://search.hibernate.org</url>
2223

2324
<dependencies>
2425
<dependency>

‎engine/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
<name>Hibernate Search Engine</name>
2121
<description>Core of the Object/Lucene mapper, query engine and index management</description>
22+
<url>http://search.hibernate.org</url>
2223

2324
<dependencies>
2425
<dependency>

‎infinispan/pom.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
</parent>
1717

1818
<artifactId>hibernate-search-infinispan</artifactId>
19+
<packaging>pom</packaging>
1920

2021
<name>Hibernate Search Infinispan Directory Provider</name>
2122
<description>Hibernate Search Infinispan Directory Provider</description>
23+
<url>http://search.hibernate.org</url>
2224

2325
<distributionManagement>
2426
<relocation>
@@ -34,14 +36,6 @@
3436
<plugin>
3537
<artifactId>maven-deploy-plugin</artifactId>
3638
</plugin>
37-
<plugin>
38-
<groupId>org.apache.maven.plugins</groupId>
39-
<artifactId>maven-jar-plugin</artifactId>
40-
<configuration>
41-
<!-- We need an empty JAR, otherwise the build will fail -->
42-
<skipIfEmpty>false</skipIfEmpty>
43-
</configuration>
44-
</plugin>
4539
</plugins>
4640
</build>
4741
</project>

‎integrationtest/elasticsearch/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -210,13 +210,6 @@
210210
<skip>true</skip>
211211
</configuration>
212212
</plugin>
213-
<plugin>
214-
<groupId>org.apache.maven.plugins</groupId>
215-
<artifactId>maven-gpg-plugin</artifactId>
216-
<configuration>
217-
<skip>true</skip>
218-
</configuration>
219-
</plugin>
220213
<plugin>
221214
<artifactId>maven-javadoc-plugin</artifactId>
222215
<configuration>

‎integrationtest/jdk9-modules/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,6 @@
100100
<skip>true</skip>
101101
</configuration>
102102
</plugin>
103-
<plugin>
104-
<groupId>org.apache.maven.plugins</groupId>
105-
<artifactId>maven-gpg-plugin</artifactId>
106-
<configuration>
107-
<skip>true</skip>
108-
</configuration>
109-
</plugin>
110103

111104
<plugin>
112105
<artifactId>maven-javadoc-plugin</artifactId>

‎integrationtest/jms/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,13 +109,6 @@
109109
<skip>true</skip>
110110
</configuration>
111111
</plugin>
112-
<plugin>
113-
<groupId>org.apache.maven.plugins</groupId>
114-
<artifactId>maven-gpg-plugin</artifactId>
115-
<configuration>
116-
<skip>true</skip>
117-
</configuration>
118-
</plugin>
119112
<plugin>
120113
<artifactId>maven-javadoc-plugin</artifactId>
121114
<configuration>

‎integrationtest/jsr352/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,13 +153,6 @@
153153
<skip>true</skip>
154154
</configuration>
155155
</plugin>
156-
<plugin>
157-
<groupId>org.apache.maven.plugins</groupId>
158-
<artifactId>maven-gpg-plugin</artifactId>
159-
<configuration>
160-
<skip>true</skip>
161-
</configuration>
162-
</plugin>
163156
<plugin>
164157
<artifactId>maven-javadoc-plugin</artifactId>
165158
<configuration>

‎integrationtest/narayana/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,6 @@
7171
<skip>true</skip>
7272
</configuration>
7373
</plugin>
74-
<plugin>
75-
<groupId>org.apache.maven.plugins</groupId>
76-
<artifactId>maven-gpg-plugin</artifactId>
77-
<configuration>
78-
<skip>true</skip>
79-
</configuration>
80-
</plugin>
8174
<plugin>
8275
<artifactId>maven-javadoc-plugin</artifactId>
8376
<configuration>

‎integrationtest/osgi/karaf-features/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@
8282
<skip>true</skip>
8383
</configuration>
8484
</plugin>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-gpg-plugin</artifactId>
88-
<configuration>
89-
<skip>true</skip>
90-
</configuration>
91-
</plugin>
9285

9386
<plugin>
9487
<artifactId>maven-javadoc-plugin</artifactId>

‎integrationtest/osgi/karaf-it/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -211,13 +211,6 @@
211211
<skip>true</skip>
212212
</configuration>
213213
</plugin>
214-
<plugin>
215-
<groupId>org.apache.maven.plugins</groupId>
216-
<artifactId>maven-gpg-plugin</artifactId>
217-
<configuration>
218-
<skip>true</skip>
219-
</configuration>
220-
</plugin>
221214

222215
<plugin>
223216
<artifactId>maven-javadoc-plugin</artifactId>

‎integrationtest/performance/engine-elasticsearch/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@
9090
<skip>true</skip>
9191
</configuration>
9292
</plugin>
93-
<plugin>
94-
<groupId>org.apache.maven.plugins</groupId>
95-
<artifactId>maven-gpg-plugin</artifactId>
96-
<configuration>
97-
<skip>true</skip>
98-
</configuration>
99-
</plugin>
10093
<plugin>
10194
<artifactId>maven-javadoc-plugin</artifactId>
10295
<configuration>

‎integrationtest/performance/engine-lucene/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@
8282
<skip>true</skip>
8383
</configuration>
8484
</plugin>
85-
<plugin>
86-
<groupId>org.apache.maven.plugins</groupId>
87-
<artifactId>maven-gpg-plugin</artifactId>
88-
<configuration>
89-
<skip>true</skip>
90-
</configuration>
91-
</plugin>
9285
<plugin>
9386
<artifactId>maven-javadoc-plugin</artifactId>
9487
<configuration>

‎integrationtest/performance/orm/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,6 @@
224224
<skip>true</skip>
225225
</configuration>
226226
</plugin>
227-
<plugin>
228-
<groupId>org.apache.maven.plugins</groupId>
229-
<artifactId>maven-gpg-plugin</artifactId>
230-
<configuration>
231-
<skip>true</skip>
232-
</configuration>
233-
</plugin>
234227
<plugin>
235228
<artifactId>maven-javadoc-plugin</artifactId>
236229
<configuration>

‎integrationtest/performance/sandbox/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,6 @@
6969
<skip>true</skip>
7070
</configuration>
7171
</plugin>
72-
<plugin>
73-
<groupId>org.apache.maven.plugins</groupId>
74-
<artifactId>maven-gpg-plugin</artifactId>
75-
<configuration>
76-
<skip>true</skip>
77-
</configuration>
78-
</plugin>
7972
<plugin>
8073
<artifactId>maven-javadoc-plugin</artifactId>
8174
<configuration>

0 commit comments

Comments
 (0)