Skip to content

Commit 12e81e5

Browse files
juanfeSanahujajuanfeSanahuja
authored
Merge pull request #119 from opencb/TASK-7843
Portpatch 5.6.0 -> 6.1.0-SNAPSHOT
2 parents b95a575 + 957ac3b commit 12e81e5

7 files changed

Lines changed: 64 additions & 26 deletions

File tree

‎.github/workflows/deploy-maven-repository-workflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
3434
gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
3535
- name: Deploy to Maven Central repository
36-
run: mvn clean deploy -DskipTests -P deploy-maven ${{ inputs.maven_opts }} --no-transfer-progress
36+
run: mvn clean deploy -DskipTests -Pdeploy-maven ${{ inputs.maven_opts }} --no-transfer-progress
3737
env:
3838
MAVEN_NEXUS_USER: ${{ secrets.MAVEN_USER_TOKEN }}
3939
MAVEN_NEXUS_PASSWORD: ${{ secrets.MAVEN_PASSWORD_TOKEN }}
@@ -44,6 +44,6 @@ jobs:
4444
distribution: 'temurin'
4545
java-version: '8'
4646
- name: Deploy to GitHub Packages repository
47-
run: mvn clean deploy -DskipTests -P deploy-github ${{ inputs.maven_opts }} --no-transfer-progress
47+
run: mvn clean deploy -DskipTests -Pdeploy-github ${{ inputs.maven_opts }} --no-transfer-progress
4848
env:
4949
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎commons-datastore/commons-datastore-core/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<artifactId>commons-datastore-core</artifactId>
1414
<packaging>jar</packaging>
1515

16+
<name>OpenCB commons-datastore-core project</name>
17+
<description>OpenCB commons project contains several Java libs for Bioinformatics</description>
18+
<url>http://www.opencb.org</url>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>com.fasterxml.jackson.core</groupId>

‎commons-datastore/commons-datastore-mongodb/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<artifactId>commons-datastore-mongodb</artifactId>
1414
<packaging>jar</packaging>
1515

16+
<name>OpenCB commons-datastore-mongodb project</name>
17+
<description>OpenCB commons project contains several Java libs for Bioinformatics</description>
18+
<url>http://www.opencb.org</url>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>org.opencb.commons</groupId>

‎commons-datastore/commons-datastore-solr/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@
2929
<artifactId>commons-datastore-solr</artifactId>
3030
<packaging>jar</packaging>
3131

32+
<name>OpenCB commons-datastore-solr project</name>
33+
<description>OpenCB commons project contains several Java libs for Bioinformatics</description>
34+
<url>http://www.opencb.org</url>
35+
36+
3237
<dependencies>
3338
<dependency>
3439
<groupId>org.opencb.commons</groupId>

‎commons-datastore/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<artifactId>commons-datastore</artifactId>
1414
<packaging>pom</packaging>
1515

16+
<name>OpenCB commons-datastore project</name>
17+
<description>OpenCB commons project contains several Java libs for Bioinformatics</description>
18+
<url>http://www.opencb.org</url>
19+
20+
1621
<modules>
1722
<module>commons-datastore-core</module>
1823
<module>commons-datastore-mongodb</module>

‎commons-lib/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
<artifactId>commons-lib</artifactId>
1414
<packaging>jar</packaging>
1515

16+
<name>OpenCB commons-lib project</name>
17+
<description>OpenCB commons project contains several Java libs for Bioinformatics</description>
18+
<url>http://www.opencb.org</url>
19+
1620
<dependencies>
1721
<dependency>
1822
<groupId>org.opencb.commons</groupId>

‎pom.xml‎

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,6 @@
5151
</licenses>
5252

5353
<repositories>
54-
<repository>
55-
<id>ossrh</id>
56-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
57-
<snapshots>
58-
<enabled>true</enabled>
59-
<updatePolicy>daily</updatePolicy>
60-
</snapshots>
61-
</repository>
6254
<repository>
6355
<id>github</id>
6456
<url>https://maven.pkg.github.com/opencb</url>
@@ -305,34 +297,62 @@
305297
</plugins>
306298
</build>
307299

