Skip to content

Commit 3665029

Browse files
committed
Merge branch 'master' into develop
2 parents 7e77c1a + 9b8a4f4 commit 3665029

File tree

4 files changed

+39
-98
lines changed

4 files changed

+39
-98
lines changed

.github/workflows/bump-version.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/pipeline.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: PIPELINE
2+
3+
on:
4+
push:
5+
branches:
6+
- 'master'
7+
workflow_dispatch:
8+
9+
jobs:
10+
bump:
11+
uses: UnterrainerInformatik/bump-semver-workflow/.github/workflows/workflow.yml@master
12+
build:
13+
name: Build and publish to Maven Central 🚀
14+
needs: bump
15+
uses: UnterrainerInformatik/maven-central-workflow/.github/workflows/workflow.yml@master
16+
with:
17+
major_version: ${{ needs.bump.outputs.major_version }}
18+
minor_version: ${{ needs.bump.outputs.minor_version }}
19+
build_version: ${{ needs.bump.outputs.build_version }}
20+
secrets:
21+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
22+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
23+
GPG_SECRET_KEY: ${{ secrets.GPG_SECRET_KEY }}
24+
GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
25+
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

.travis.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

pom.xml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,8 @@
1616
<project.compile.sourceEncoding>UTF-8</project.compile.sourceEncoding>
1717
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19-
<repos.id>ossrh</repos.id>
20-
<repos.snapshot.url>https://s01.oss.sonatype.org/content/repositories/snapshots</repos.snapshot.url>
21-
<repos.deployment.url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</repos.deployment.url>
19+
<repos.id>maven</repos.id>
20+
<repos.url>https://s01.oss.sonatype.org/repository/maven-releases/</repos.url>
2221
<name>Parent-POM</name>
2322
<package-path>info/unterrainer/commons/parentpom</package-path>
2423
<packg-string>info.unterrainer.commons.parentpom</packg-string>
@@ -94,19 +93,17 @@
9493
</dependencies>
9594

9695
<build>
97-
<!-- <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-shade-plugin</artifactId> ... </plugin> </plugins> </pluginManagement> -->
9996
<pluginManagement>
10097
<plugins>
10198
<plugin>
102-
<groupId>org.sonatype.plugins</groupId>
103-
<artifactId>nexus-staging-maven-plugin</artifactId>
99+
<groupId>org.sonatype.central</groupId>
100+
<artifactId>central-publishing-maven-plugin</artifactId>
101+
<version>0.7.0</version>
104102
<extensions>true</extensions>
105103
<configuration>
106-
<serverId>ossrh</serverId>
107-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
108-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
109-
<stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
104+
<publishingServerId>${repos.id}</publishingServerId>
105+
<autoPublish>true</autoPublish>
106+
<waitUntil>published</waitUntil>
110107
</configuration>
111108
</plugin>
112109
<plugin>
@@ -172,6 +169,7 @@
172169
</execution>
173170
</executions>
174171
<configuration>
172+
<attachPom>true</attachPom>
175173
<gpgArguments>
176174
<gpgArgument>--pinentry-mode</gpgArgument>
177175
<gpgArgument>loopback</gpgArgument>
@@ -353,13 +351,9 @@
353351
</developers>
354352

355353
<distributionManagement>
356-
<snapshotRepository>
357-
<id>${repos.id}</id>
358-
<url>${repos.snapshot.url}</url>
359-
</snapshotRepository>
360354
<repository>
361355
<id>${repos.id}</id>
362-
<url>${repos.deployment.url}</url>
356+
<url>${repos.url}</url>
363357
</repository>
364358
</distributionManagement>
365359

@@ -414,10 +408,6 @@
414408
<plugin>
415409
<artifactId>maven-source-plugin</artifactId>
416410
</plugin>
417-
<plugin>
418-
<groupId>org.sonatype.plugins</groupId>
419-
<artifactId>nexus-staging-maven-plugin</artifactId>
420-
</plugin>
421411
<plugin>
422412
<artifactId>maven-compiler-plugin</artifactId>
423413
</plugin>
@@ -427,6 +417,10 @@
427417
<plugin>
428418
<artifactId>maven-jar-plugin</artifactId>
429419
</plugin>
420+
<plugin>
421+
<groupId>org.sonatype.central</groupId>
422+
<artifactId>central-publishing-maven-plugin</artifactId>
423+
</plugin>
430424
<plugin>
431425
<groupId>com.google.code.maven-replacer-plugin</groupId>
432426
<artifactId>replacer</artifactId>

0 commit comments

Comments
 (0)