Bundle ongres-* dependencies

The unversioned packages are provided by version 18 as of F43:

https://fedoraproject.org/wiki/Changes/PostgreSQL_18

.gitignore

@@ -28,3 +28,4 @@
 /postgresql-42.7.5-jdbc-src.tar.gz
 /postgresql-42.7.6-jdbc-src.tar.gz
 /postgresql-42.7.7-jdbc-src.tar.gz
+/postgresql-42.7.8-jdbc-src.tar.gz

postgresql-jdbc.spec

@@ -48,7 +48,7 @@
 
 Summary:        JDBC driver for PostgreSQL
 Name:           postgresql-jdbc
-Version:        42.7.7
+Version:        42.7.8
 Release:        %autorelease
 License:        BSD-2-Clause
 URL:            https://jdbc.postgresql.org/
@@ -57,26 +57,29 @@ Source1:        postgresql_jdbc_tests_init.sh
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
-Patch:          0001-Port-to-junit-5.13.patch
-
 Provides:       pgjdbc = %{version}-%{release}
 
 BuildRequires:  maven-local-openjdk25
 BuildRequires:  mvn(com.ongres.scram:scram-client)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-shade-plugin)
 BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-api)
-BuildRequires:  mvn(se.jiderhamn:classloader-leak-test-framework)
 
 %if %runselftest
-BuildRequires:  postgresql17-contrib
-BuildRequires:  postgresql17-test-rpm-macros
+BuildRequires:  postgresql-contrib
+BuildRequires:  postgresql-test-rpm-macros
 %endif
 
+# gettext is only needed if we try to update translations
+# BuildRequires:  gettext
+
 # TODO Remove in Fedora 46
 Obsoletes:      %{name}-javadoc < 42.7.4-9
 
-# gettext is only needed if we try to update translations
-# BuildRequires:  gettext
+Provides:       bundled(mvn(com.ongres.scram:scram-client)) = 3.2
+Provides:       bundled(mvn(com.ongres.scram:scram-common)) = 3.2
+Provides:       bundled(mvn(com.ongres.stringprep:saslprep)) = 2.2
+Provides:       bundled(mvn(com.ongres.stringprep:stringprep)) = 2.2
 
 %description
 PostgreSQL is an advanced Object-Relational database management system. The
@@ -95,12 +98,6 @@ This package contains tests for %{name}.
 # remove any binary libs
 find -type f \( -name "*.jar" -or -name "*.class" \) -delete
 
-%pom_remove_dep junit:junit
-%pom_remove_dep org.junit.vintage:junit-vintage-engine
-
-# Build parent POMs in the same Maven call.
-%pom_remove_plugin :maven-shade-plugin
-
 # compat symlink: requested by dtardon (libreoffice), reverts part of
 # 0af97ce32de877 commit.
 %mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql
@@ -145,7 +142,7 @@ opts="-DskipTests=true"
 
 %mvn_build -j -- $opts
 
-xmvn -Dmdep.outputFile=tests-classpath dependency:build-classpath --offline
+xmvn --offline -Dmdep.outputFile=tests-classpath dependency:build-classpath
 
 %install
 %mvn_install

sources

@@ -1 +1 @@
-SHA512 (postgresql-42.7.7-jdbc-src.tar.gz) = f94f858e1732a6b38bd748014ccc335570ff9db8da84b8277e114f974abea1046d264fe75cde965eb270c70fccd323695b147a8e69fb7603fdfb4a0be0c7cd39
+SHA512 (postgresql-42.7.8-jdbc-src.tar.gz) = 4860f6446960ad4d38af28a3cd38cbc6bdd53d8acdd0c20cc3141df3e7a4b41aad67293f19aac6ae6d9da351b7e6379a0a02261d8bb188e1daae914f7ba0139f