300+
308301
<profiles>
309302
<profile>
310303
<id>deploy-maven</id>
311304
<distributionManagement>
305+
<!-- Releases repository using the Sonatype OSSRH Staging API for staging and deployment -->
312306
<repository>
313307
<id>ossrh</id>
314-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
308+
<name>OSSRH Staging API Releases</name>
309+
<url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
315310
</repository>
311+
312+
<!-- Snapshots repository pointing to Maven Central’s snapshot feed for ongoing development versions -->
316313
<snapshotRepository>
317314
<id>ossrh</id>
318-
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
315+
<name>Central Portal Snapshots</name>
316+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
319317
</snapshotRepository>
320318
</distributionManagement>
321319
<build>
322320
<plugins>
321+
<!-- Central Publishing Plugin: handles both snapshots and releases via the Sonatype Central API -->
322+
<plugin>
323+
<groupId>org.sonatype.central</groupId>
324+
<artifactId>central-publishing-maven-plugin</artifactId>
325+
<version>0.8.0</version>
326+
<!-- extensions=true allows this plugin to hook into the build lifecycle -->
327+
<extensions>true</extensions>
328+
<configuration>
329+
<!-- ID of the <server> in your settings.xml containing your Sonatype credentials -->
330+
<publishingServerId>ossrh</publishingServerId>
331+
<!-- autoPublish=true will automatically close and release the staging repository after deploy -->
332+
<autoPublish>true</autoPublish>
333+
<!-- waitUntil=published makes the build wait until the artifacts are fully available in Central -->
334+
<waitUntil>published</waitUntil>
335+
<!-- ignorePublishedComponents skips already-published modules in multimodule builds -->
336+
<ignorePublishedComponents>true</ignorePublishedComponents>
337+
</configuration>
338+
</plugin>
339+
<!-- Source Plugin: generates and attaches a -sources.jar containing all your project’s source files -->
323340
<plugin>
324341
<groupId>org.apache.maven.plugins</groupId>
325342
<artifactId>maven-source-plugin</artifactId>
326-
<version>3.2.0</version>
343+
<version>3.2.1</version>
327344
<executions>
328345
<execution>
329346
<id>attach-sources</id>
330347
<goals>
348+
<!-- jar-no-fork: create the sources jar without running the default lifecycle again -->
331349
<goal>jar-no-fork</goal>
332350
</goals>
333351
</execution>
334352
</executions>
335353
</plugin>
354+
355+
<!-- Javadoc Plugin: generates and attaches a -javadoc.jar containing your project’s API documentation -->
336356
<plugin>
337357
<groupId>org.apache.maven.plugins</groupId>
338358
<artifactId>maven-javadoc-plugin</artifactId>
@@ -341,27 +361,34 @@
341361
<execution>
342362
<id>attach-javadocs</id>
343363
<goals>
364+
<!-- jar: package the generated Javadocs into a jar file -->
344365
<goal>jar</goal>
345366
</goals>
346367
</execution>
347368
</executions>
348369
<configuration>
370+
<!-- disable strict checking of HTML tags in comments -->
349371
<doclint>none</doclint>
372+
<!-- do not fail the build if Javadoc generation issues errors -->
373+
<failOnError>false</failOnError>
350374
</configuration>
351375
</plugin>
376+
377+
<!-- GPG Plugin: signs all deployable artifacts (.jar, .pom, sources, javadoc) with your GPG key -->
352378
<plugin>
353379
<groupId>org.apache.maven.plugins</groupId>
354380
<artifactId>maven-gpg-plugin</artifactId>
355381
<version>1.6</version>
356382
<executions>
357383
<execution>
358384
<id>sign-artifacts</id>
359-
<phase>deploy</phase>
385+
<!-- bind signing to the verify phase, so signatures are created before deploy -->
386+
<phase>verify</phase>
360387
<goals>
361388
<goal>sign</goal>
362389
</goals>
363390
<configuration>
364-
<!-- Prevent `gpg` from using pinentry programs -->
391+
<!-- Use loopback pinentry to allow unattended signing in CI -->
365392
<gpgArguments>
366393
<arg>--pinentry-mode</arg>
367394
<arg>loopback</arg>
@@ -370,17 +397,6 @@
370397
</execution>
371398
</executions>
372399
</plugin>
373-
<plugin>
374-
<groupId>org.sonatype.plugins</groupId>
375-
<artifactId>nexus-staging-maven-plugin</artifactId>
376-
<version>1.6.8</version>
377-
<extensions>true</extensions>
378-
<configuration>
379-
<serverId>ossrh</serverId>
380-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
381-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
382-
</configuration>
383-
</plugin>
384400
</plugins>
385401
</build>
386402
</profile>

0 commit comments

Comments
 (0)