[Git][debian-gis-team/postgis-java][upstream] New upstream version 2025.1.0
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Tue Jun 3 13:37:35 BST 2025
Bas Couwenberg pushed to branch upstream at Debian GIS Project / postgis-java
Commits:
0320a184 by Bas Couwenberg at 2025-06-03T14:26:56+02:00
New upstream version 2025.1.0
- - - - -
18 changed files:
- .github/install-sdkman.sh
- .github/settings.xml
- .github/workflows/main.yml
- + .mvn/jvm.config
- + .mvn/maven.config
- + .mvn/wrapper/maven-wrapper.properties
- + .sdkmanrc
- maven-version-rules.xml
- + mvnw
- + mvnw.cmd
- pom.xml
- postgis-jdbc-geometry/pom.xml
- postgis-jdbc-java2d/pom.xml
- postgis-jdbc-jts/pom.xml
- postgis-jdbc/pom.xml
- tools/pom.xml
- tools/smoketest/pom.xml
- tools/test-utils/pom.xml
Changes:
=====================================
.github/install-sdkman.sh
=====================================
@@ -3,7 +3,6 @@
set -euf -o pipefail
JAVA_VERSION=$1
-MAVEN_VERSION=$2
printf "Installing, configuring, and initializing SDKMAN\n"
curl -s "https://get.sdkman.io" | bash
@@ -12,7 +11,4 @@ set +uf
source "${HOME}/.sdkman/bin/sdkman-init.sh"
printf "Installing Azul Zulu JDKs via SDKMAN\n"
-sdk i java ${JAVA_VERSION}
-
-printf "Installing Apache Maven via SDKMAN\n"
-sdk i maven ${MAVEN_VERSION}
+sdk i java "${JAVA_VERSION}"
=====================================
.github/settings.xml
=====================================
@@ -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>
@@ -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>
=====================================
.github/workflows/main.yml
=====================================
@@ -11,23 +11,21 @@ jobs:
strategy:
matrix:
os: [ubuntu-24.04]
- jdk_version: [8.0.422-zulu, 11.0.24-zulu, 17.0.12-zulu, 21.0.4-zulu]
- maven_version: [3.9.8]
+ jdk_version: [8.0.452-zulu, 11.0.27-zulu, 17.0.15-zulu, 21.0.7-zulu, 24.0.1-zulu]
include:
- os: ubuntu-24.04
- jdk_version: 8.0.422-zulu
- zulu_version: 8.80.0.17
- maven_version: 3.9.8
+ jdk_version: 8.0.452-zulu
+ zulu_version: 8.86.0.25
maven_deploy: true
docker_build: true
maven_docker_container_image_repo: luminositylabs
- maven_docker_container_image_name: maven
- maven_docker_container_image_tag: 3.9.8_openjdk-8u422_zulu-alpine-8.80.0.17
- name: Build on OS ${{ matrix.os }} with Maven ${{ matrix.maven_version }} using JDK ${{ matrix.jdk_version }}
+ maven_docker_container_image_name: openjdk
+ maven_docker_container_image_tag: 8u452_zulu-alpine-8.86.0.25
+ name: Build on OS ${{ matrix.os }} using JDK ${{ matrix.jdk_version }}
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:
@@ -39,18 +37,16 @@ jobs:
- name: Install SDKMAN and java environment
run: |
- .github/install-sdkman.sh ${{ matrix.jdk_version }} ${{ matrix.maven_version }}
+ .github/install-sdkman.sh ${{ matrix.jdk_version }}
echo "SDKMAN_DIR=${HOME}/.sdkman" >> $GITHUB_ENV
- name: Add SDKMAN candidate environment variables
run: |
echo "JAVA_HOME=${SDKMAN_DIR}/candidates/java/current" >> $GITHUB_ENV
- echo "MAVEN_HOME=${SDKMAN_DIR}/candidates/maven/current" >> $GITHUB_ENV
- name: Add SDKMAN candidate paths to system path
run: |
echo "${JAVA_HOME}/bin" >> $GITHUB_PATH
- echo "${MAVEN_HOME}/bin" >> $GITHUB_PATH
- name: Setup Maven repository cache
uses: actions/cache at v4
@@ -66,33 +62,33 @@ jobs:
run: echo "${{ github.ref }}"
- name: List Maven repositories
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} dependency:list-repositories
+ run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} dependency:list-repositories
- name: Show Maven dependency tree
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} dependency:tree
+ run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} dependency:tree
- name: Show Maven active profiles
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} help:active-profiles
+ run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} help:active-profiles
- name: Show Maven effective POM
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} help:effective-pom
+ run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} help:effective-pom
- name: Maven build/test
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} clean install
+ run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} clean install
- name: Maven generate site
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} site site:stage
+ run: ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} site site:stage
- name: Maven deploy
if: ${{ matrix.maven_deploy && (github.ref == 'refs/heads/main') && (github.event_name != 'pull_request') }}
env:
- OSSRHU: ${{ secrets.OSSRHU }}
- OSSRHT: ${{ secrets.OSSRHT }}
- run: mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} ${{ env.MAVEN_PROPS }} deploy
+ 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
if: ${{ matrix.docker_build }}
env:
CBD: /usr/src/build
P: luminositylabs-oss
- run: docker container run --rm -i -v "$(pwd)":"${CBD}" -v ${HOME}/.gnupg:/root/.gnupg -v ${P}-${{ matrix.maven_docker_container_image_tag }}-mvn-repo:/root/.m2 -w "${CBD}" ${{ matrix.maven_docker_container_image_repo }}/${{ matrix.maven_docker_container_image_name }}:${{ matrix.maven_docker_container_image_tag }} mvn -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} -Djavadoc.path=/usr/bin/javadoc -Dmaven.integration.test.skip=true dependency:list-repositories dependency:tree help:active-profiles clean install site site:stage
+ run: docker container run --rm -i -v "$(pwd)":"${CBD}" -v ${HOME}/.gnupg:/root/.gnupg -v ${P}-${{ matrix.maven_docker_container_image_tag }}-mvn-repo:/root/.m2 -w "${CBD}" ${{ matrix.maven_docker_container_image_repo }}/${{ matrix.maven_docker_container_image_name }}:${{ matrix.maven_docker_container_image_tag }} sh -l -c "apk update && apk add -u gnupg && ./mvnw -U -V -s ${{ env.SETTINGS }} -P${{ env.PROFILES }} -Djavadoc.path=/usr/bin/javadoc -Dmaven.integration.test.skip=true dependency:list-repositories dependency:tree help:active-profiles clean install site site:stage"
=====================================
.mvn/jvm.config
=====================================
=====================================
.mvn/maven.config
=====================================
@@ -0,0 +1,3 @@
+--strict-checksums
+--update-snapshots
+-Djavadoc.path=${SDKMAN_DIR}/candidates/java/8.0.452-zulu/bin/javadoc
=====================================
.mvn/wrapper/maven-wrapper.properties
=====================================
@@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
=====================================
.sdkmanrc
=====================================
@@ -0,0 +1,3 @@
+# Enable auto-env through the sdkman_auto_env config
+# Add key=value pairs of SDKs to use below
+java=8.0.452-zulu
=====================================
maven-version-rules.xml
=====================================
@@ -1,7 +1,6 @@
<ruleset comparisonMethod="maven"
- xmlns="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://mojo.codehaus.org/versions-maven-plugin/rule/2.0.0 http://mojo.codehaus.org/versions-maven-plugin/xsd/rule-2.0.0.xsd">
+ xmlns="https://www.mojohaus.org/VERSIONS/RULE/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="https://www.mojohaus.org/VERSIONS/RULE/2.1.0 https://www.mojohaus.org/versions/versions-model/xsd/rule-2.1.0.xsd">
<ignoreVersions>
<!-- Exclude milestones, release candidates, alphas, and betas-->
<ignoreVersion type="regex">.*[\.-](?i)([M|alpha|beta|rc]).*</ignoreVersion>
@@ -9,29 +8,40 @@
<ignoreVersion type="regex">.*\.jre[6-7]</ignoreVersion>
</ignoreVersions>
<rules>
- <!-- Pin logback version to v1.3.x (v1.4.0+ requires Java11) -->
- <rule groupId="ch.qos.logback" comparisonMethod="maven">
+ <!-- Pin checkstyle version to pre-v10 (v10 requires Java11) -->
+ <rule groupId="com.puppycrawl.tools" artifactId="checkstyle" comparisonMethod="maven">
<ignoreVersions>
- <ignoreVersion type="regex">1\.[4-9]\..*</ignoreVersion>
+ <ignoreVersion type="regex">10\..*</ignoreVersion>
</ignoreVersions>
</rule>
- <!-- Pin checkstyle version to pre-v10 (v10 is requires Java11) -->
- <rule groupId="com.puppycrawl.tools" artifactId="checkstyle" comparisonMethod="maven">
+ <!-- Pin spotbugs version to pre-v4.9.0 (v4.9.0 requires Java11) -->
+ <rule groupId="com.github.spotbugs" artifactId="spotbugs" comparisonMethod="maven">
<ignoreVersions>
- <ignoreVersion type="regex">10\..*</ignoreVersion>
+ <ignoreVersion type="regex">4\.9\..*</ignoreVersion>
+ </ignoreVersions>
+ </rule>
+ <rule groupId="com.github.spotbugs" artifactId="spotbugs-annotations" comparisonMethod="maven">
+ <ignoreVersions>
+ <ignoreVersion type="regex">4\.9\..*</ignoreVersion>
</ignoreVersions>
</rule>
<!-- Pin testng version to 7.5.x (v7.6+ requires Java11) -->
<rule groupId="org.testng" artifactId="testng" comparisonMethod="maven">
<ignoreVersions>
- <ignoreVersion type="regex">7\.[6-9].*</ignoreVersion>
- <ignoreVersion type="regex">7\.10\..*</ignoreVersion>
+ <ignoreVersion type="regex">7\.[6-9]\..*</ignoreVersion>
+ <ignoreVersion type="regex">7\.1[0-1]\..*</ignoreVersion>
+ </ignoreVersions>
+ </rule>
+ <!-- Pin logback version to v1.3.x (v1.4.0+ requires Java11) -->
+ <rule groupId="ch.qos.logback" comparisonMethod="maven">
+ <ignoreVersions>
+ <ignoreVersion type="regex">1\.[4-9]\..*</ignoreVersion>
</ignoreVersions>
</rule>
- <!-- Pin git-commit-id-plugin version to final 4.x release version (v5+ requires Java11 -->
- <rule groupId="pl.project13.maven" artifactId="git-commit-id-plugin">
+ <!-- Pin hazendaz directory-maven-plugin to pre 1.2.x versions (v1.2.0+ requires Java11) -->
+ <rule groupId="com.github.hazendaz.maven" artifactId="directory-maven-plugin" comparisonMethod="maven">
<ignoreVersions>
- <ignoreVersion type="regex">4\.9\.9</ignoreVersion>
+ <ignoreVersion type="regex">1.2\..*</ignoreVersion>
</ignoreVersions>
</rule>
</rules>
=====================================
mvnw
=====================================
@@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+# JAVA_HOME - location of a JDK home dir, required when download maven via java source
+# MVNW_REPOURL - repo url base for downloading maven distribution
+# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+ [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+ native_path() { cygpath --path --windows "$1"; }
+ ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+ # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+ if [ -n "${JAVA_HOME-}" ]; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACCMD="$JAVA_HOME/jre/sh/javac"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ JAVACCMD="$JAVA_HOME/bin/javac"
+
+ if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+ echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+ return 1
+ fi
+ fi
+ else
+ JAVACMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v java
+ )" || :
+ JAVACCMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v javac
+ )" || :
+
+ if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+ echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+ return 1
+ fi
+ fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+ str="${1:-}" h=0
+ while [ -n "$str" ]; do
+ char="${str%"${str#?}"}"
+ h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+ str="${str#?}"
+ done
+ printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+ printf %s\\n "$1" >&2
+ exit 1
+}
+
+trim() {
+ # MWRAPPER-139:
+ # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+ # Needed for removing poorly interpreted newline sequences when running in more
+ # exotic environments such as mingw bash on Windows.
+ printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+ case "${key-}" in
+ distributionUrl) distributionUrl=$(trim "${value-}") ;;
+ distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+ esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+ MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+ case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+ *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+ :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+ :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+ :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+ *)
+ echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+ distributionPlatform=linux-amd64
+ ;;
+ esac
+ distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+ ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+ unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+ exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+ verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+ clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+ trap clean HUP INT TERM EXIT
+else
+ die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+ distributionUrl="${distributionUrl%.zip}.tar.gz"
+ distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+ verbose "Found wget ... using wget"
+ wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+ verbose "Found curl ... using curl"
+ curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+ verbose "Falling back to use Java to download"
+ javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+ targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+ cat >"$javaSource" <<-END
+ public class Downloader extends java.net.Authenticator
+ {
+ protected java.net.PasswordAuthentication getPasswordAuthentication()
+ {
+ return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+ }
+ public static void main( String[] args ) throws Exception
+ {
+ setDefault( new Downloader() );
+ java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+ }
+ }
+ END
+ # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+ verbose " - Compiling Downloader.java ..."
+ "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+ verbose " - Running Downloader.java ..."
+ "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+ distributionSha256Result=false
+ if [ "$MVN_CMD" = mvnd.sh ]; then
+ echo "Checksum validation is not supported for maven-mvnd." >&2
+ echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ elif command -v sha256sum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+ distributionSha256Result=true
+ fi
+ elif command -v shasum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+ distributionSha256Result=true
+ fi
+ else
+ echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+ echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ fi
+ if [ $distributionSha256Result = false ]; then
+ echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+ echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+ exit 1
+ fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+ unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+ tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
=====================================
mvnw.cmd
=====================================
@@ -0,0 +1,149 @@
+<# : batch portion
+ at REM ----------------------------------------------------------------------------
+ at REM Licensed to the Apache Software Foundation (ASF) under one
+ at REM or more contributor license agreements. See the NOTICE file
+ at REM distributed with this work for additional information
+ at REM regarding copyright ownership. The ASF licenses this file
+ at REM to you under the Apache License, Version 2.0 (the
+ at REM "License"); you may not use this file except in compliance
+ at REM with the License. You may obtain a copy of the License at
+ at REM
+ at REM http://www.apache.org/licenses/LICENSE-2.0
+ at REM
+ at REM Unless required by applicable law or agreed to in writing,
+ at REM software distributed under the License is distributed on an
+ at REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ at REM KIND, either express or implied. See the License for the
+ at REM specific language governing permissions and limitations
+ at REM under the License.
+ at REM ----------------------------------------------------------------------------
+
+ at REM ----------------------------------------------------------------------------
+ at REM Apache Maven Wrapper startup batch script, version 3.3.2
+ at REM
+ at REM Optional ENV vars
+ at REM MVNW_REPOURL - repo url base for downloading maven distribution
+ at REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+ at REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
+ at REM ----------------------------------------------------------------------------
+
+ at IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+ at SET __MVNW_CMD__=
+ at SET __MVNW_ERROR__=
+ at SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+ at SET PSModulePath=
+ at FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+ IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+ at SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+ at SET __MVNW_PSMODULEP_SAVE=
+ at SET __MVNW_ARG0_NAME__=
+ at SET MVNW_USERNAME=
+ at SET MVNW_PASSWORD=
+ at IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+ at echo Cannot start maven from wrapper >&2 && exit /b 1
+ at GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+ $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+ Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+ "maven-mvnd-*" {
+ $USE_MVND = $true
+ $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+ $MVN_CMD = "mvnd.cmd"
+ break
+ }
+ default {
+ $USE_MVND = $false
+ $MVN_CMD = $script -replace '^mvnw','mvn'
+ break
+ }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+ $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+ $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+ $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+ Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+ exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+ Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+ if ($TMP_DOWNLOAD_DIR.Exists) {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+ }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+ $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+ if ($USE_MVND) {
+ Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+ }
+ Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+ if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+ Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+ }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+ Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+ if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+ Write-Error "fail to move MAVEN_HOME"
+ }
+} finally {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
=====================================
pom.xml
=====================================
@@ -4,16 +4,16 @@
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>pom</packaging>
<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>
@@ -21,7 +21,7 @@
<developers>
<developer>
<name>PostGIS Development Team</name>
- <url>http://postgis.net</url>
+ <url>https://postgis.net</url>
</developer>
<developer>
<name>Phillip Ross</name>
@@ -35,7 +35,7 @@
<contributor>
<name>Hakan Tandogan</name>
<email>hakan at gurkensalat.com</email>
- <url>http://www.gurkensalat.com/</url>
+ <url>https://www.gurkensalat.com/</url>
<roles>
<role>Maven Packager</role>
</roles>
@@ -43,7 +43,6 @@
<contributor>
<name>Baris Ergun</name>
<email>barisergun75 at gmail.com</email>
- <url>http://www.barisergun.com/</url>
<roles>
<role>Maven Packager</role>
</roles>
@@ -56,14 +55,14 @@
<subscribe>postgis-users-subscribe at lists.osgeo.org</subscribe>
<unsubscribe>postgis-users-unsubscribe at lists.osgeo.org</unsubscribe>
<post>postgis-users at lists.osgeo.org</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>postgis-devel-subscribe at lists.osgeo.org</subscribe>
<unsubscribe>postgis-devel-unsubscribe at lists.osgeo.org</unsubscribe>
<post>postgis-devel at lists.osgeo.org</post>
- <archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
+ <archive>https://lists.osgeo.org/pipermail/postgis-devel/</archive>
</mailingList>
</mailingLists>
@@ -79,7 +78,7 @@
<url>https://github.com/postgis/postgis-java</url>
<connection>scm:git:git://github.com/postgis/postgis-java.git</connection>
<developerConnection>scm:git:git at github.com:postgis/postgis-java.git</developerConnection>
- <tag>postgis-java-aggregator-2024.1.0</tag>
+ <tag>postgis-java-aggregator-2025.1.0</tag>
</scm>
<issueManagement>
<system>GitHub Issues</system>
@@ -88,14 +87,14 @@
<distributionManagement>
<site>
<id>local-staging-site</id>
- <url>http://local-staging/</url>
+ <url>https://local-staging/</url>
</site>
</distributionManagement>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.min.version>8</java.min.version>
- <maven.min.version>3.8</maven.min.version>
+ <maven.min.version>3.9</maven.min.version>
<maven.test.skip>false</maven.test.skip>
<maven.integration.test.skip>false</maven.integration.test.skip>
<failsafe.forkCount>1</failsafe.forkCount>
@@ -108,7 +107,7 @@
<jxr.skip>false</jxr.skip>
<pmd.skip>true</pmd.skip>
<spotbugs.skip>true</spotbugs.skip>
- <test.container.image>postgis/postgis:16-3.4-alpine</test.container.image>
+ <test.container.image>postgis/postgis:17-3.5</test.container.image>
<test.db.username>postgis1</test.db.username>
<test.db.password>postgis1</test.db.password>
<test.db.name>postgis1</test.db.name>
@@ -116,50 +115,51 @@
<!-- Plugin versioning -->
<build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>
<directory-maven-plugin.version>1.0</directory-maven-plugin.version>
- <download-maven-plugin.version>1.9.0</download-maven-plugin.version>
- <exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>
+ <download-maven-plugin.version>1.13.0</download-maven-plugin.version>
+ <exec-maven-plugin.version>3.5.1</exec-maven-plugin.version>
<git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
- <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>
+ <jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
<maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
- <maven-archetype-plugin.version>3.2.1</maven-archetype-plugin.version>
+ <maven-archetype-plugin.version>3.4.0</maven-archetype-plugin.version>
<maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
- <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
- <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
- <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
- <maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>
- <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>
+ <maven-checkstyle-plugin.version>3.6.0</maven-checkstyle-plugin.version>
+ <maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
+ <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+ <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
+ <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
<maven-ear-plugin.version>3.3.0</maven-ear-plugin.version>
<maven-ejb-plugin.version>3.0.1</maven-ejb-plugin.version>
<maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
- <maven-failsafe-plugin.version>3.3.1</maven-failsafe-plugin.version>
- <maven-gpg-plugin.version>3.2.4</maven-gpg-plugin.version>
- <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
+ <maven-failsafe-plugin.version>3.5.3</maven-failsafe-plugin.version>
+ <maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
+ <maven-install-plugin.version>3.1.4</maven-install-plugin.version>
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
- <maven-jarsigner-plugin.version>3.0.0</maven-jarsigner-plugin.version>
- <maven-javadoc-plugin.version>3.8.0</maven-javadoc-plugin.version>
- <maven-jxr-plugin.version>3.4.0</maven-jxr-plugin.version>
- <maven-pmd-plugin.version>3.24.0</maven-pmd-plugin.version>
- <maven-project-info-reports-plugin.version>3.6.2</maven-project-info-reports-plugin.version>
+ <maven-jarsigner-plugin.version>3.1.0</maven-jarsigner-plugin.version>
+ <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+ <maven-jxr-plugin.version>3.6.0</maven-jxr-plugin.version>
+ <maven-pmd-plugin.version>3.26.0</maven-pmd-plugin.version>
+ <maven-project-info-reports-plugin.version>3.9.0</maven-project-info-reports-plugin.version>
<maven-release-plugin.version>3.1.1</maven-release-plugin.version>
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
- <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
+ <maven-site-plugin.version>3.21.0</maven-site-plugin.version>
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
- <maven-surefire-plugin.version>3.3.1</maven-surefire-plugin.version>
- <maven-surefire-report-plugin.version>3.3.1</maven-surefire-report-plugin.version>
+ <maven-surefire-plugin.version>3.5.3</maven-surefire-plugin.version>
+ <maven-surefire-report-plugin.version>3.5.3</maven-surefire-report-plugin.version>
<maven-war-plugin.version>3.4.0</maven-war-plugin.version>
- <spotbugs-maven-plugin.version>4.8.6.2</spotbugs-maven-plugin.version>
- <versions-maven-plugin.version>2.17.1</versions-maven-plugin.version>
+ <maven-wrapper-plugin.version>3.3.2</maven-wrapper-plugin.version>
+ <spotbugs-maven-plugin.version>4.8.6.6</spotbugs-maven-plugin.version>
+ <versions-maven-plugin.version>2.18.0</versions-maven-plugin.version>
<!-- Dependency versions -->
<dependency.checkstyle.version>9.3</dependency.checkstyle.version>
- <dependency.jts-version.version>1.19.0</dependency.jts-version.version>
- <dependency.logback.version>1.3.14</dependency.logback.version>
- <dependency.pmd.version>7.4.0</dependency.pmd.version>
- <dependency.postgresql-jdbc.version>42.7.3</dependency.postgresql-jdbc.version>
- <dependency.slf4j.version>2.0.13</dependency.slf4j.version>
+ <dependency.jts-version.version>1.20.0</dependency.jts-version.version>
+ <dependency.logback.version>1.3.15</dependency.logback.version>
+ <dependency.pmd.version>7.14.0</dependency.pmd.version>
+ <dependency.postgresql-jdbc.version>42.7.6</dependency.postgresql-jdbc.version>
+ <dependency.slf4j.version>2.0.17</dependency.slf4j.version>
<dependency.spatial4j.version>0.8</dependency.spatial4j.version>
<dependency.spotbugs.version>4.8.6</dependency.spotbugs.version>
- <dependency.testcontainers.version>1.20.1</dependency.testcontainers.version>
+ <dependency.testcontainers.version>1.21.1</dependency.testcontainers.version>
<dependency.testng.version>7.5.1</dependency.testng.version>
</properties>
@@ -461,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>
@@ -510,6 +510,11 @@
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-wrapper-plugin</artifactId>
+ <version>${maven-wrapper-plugin.version}</version>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
@@ -854,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>
@@ -904,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>
=====================================
postgis-jdbc-geometry/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<artifactId>postgis-geometry</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>jar</packaging>
<name>PostGIS Geometry</name>
@@ -21,7 +21,7 @@
<dependency>
<groupId>net.postgis.tools</groupId>
<artifactId>test-utils</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
postgis-jdbc-java2d/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<artifactId>postgis-jdbc-java2d</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>jar</packaging>
<name>postgis-jdbc-java2d</name>
@@ -19,12 +19,12 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</dependency>
<dependency>
<groupId>net.postgis.tools</groupId>
<artifactId>test-utils</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
postgis-jdbc-jts/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<artifactId>postgis-jdbc-jts</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>jar</packaging>
<name>Postgis JDBC Driver JTS Parser</name>
@@ -21,7 +21,7 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</dependency>
<dependency>
<groupId>org.locationtech.jts</groupId>
@@ -36,7 +36,7 @@
<dependency>
<groupId>net.postgis.tools</groupId>
<artifactId>test-utils</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
postgis-jdbc/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<artifactId>postgis-jdbc</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>jar</packaging>
<name>Postgis JDBC Driver</name>
@@ -21,7 +21,7 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-geometry</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
@@ -31,7 +31,7 @@
<dependency>
<groupId>net.postgis.tools</groupId>
<artifactId>test-utils</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
tools/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<artifactId>postgis-java-aggregator</artifactId>
<groupId>net.postgis</groupId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<artifactId>tools</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>pom</packaging>
<name>Tools</name>
=====================================
tools/smoketest/pom.xml
=====================================
@@ -5,11 +5,11 @@
<parent>
<artifactId>tools</artifactId>
<groupId>net.postgis</groupId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<artifactId>smoketest</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<packaging>jar</packaging>
<name>smoketest</name>
@@ -26,12 +26,12 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</dependency>
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc-java2d</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -46,7 +46,7 @@
<dependency>
<groupId>net.postgis.tools</groupId>
<artifactId>test-utils</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<scope>test</scope>
</dependency>
</dependencies>
=====================================
tools/test-utils/pom.xml
=====================================
@@ -5,12 +5,12 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>tools</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
</parent>
<groupId>net.postgis.tools</groupId>
<artifactId>test-utils</artifactId>
- <version>2024.1.0</version>
+ <version>2025.1.0</version>
<name>Test Utilities</name>
<description>Tools to facilities building and maintaining test suites</description>
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis-java/-/commit/0320a184314771f9d8bacda5d080d5c6d669a7b1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis-java/-/commit/0320a184314771f9d8bacda5d080d5c6d669a7b1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20250603/6d23b5f3/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list