Skip to content

Commit 8018335

Browse files
committed
Switch from OSSRH to new central
1 parent ddb8f66 commit 8018335

File tree

4 files changed

+27
-40
lines changed

4 files changed

+27
-40
lines changed

.github/workflows/maven-deploy-release.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- name: Deploy to JavaWebStack Repository
2121
run: mvn deploy -DbuildVersion=${{ github.event.release.tag_name }} -s build/settings.xml
2222
env:
23-
DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
24-
DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
23+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
24+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
2525
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
26-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/maven-deploy.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ jobs:
2121
- name: Deploy to JavaWebStack Repository
2222
run: mvn deploy -s build/settings.xml
2323
env:
24-
DEPLOYMENT_USERNAME: ${{ secrets.DEPLOYMENT_USERNAME }}
25-
DEPLOYMENT_PASSWORD: ${{ secrets.DEPLOYMENT_PASSWORD }}
24+
CENTRAL_USERNAME: ${{ secrets.CENTRAL_USERNAME }}
25+
CENTRAL_PASSWORD: ${{ secrets.CENTRAL_PASSWORD }}
2626
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
27-
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

build/settings.xml

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,9 @@
55
>
66
<servers>
77
<server>
8-
<id>javawebstack-snapshots</id>
9-
<username>${env.DEPLOYMENT_USERNAME}</username>
10-
<password>${env.DEPLOYMENT_PASSWORD}</password>
11-
</server>
12-
<server>
13-
<id>javawebstack-releases</id>
14-
<username>${env.DEPLOYMENT_USERNAME}</username>
15-
<password>${env.DEPLOYMENT_PASSWORD}</password>
16-
</server>
17-
<server>
18-
<id>ossrh</id>
19-
<username>JavaWebStack</username>
20-
<password>${env.OSSRH_PASSWORD}</password>
8+
<id>central</id>
9+
<username>${env.CENTRAL_USERNAME}</username>
10+
<password>${env.CENTRAL_PASSWORD}</password>
2111
</server>
2212
<server>
2313
<id>gpg</id>

pom.xml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,18 @@
4040
<url>https://github.com/JavaWebStack/validator/tree/master</url>
4141
</scm>
4242

43+
<repositories>
44+
<repository>
45+
<id>central-snapshots</id>
46+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
47+
</repository>
48+
</repositories>
49+
4350
<dependencies>
4451
<dependency>
4552
<groupId>org.javawebstack</groupId>
4653
<artifactId>abstract-data</artifactId>
47-
<version>1.0.6</version>
54+
<version>1.0.7-SNAPSHOT</version>
4855
</dependency>
4956
<dependency>
5057
<groupId>com.sun.mail</groupId>
@@ -61,24 +68,20 @@
6168

6269
<build>
6370
<plugins>
71+
<plugin>
72+
<groupId>org.sonatype.central</groupId>
73+
<artifactId>central-publishing-maven-plugin</artifactId>
74+
<version>0.9.0</version>
75+
<extensions>true</extensions>
76+
<configuration>
77+
<publishingServerId>central</publishingServerId>
78+
</configuration>
79+
</plugin>
6480
<plugin>
6581
<groupId>org.apache.maven.plugins</groupId>
6682
<artifactId>maven-surefire-plugin</artifactId>
6783
<version>2.22.1</version>
6884
</plugin>
69-
<plugin>
70-
<artifactId>maven-deploy-plugin</artifactId>
71-
<version>3.0.0-M1</version>
72-
<executions>
73-
<execution>
74-
<id>default-deploy</id>
75-
<phase>deploy</phase>
76-
<goals>
77-
<goal>deploy</goal>
78-
</goals>
79-
</execution>
80-
</executions>
81-
</plugin>
8285
<plugin>
8386
<groupId>org.apache.maven.plugins</groupId>
8487
<artifactId>maven-source-plugin</artifactId>
@@ -117,7 +120,7 @@
117120
<goal>sign</goal>
118121
</goals>
119122
<configuration>
120-
<keyname>A313520526A8DFE1C2A30399C35A3D43C557B112</keyname>
123+
<keyname>EC9CCFF8901F0AA22191DCEDD619376246C066D0</keyname>
121124
<passphraseServerId>gpg</passphraseServerId>
122125
<gpgArguments>
123126
<arg>--no-tty</arg>
@@ -133,13 +136,9 @@
133136

134137
<distributionManagement>
135138
<snapshotRepository>
136-
<id>ossrh</id>
137-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
139+
<id>central</id>
140+
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
138141
</snapshotRepository>
139-
<repository>
140-
<id>ossrh</id>
141-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
142-
</repository>
143142
</distributionManagement>
144143

145144
</project>

0 commit comments

Comments
 (0)