Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 7 additions & 34 deletions .github/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>ossrh</id>
<username>${env.OSSRHU}</username>
<password>${env.OSSRHT}</password>
<id>sonatype-central-portal</id>
<username>${env.SONATYPE_CENTRAL_PORTAL_REPO_USERNAME}</username>
<password>${env.SONATYPE_CENTRAL_PORTAL_REPO_PASSWORD}</password>
</server>
</servers>
<profiles>
Expand All @@ -16,44 +16,17 @@
</properties>
</profile>
<profile>
<id>sonatype-snapshots</id>
<id>sonatype-central-snapshots</id>
<repositories>
<repository>
<id>sonatype-snapshots</id>
<id>sonatype-central-snapshots</id>
<snapshots>
<enabled>true</enabled>
</snapshots>
<name>sonatype-snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
</repositories>
</profile>
<profile>
<id>sonatype-staging</id>
<repositories>
<repository>
<id>sonatype-staging</id>
<snapshots>
<enabled>true</enabled>
</snapshots>
<name>sonatype-staging</name>
<url>https://oss.sonatype.org/content/groups/staging/</url>
</repository>
</repositories>
</profile>
<profile>
<id>sonatype-releases</id>
<repositories>
<repository>
<id>sonatype-releases</id>
<snapshots>
<enabled>true</enabled>
</snapshots>
<name>sonatype-releases</name>
<url>https://oss.sonatype.org/content/groups/public/</url>
<name>sonatype-central-snapshots</name>
<url>https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/snapshots/</url>
</repository>
</repositories>
</profile>
</profiles>

</settings>
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
runs-on: ${{ matrix.os }}
env:
MAVEN_PROPS: -Djavadoc.path=`which javadoc`
PROFILES: gpg,release-sign-artifacts,sonatype-deployment,sonatype-snapshots,sonatype-staging,sonatype-releases
PROFILES: "gpg,release-sign-artifacts,sonatype-central-portal-deployment,sonatype-central-snapshots"
SETTINGS: .github/settings.xml

steps:
Expand Down Expand Up @@ -82,8 +82,8 @@ jobs:
- name: Maven deploy
if: ${{ matrix.maven_deploy && (github.ref == 'refs/heads/main') && (github.event_name != 'pull_request') }}
env:
OSSRHU: ${{ secrets.OSSRHU }}
OSSRHT: ${{ secrets.OSSRHT }}
SONATYPE_CENTRAL_PORTAL_REPO_USERNAME: ${{ secrets.SONATYPE_CENTRAL_PORTAL_REPO_USERNAME }}
SONATYPE_CENTRAL_PORTAL_REPO_PASSWORD: ${{ secrets.SONATYPE_CENTRAL_PORTAL_REPO_PASSWORD }}
run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} deploy

- name: Docker maven build
Expand Down
62 changes: 38 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@

<name>PostGIS Java Project</name>
<description>Aggregates java projects associated with the PostGIS project.</description>
<url>http://postgis.net</url>
<url>https://postgis.net</url>
<licenses>
<license>
<name>GNU Lesser General Public License</name>
<url>http://www.gnu.org/licenses/lgpl-2.1.txt</url>
<url>https://www.gnu.org/licenses/lgpl-2.1.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<developers>
<developer>
<name>PostGIS Development Team</name>
<url>http://postgis.net</url>
<url>https://postgis.net</url>
</developer>
<developer>
<name>Phillip Ross</name>
Expand All @@ -35,15 +35,14 @@
<contributor>
<name>Hakan Tandogan</name>
<email>[email protected]</email>
<url>http://www.gurkensalat.com/</url>
<url>https://www.gurkensalat.com/</url>
<roles>
<role>Maven Packager</role>
</roles>
</contributor>
<contributor>
<name>Baris Ergun</name>
<email>[email protected]</email>
<url>http://www.barisergun.com/</url>
<roles>
<role>Maven Packager</role>
</roles>
Expand All @@ -56,14 +55,14 @@
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://lists.osgeo.org/pipermail/postgis-users/</archive>
<archive>https://lists.osgeo.org/pipermail/postgis-users/</archive>
</mailingList>
<mailingList>
<name>Developer List</name>
<subscribe>[email protected]</subscribe>
<unsubscribe>[email protected]</unsubscribe>
<post>[email protected]</post>
<archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
<archive>https://lists.osgeo.org/pipermail/postgis-devel/</archive>
</mailingList>
</mailingLists>

Expand All @@ -88,7 +87,7 @@
<distributionManagement>
<site>
<id>local-staging-site</id>
<url>http://local-staging/</url>
<url>https://local-staging/</url>
</site>
</distributionManagement>

Expand Down Expand Up @@ -462,7 +461,7 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
<localCheckout>true</localCheckout>
<pushChanges>false</pushChanges>
<releaseProfiles>release-sign-artifacts,sonatype-deployment</releaseProfiles>
<releaseProfiles>release-sign-artifacts,sonatype-central-portal-deployment</releaseProfiles>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -860,10 +859,10 @@
</build>
</profile>
<!--
The release-sign-artifacts and sonatype deployment profiles only need activated when pushing snapshots or
releases to maven central. When enabled, additional artifacts will be generated for javadoc and source as well
as GPG signatures for each artifact. This profiles assume that the properties for the gpg plugin
(such as gpg.keyname and gpg.passphrase are either defined in a settings.xml file or similar facility.
The release-sign-artifacts and sonatype-central-portal-deployment profiles only need activated when pushing
snapshots or releases to maven central. When enabled, additional artifacts will be generated for javadoc and
source as well as GPG signatures for each artifact. These profiles assume that the properties for the gpg
plugin (such as gpg.keyname and gpg.passphrase) are either defined in a settings.xml file or similar facility.
-->
<profile>
<id>release-sign-artifacts</id>
Expand Down Expand Up @@ -910,17 +909,32 @@
</build>
</profile>
<profile>
<id>sonatype-deployment</id>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<id>sonatype-central-portal-deployment</id>
<properties>
<central-publishing-maven-plugin.version>0.7.0</central-publishing-maven-plugin.version>
</properties>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>${central-publishing-maven-plugin.version}</version>
<extensions>true</extensions>
<configuration>
<!-- publishing server id refers to <id> element in <server> section of settings.xml -->
<publishingServerId>sonatype-central-portal</publishingServerId>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</profile>

<profile>
Expand Down