diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index bab2310..5804f84 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,31 @@ -/REL9.4.1209.tar.gz -/REL1.0.8.tar.gz +/pgjdbc-REL*.tar.gz +/pgjdbc-parent-poms-REL*.tar.gz +/pgjdbc-v42.3.0-rc2.tar.gz +/postgresql-42.2.15-jdbc-src.tar.gz +/postgresql-42.2.16-jdbc-src.tar.gz +/postgresql-42.2.18-jdbc-src.tar.gz +/postgresql-42.2.19-jdbc-src.tar.gz +/postgresql-42.2.23-jdbc-src.tar.gz +/postgresql-42.2.24-jdbc-src.tar.gz +/postgresql-42.3.0-jdbc-src.tar.gz +/postgresql-42.3.1-jdbc-src.tar.gz +/postgresql-42.3.2-jdbc-src.tar.gz +/postgresql-42.3.3-jdbc-src.tar.gz +/postgresql-42.3.4-jdbc-src.tar.gz +/postgresql-42.3.5-jdbc-src.tar.gz +/postgresql-42.3.6-jdbc-src.tar.gz +/postgresql-42.4.0-jdbc-src.tar.gz +/postgresql-42.4.1-jdbc-src.tar.gz +/postgresql-42.5.0-jdbc-src.tar.gz +/postgresql-42.5.1-jdbc-src.tar.gz +/postgresql-42.5.2-jdbc-src.tar.gz +/postgresql-42.6.0-jdbc-src.tar.gz +/postgresql-42.7.0-jdbc-src.tar.gz +/postgresql-42.7.1-jdbc-src.tar.gz +/postgresql-42.7.2-jdbc-src.tar.gz +/postgresql-42.7.3-jdbc-src.tar.gz +/postgresql-42.7.4-jdbc-src.tar.gz +/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 diff --git a/changelog b/changelog new file mode 100644 index 0000000..7b9217b --- /dev/null +++ b/changelog @@ -0,0 +1,369 @@ +* Thu Aug 29 2024 Marian Koncek - 42.7.4-1 +- Update to upstream version 42.7.4 + +* Fri Jul 19 2024 Fedora Release Engineering - 42.7.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Fri Mar 15 2024 Zuzana Miklankova - 42.7.3-1 +- rebase to version 42.7.3 + +* Tue Feb 27 2024 Jiri Vanek - 42.7.2-2 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Feb 21 2024 Zuzana Miklankova - 42.7.2-1 +- rebase to version 42.7.2 (bz#2265257) + +* Thu Jan 25 2024 Fedora Release Engineering - 42.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 42.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 08 2023 Zuzana Miklankova - 42.7.1-1 +- rebase to version 42.7.1 (bz#2253589) + +* Wed Nov 22 2023 Fedora Release Engineering - 42.7.0-1 +- rebase to version 42.7.0 (bz#2250965) + +* Fri Jul 21 2023 Fedora Release Engineering - 42.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue May 16 2023 Yaakov Selkowitz - 42.6.0-2 +- Remove unused BR: maven-clean-plugin + +* Mon Mar 20 2023 Zuzana Miklankova - 42.6.0-1 +- rebase to version 42.6.0 (bz#2167110) + +* Thu Feb 02 2023 Zuzana Miklankova - 42.5.2-1 +- rebase to version 42.5.2 (bz#2160979) + +* Fri Jan 20 2023 Fedora Release Engineering - 42.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Dec 05 2022 Zuzana Miklankova - 42.5.1-1 +- rebase to version 42.5.1 (bz#2147486) + +* Mon Aug 29 2022 Zuzana Miklankova - 42.5.0-1 +- rebase to version 42.5.0 (bz#2119382) + +* Thu Aug 04 2022 Zuzana Miklankova - 42.4.1-1 +- rebase to version 42.4.1 + +* Fri Jul 22 2022 Fedora Release Engineering - 42.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 42.4.0-2 +- Rebuilt for Drop i686 JDKs + +* Tue Jun 14 2022 Zuzana Miklankova - 42.4.0-1 +- rebase to version 42.4.0 + +* Wed May 25 2022 Zuzana Miklankova - 42.3.6-1 +- rebase to version 42.3.6 + +* Thu May 05 2022 Zuzana Miklankova - 42.3.5-1 +- rebase to version 42.3.5 + +* Tue Apr 19 2022 Zuzana Miklankova - 42.3.4-1 +- rebase to version 42.3.4 + +* Thu Feb 17 2022 Zuzana Miklankova - 42.3.3-1 +- rebase to version 42.3.3 + +* Fri Feb 11 2022 Zuzana Miklankova - 42.3.2-1 +- rebase to version 42.3.2 + +* Sat Feb 05 2022 Jiri Vanek - 42.3.1-3 +- Rebuilt for java-17-openjdk as system jdk + +* Fri Jan 21 2022 Fedora Release Engineering - 42.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Nov 03 2021 Zuzana Miklankova - 42.3.1-1 +- rebase to version 42.3.1 + +* Wed Oct 20 2021 Zuzana Miklankova - 42.3.0-1 +- rebase to version 42.3.0 + +* Mon Oct 04 2021 Zuzana Miklankova - 42.2.24-1 +- rebase to version 42.2.24 + +* Fri Jul 23 2021 Fedora Release Engineering - 42.2.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jul 21 2021 Ondrej Dubaj - 42.2.23-1 +- rebase to version 42.2.23 + +* Wed May 12 2021 Ondrej Dubaj - 42.2.19-2 +- remove maven-javadoc-plugin dependency + +* Sat Feb 20 2021 Ondrej Dubaj - 42.2.19-1 +- rebase to version 42.2.19 + +* Wed Jan 27 2021 Fedora Release Engineering - 42.2.18-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Oct 20 2020 Ondrej Dubaj - 42.2.18-1 +- rebase to version 42.2.18 + +* Wed Aug 26 2020 Ondrej Dubaj - 42.2.16-1 +- rebased to version 42.2.16 + +* Fri Jul 24 2020 Ondrej Dubaj - 42.2.15-1 +- rebased to version 42.2.15 + +* Fri Jul 24 2020 Ondrej Dubaj - 42.2.12-3 +- fixed javadoc build problem + added missing dependencies +- remove SSPIClient for windows API +- fixed XXE vulnerability (CVE-2020-13692) + +* Sat Jul 11 2020 Jiri Vanek - 42.2.12-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed May 13 2020 Ondrej Dubaj - 42.2.12-1 +- new upstream release + skip javadoc due to jdk-11 + +* Mon Mar 16 2020 Ondrej Dubaj - 42.2.11-1 +- new upstream release + +* Mon Mar 02 2020 Ondrej Dubaj - 42.3.0-1 +- new upstream release (rhbz#1800440) + +* Thu Jan 30 2020 Fedora Release Engineering - 42.2.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Dec 13 2019 Ondrej Dubaj - 42.2.9-1 +- new upstream release (rhbz#1782277) + +* Fri Sep 20 2019 Pavel Raiskup - 42.2.8-1 +- new upstream release (rhbz#1750766) + +* Fri Jul 26 2019 Fedora Release Engineering - 42.2.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Jun 25 2019 Jakub Janco - 42.2.6-1 +- new version + +* Sat Feb 02 2019 Fedora Release Engineering - 42.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Nov 21 2018 Pavel Raiskup - 42.2.5-1 +- new upstream release + +* Fri Aug 03 2018 Pavel Raiskup - 42.2.4-1 +- new upstream release (rhbz#1601193) + +* Fri Jul 13 2018 Pavel Raiskup - 42.2.3-1 +- new upstream release (rhbz#1600759) + +* Wed May 30 2018 Mikolaj Izdebski - 42.2.2-4 +- Remove and obsolete parent-poms subpackage + +* Fri Apr 20 2018 Pavel Raiskup - 42.2.2-3 +- provide postgresql.jar, as that's the upstream's artifactId + +* Fri Apr 13 2018 Pavel Raiskup - 42.2.2-2 +- BR postgresql-test-rpm-macros + +* Fri Mar 16 2018 Pavel Raiskup - 42.2.2-1 +- new upstream release + +* Fri Feb 09 2018 Fedora Release Engineering - 42.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Jan 26 2018 Pavel Raiskup - 42.2.1-1 +- new upstream release + +* Fri Jan 19 2018 Pavel Raiskup - 42.2.0-1 +- rebase to the latest upstream release +- nicer github source urls +- sync with upstream spec +- use new postgresql testing macros (rawhide only) + +* Wed Aug 23 2017 Pavel Raiskup - 42.1.4-1 +- rebase to latest upstream release + +* Thu Jul 27 2017 Fedora Release Engineering - 9.4.1212-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 9.4.1212-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Dec 22 2016 Pavel Raiskup - 9.4.1212-2 +- Disable unpredictable test to fix FTBFS (BZ#1406931), + patch by Merlin Mathesius + +* Thu Nov 03 2016 Pavel Raiskup - 9.4.1212-1 +- new release, rhbz#1377317, per announcement: + https://www.postgresql.org/message-id/CAB=Je-FjbvQ_MmAGmhZ-1sSMnodpjr9Uz6Q=faxqCxOvpRO-UQ@mail.gmail.com + +* Tue Oct 04 2016 Pavel Raiskup - 9.4.1210-2 +- depend on test macros from postgresql-setup + +* Thu Sep 08 2016 Pavel Raiskup - 9.4.1210-1 +- new release, rhbz#1374106, per announcement: + https://www.postgresql.org/message-id/CAB=Je-FzuqwDXLTT62VfzvTUhR4QTfLjmw2D5QfgaykDkhW7nw@mail.gmail.com + +* Mon Aug 29 2016 Pavel Raiskup - 9.4.1209-6 +- fix License, pgjdbc is BSD only + +* Thu Jul 21 2016 gil cattaneo 9.4.1209-5 +- fix postgresql-jdbc.jar symlink using javapackages macros +- adapt to current guideline +- install doc and license file in parent-poms sub package +- simplified runselftest check + +* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-4 +- restore one compat symlink + +* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-3 +- bump: for Mikolaj's fixes + +* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-2 +- update to latest release version, thanks to Pavel Kajaba, Michael Simacek and + Vladimir Sitnikov for big help +- fix Provides, remove old compatibility hacks + +* Thu Feb 04 2016 Fedora Release Engineering - 9.4.1200-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jun 18 2015 Fedora Release Engineering - 9.4.1200-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Feb 04 2015 Pavel Raiskup - 9.4.1200-1 +- rebase to most recent version (#1188827) + +* Mon Jul 14 2014 Pavel Raiskup - 9.3.1102-1 +- Rebase to most recent version (#1118667) +- revert back upstream commit for travis build + +* Sat Jun 07 2014 Fedora Release Engineering - 9.3.1101-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 19 2014 Pavel Raiskup - 9.3.1101-3 +- run upstream testsuite when '%%runselftest' defined + +* Wed Apr 23 2014 Mikolaj Izdebski - 9.3.1101-2 +- Add explicit requires on java-headless + +* Wed Apr 23 2014 Pavel Raiskup - 9.3.1101-1 +- Rebase to most recent version (#1090366) + +* Fri Mar 28 2014 Michael Simacek - 9.2.1002-5 +- Use Requires: java-headless rebuild (#1067528) + +* Tue Aug 06 2013 Pavel Raiskup - 9.2.1002-4 +- add javadoc subpackage + +* Tue Aug 06 2013 Pavel Raiskup - 9.2.1002-4 +- don't use removed macro %%add_to_maven_depmap (#992816) +- lint: trim-lines, reuse %%{name} macro, fedora-review fixes +- merge cleanup changes by Stano Ochotnicky + +* Sun Aug 04 2013 Fedora Release Engineering - 9.2.1002-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 9.2.1002-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Nov 14 2012 Tom Lane 9.2.1002-1 +- Update to build 9.2-1002 (just to correct mispackaging of source tarball) + +* Tue Nov 13 2012 Tom Lane 9.2.1001-1 +- Update to build 9.2-1001 for compatibility with PostgreSQL 9.2 + +* Sun Jul 22 2012 Tom Lane 9.1.902-1 +- Update to build 9.1-902 + +* Sat Jul 21 2012 Fedora Release Engineering - 9.1.901-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Feb 23 2012 Tom Lane 9.1.901-3 +- Change BuildRequires: java-1.6.0-openjdk-devel to just java-devel. + As of 9.1-901, upstream has support for JDBC4.1, so we don't have to + restrict to JDK6 anymore, and Fedora is moving to JDK7 +Resolves: #796580 + +* Sat Jan 14 2012 Fedora Release Engineering - 9.1.901-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Sep 12 2011 Tom Lane 9.1.901-1 +- Update to build 9.1-901 for compatibility with PostgreSQL 9.1 + +* Mon Aug 15 2011 Tom Lane 9.0.801-4 +- Add BuildRequires: java-1.6.0-openjdk-devel to ensure we have recent JDK +Related: #730588 +- Remove long-obsolete minimum versions from BuildRequires + +* Sun Jul 17 2011 Tom Lane 9.0.801-3 +- Switch to non-GCJ build, since GCJ is now deprecated in Fedora +Resolves: #722247 +- Use %%{_mavendepmapfragdir} to fix FTBFS with maven 3 + +* Wed Feb 09 2011 Fedora Release Engineering - 9.0.801-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Dec 29 2010 Tom Lane 9.0.801-1 +- Update to build 9.0-801 + +* Mon May 31 2010 Tom Lane 8.4.701-4 +- Update gcj_support sections to meet Packaging/GCJGuidelines; + fixes FTBFS in F-14 rawhide + +* Tue Nov 24 2009 Tom Lane 8.4.701-3 +- Seems the .pom file *must* have a package version number in it, sigh +Resolves: #538487 + +* Mon Nov 23 2009 Tom Lane 8.4.701-2 +- Add a .pom file to ease use by maven-based packages (courtesy Deepak Bhole) +Resolves: #538487 + +* Tue Aug 18 2009 Tom Lane 8.4.701-1 +- Update to build 8.4-701 + +* Sun Jul 26 2009 Fedora Release Engineering - 0:8.3.603-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Apr 21 2009 Tom Lane 8.3.603-3 +- Avoid multilib conflict caused by overeager attempt to rebuild translations + +* Thu Feb 26 2009 Fedora Release Engineering - 0:8.3.603-2.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Jul 9 2008 Tom "spot" Callaway 8.3.603-1.1 +- drop repotag + +* Tue Feb 12 2008 Tom Lane 8.3.603-1jpp +- Update to build 8.3-603 + +* Sun Aug 12 2007 Tom Lane 8.2.506-1jpp +- Update to build 8.2-506 + +* Tue Apr 24 2007 Tom Lane 8.2.505-1jpp +- Update to build 8.2-505 +- Work around 1.4 vs 1.5 versioning inconsistency + +* Fri Dec 15 2006 Tom Lane 8.2.504-1jpp +- Update to build 8.2-504 + +* Wed Aug 16 2006 Tom Lane 8.1.407-1jpp.4 +- Fix Requires: for rebuild-gcj-db (bz #202544) + +* Wed Aug 16 2006 Fernando Nasser 8.1.407-1jpp.3 +- Merge with upstream + +* Sat Jul 22 2006 Jakub Jelinek 8.1.407-1jpp.2 +- Rebuilt + +* Wed Jul 12 2006 Jesse Keating - 0:8.1.407-1jpp.1 +- rebuild + +* Wed Jun 14 2006 Tom Lane 8.1.407-1jpp +- Update to build 8.1-407 + +* Mon Mar 27 2006 Tom Lane 8.1.405-2jpp +- Back-patch upstream fix to support unspecified-type strings. + +* Thu Feb 16 2006 Tom Lane 8.1.405-1jpp +- Split postgresql-jdbc into its own SRPM (at last). +- Build it from source. Add support for gcj compilation. diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/disable-ConnectTimeoutTest.patch b/disable-ConnectTimeoutTest.patch deleted file mode 100644 index cf9fd32..0000000 --- a/disable-ConnectTimeoutTest.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java.ORIG 2016-12-21 14:09:40.340533352 -0600 -+++ pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java 2016-12-21 14:10:40.239090270 -0600 -@@ -112,7 +112,7 @@ - suite.addTestSuite(LoginTimeoutTest.class); - suite.addTestSuite(TestACL.class); - -- suite.addTestSuite(ConnectTimeoutTest.class); -+ // suite.addTestSuite(ConnectTimeoutTest.class); - - suite.addTestSuite(PGPropertyTest.class); - diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..36643ec --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,9 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: main +execute: + how: tmt +context: + jpv_flavor: generic diff --git a/plans/smoke.fmf b/plans/smoke.fmf new file mode 100644 index 0000000..79935d4 --- /dev/null +++ b/plans/smoke.fmf @@ -0,0 +1,10 @@ +summary: Basic smoke test +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/postgresql-jdbc.git +prepare: + how: install + package: + - java-21-openjdk-devel +execute: + how: tmt diff --git a/postgres-testing.sh b/postgres-testing.sh deleted file mode 100644 index cdaf65b..0000000 --- a/postgres-testing.sh +++ /dev/null @@ -1,173 +0,0 @@ -#! /bin/sh - -# Do some "integration" testing against running PostgreSQL server. - -# This file is to be sourced. - -: ${PGTESTS_DATADIR=`pwd`/datadir} -: ${PGTESTS_ADMIN=`id -u -n`} -: ${PGTESTS_ADMINDB=$PGTESTS_ADMIN} -: ${PGTESTS_ADMINPASS=$PGTESTS_ADMIN} -: ${PGTESTS_PORT=54321} -: ${PGTESTS_SOCKETDIR=/tmp} -: ${PGTESTS_USERS=test:test} -: ${PGTESTS_DATABASES=test:test} - -# Stop the old cluster and/or remove it's data. -: ${PGTESTS_STARTCLEANUP=:} - -# Cleanup once we exit the script. -: ${PGTESTS_CLEANUP=:} - -# Cleanup once we exit the script. -: ${PGTESTS_CLEANUP=:} - -export PGPORT=$PGTESTS_PORT -export PGHOST=$PGTESTS_SOCKETDIR - -warning () -{ - echo >&2 " ! $*" -} - - -__trap_cb () -{ - IFS=' ' - for __func in $__TRAP_ACTIONS - do - $__func - done -} -trap __trap_cb EXIT - - -__pgtests_initdb () -{ - initdb "$PGTESTS_DATADIR" -U "$PGTESTS_ADMIN" \ - --auth-local=peer --auth-host=md5 \ - ${PGTESTS_LOCALE+--locale="$PGTESTS_LOCALE"} -} - - -__pgtests_start () -{ - pg_ctl -D "$PGTESTS_DATADIR" -l "$PGTESTS_DATADIR"/start.log start -o "-k $PGTESTS_SOCKETDIR -p $PGTESTS_PORT" -w -} - - -__pgtests_create_admins_db () -{ - createdb -h "$PGTESTS_SOCKETDIR" "$PGTESTS_ADMINDB" --owner "$PGTESTS_ADMIN" -p "$PGTESTS_PORT" -} - - -__pgtests_passwd() -{ - psql -d postgres --set=user="$1" --set=pass="$2" -tA \ - <<<"ALTER USER :\"user\" WITH ENCRYPTED PASSWORD :'pass';" -} - -pgtests_start () -{ - unset __TRAP_ACTIONS - - if $PGTESTS_STARTCLEANUP; then - # We don't plan to be serious here. This pgtests_* effort is just to - # ease _testing_ against running postgresql server without too much - # writing. - if test -f "$PGTESTS_DATADIR"/postmaster.pid; then - # Give it a try. - warning "Seems like server works, trying to stop." - pg_ctl stop -D "$PGTESTS_DATADIR" -w - fi - - # Cleanup testing directory - if test -e "$PGTESTS_DATADIR"; then - warning "Removing old data directory." - rm -r "$PGTESTS_DATADIR" - fi - fi - - __pgtests_initdb && __TRAP_ACTIONS="pgtests_cleanup $__TRAP_ACTIONS" - __pgtests_start && __TRAP_ACTIONS="pgtests_stop $__TRAP_ACTIONS" - __pgtests_create_admins_db - - __pgtests_passwd "$PGTESTS_ADMIN" "$PGTESTS_ADMINPASS" - - - for _pgt_user in $PGTESTS_USERS - do - save_IFS=$IFS - IFS=: - _user= - _pass= - for _part in $_pgt_user - do - if test -z "$_user"; then - _user=$_part - else - _pass=$_part - fi - done - - createuser "$_user" - __pgtests_passwd "$_user" "$_pass" - IFS=$save_IFS - done - - - for _pgt_db in $PGTESTS_DATABASES - do - save_IFS=$IFS - IFS=: - _db= - _user= - for _part in $_pgt_db - do - if test -z "$_user"; then - _user=$_part - else - _db=$_part - fi - done - - createdb "$_db" --owner "$_part" - - IFS=$save_IFS - done -} - - -__clean_trap_action () -{ - __new_actions= - for __action in $__TRAP_ACTIONS - do - if test "$__action" = "$1"; then - : - else - __new_actions="$__action $__new_actions" - fi - done - - __TRAP_ACTIONS=$__new_actions -} - - -pgtests_cleanup () -{ - if $PGTESTS_CLEANUP && $PGTESTS_AUTOSTOP; then - rm -r "$PGTESTS_DATADIR" - fi - __clean_trap_action pgtests_cleanup -} - - -pgtests_stop () -{ - if $PGTESTS_AUTOSTOP; then - pg_ctl stop -D "$PGTESTS_DATADIR" -w - fi - __clean_trap_action pgtests_stop -} diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index 10a2136..0b0d226 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -31,110 +31,95 @@ # Configuration for rpmbuild, might be specified by options # like e.g. 'rpmbuild --define "runselftest 0"'. +# ============================================================================= +# IMPORTANT NOTE: This spec file is maintained on two places -- in native +# Fedora repo [1] and in pgjdbc upstream [2]. Please, keep that in sync +# (manual effort!) so both Fedora and Upstream can benefit from automatic +# packaging CI, this is now done in [3] Copr project. +# [1] https://src.fedoraproject.org/rpms/postgresql-jdbc +# [2] https://github.com/pgjdbc/pgjdbc/tree/master/packaging/rpm +# [3] https://copr.fedorainfracloud.org/coprs/g/pgjdbc/pgjdbc-travis/ +# ============================================================================ + %{!?runselftest:%global runselftest 1} +%global section devel +%global source_path pgjdbc/src/main/java/org/postgresql -%global section devel -%global upstreamrel 1209 -%global upstreammajor 9.4 -%global source_path pgjdbc/src/main/java/org/postgresql -%global parent_ver 1.0.8 -%global parent_poms_builddir ./pgjdbc-parent-poms +Summary: JDBC driver for PostgreSQL +Name: postgresql-jdbc +Version: 42.7.8 +Release: %autorelease +License: BSD-2-Clause +URL: https://jdbc.postgresql.org/ +Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/postgresql-%{version}-jdbc-src.tar.gz +Source1: postgresql_jdbc_tests_init.sh +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -%global pgjdbc_mvn_options -DwaffleEnabled=false -DosgiEnabled=false \\\ - -DexcludePackageNames=org.postgresql.osgi:org.postgresql.sspi +Provides: pgjdbc = %{version}-%{release} -Summary: JDBC driver for PostgreSQL -Name: postgresql-jdbc -Version: %upstreammajor.%{upstreamrel} -Release: 6%{?dist} -# ASL 2.0 applies only to postgresql-jdbc.pom file, the rest is BSD -License: BSD and ASL 2.0 -URL: http://jdbc.postgresql.org/ - -Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%version.tar.gz -Source1: postgres-testing.sh - -# Upstream moved parent pom.xml into separate project (even though there is only -# one dependant project on it?). Let's try to not complicate packaging by -# having separate spec file for it, too. -Source2: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver.tar.gz - -# disable test that makes unpredictable assumptions about non-routable IPs -# See https://github.com/pgjdbc/pgjdbc/issues/556 -Patch0: disable-ConnectTimeoutTest.patch - -BuildArch: noarch -BuildRequires: java-devel >= 1.8 -BuildRequires: maven-local -BuildRequires: java-comment-preprocessor -BuildRequires: properties-maven-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-plugin-bundle -BuildRequires: maven-plugin-build-helper +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) %if %runselftest -BuildRequires: postgresql-server -BuildRequires: postgresql-contrib +BuildRequires: postgresql-contrib +BuildRequires: postgresql-test-rpm-macros %endif # gettext is only needed if we try to update translations -#BuildRequires: gettext +# BuildRequires: gettext + +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 42.7.4-9 + +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 postgresql-jdbc package includes the .jar files needed for -Java programs to access a PostgreSQL database. +PostgreSQL is an advanced Object-Relational database management system. The +postgresql-jdbc package includes the .jar files needed for Java programs to +access a PostgreSQL database. +%package tests +Summary: Tests for %{name} -%package parent-poms -Summary: Build dependency management for PostgreSQL JDBC driver. - -%description parent-poms -Pom files bringing dependencies required for successful PostgreSQL JDBC driver -build. - - -%package javadoc -Summary: API docs for %{name} - -%description javadoc -This package contains the API Documentation for %{name}. - +%description tests +This package contains tests for %{name}. %prep -%setup -c -q -a 2 -n pgjdbc-REL%version - -mv pgjdbc-REL%version/* . -mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms - -%patch0 +%autosetup -p1 -n postgresql-%{version}-jdbc-src # remove any binary libs -find -name "*.jar" -or -name "*.class" | xargs rm -f - -%pom_disable_module ubenchmark - -# Build parent POMs in the same Maven call. -%pom_xpath_inject pom:modules "%parent_poms_builddir" -%pom_xpath_inject pom:parent "pgjdbc-parent-poms/pgjdbc-versions" -%pom_xpath_set pom:relativePath ../pgjdbc-parent-poms/pgjdbc-core-parent pgjdbc +find -type f \( -name "*.jar" -or -name "*.class" \) -delete # compat symlink: requested by dtardon (libreoffice), reverts part of # 0af97ce32de877 commit. -%mvn_file org.postgresql:postgresql %{name}/postgresql %{name} - -# Parent POMs should be installed in a separate subpackage. -%mvn_package ":*{parent,versions,prevjre}*" parent-poms +%mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql # For compat reasons, make Maven artifact available under older coordinates. %mvn_alias org.postgresql:postgresql postgresql:postgresql -# Hack #1! This directory is missing for some reason, it is most probably some -# misunderstanding between maven, maven-compiler-plugin and -# java-comment-preprocessor? Not solved yet. See rhbz#1325060. -mkdir -p pgjdbc/target/generated-sources/annotations +# remove unmet dependency +%pom_remove_dep uk.org.webcompere:system-stubs-jupiter +# remove tests that depend on the system-stubs-jupiter +grep -l -r '^import uk\.org\.webcompere\.systemstubs' src/test | xargs rm -v +# Install -tests Jar as well +%pom_xpath_inject 'pom:build/pom:plugins/pom:plugin[pom:artifactId="maven-jar-plugin"]' ' + + + + test-jar + + +' +%mvn_package org.postgresql:postgresql::tests: tests %build # Ideally we would run "sh update-translations.sh" here, but that results @@ -146,212 +131,34 @@ mkdir -p pgjdbc/target/generated-sources/annotations # Include PostgreSQL testing methods and variables. %if %runselftest . %{SOURCE1} - -PGTESTS_LOCALE=C.UTF-8 - -cat < build.local.properties -server=localhost -port=$PGTESTS_PORT -database=test -username=test -password=test -privilegedUser=$PGTESTS_ADMIN -privilegedPassword=$PGTESTS_ADMINPASS -preparethreshold=5 -loglevel=0 -protocolVersion=0 -EOF +setup_build_local_properties > build.local.properties # Start the local PG cluster. -pgtests_start +%postgresql_tests_start %else -# -f is equal to -Dmaven.test.skip=true -opts="-f" +# NOTE this parameter skips running tests but still compiles them +opts="-DskipTests=true" %endif -%mvn_build $opts -- %pgjdbc_mvn_options +%mvn_build -j -- $opts +xmvn --offline -Dmdep.outputFile=tests-classpath dependency:build-classpath %install %mvn_install - +install -m 644 -D tests-classpath %{buildroot}%{_datadir}/%{name}-tests/classpath +install -m 644 -D -t %{buildroot}%{_datadir}/%{name}-tests build.properties ssltest.properties +cp -r -t %{buildroot}%{_datadir}/%{name}-tests certdir +install -m 755 -D -t %{buildroot}%{_libexecdir}/%{name}-tests %{SOURCE1} %files -f .mfiles %license LICENSE %doc README.md - -%files parent-poms -f .mfiles-parent-poms +%files tests -f .mfiles-tests %license LICENSE -%doc pgjdbc-parent-poms/CHANGELOG.md pgjdbc-parent-poms/README.md - - -%files javadoc -f .mfiles-javadoc -%license LICENSE - +%{_datadir}/%{name}-tests +%{_libexecdir}/%{name}-tests %changelog -* Thu Dec 22 2016 Pavel Raiskup - 9.4.1209-6 -- Disable unpredictable test to fix FTBFS (BZ#1406931), - patch by Merlin Mathesius - -* Thu Jul 21 2016 gil cattaneo 9.4.1209-5 -- fix postgresql-jdbc.jar symlink using javapackages macros -- adapt to current guideline -- install doc and license file in parent-poms sub package -- simplified runselftest check - -* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-4 -- restore one compat symlink - -* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-3 -- bump: for Mikolaj's fixes - -* Wed Jul 20 2016 Pavel Raiskup - 9.4.1209-2 -- update to latest release version, thanks to Pavel Kajaba, Michael Simacek and - Vladimir Sitnikov for big help -- fix Provides, remove old compatibility hacks - -* Thu Feb 04 2016 Fedora Release Engineering - 9.4.1200-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jun 18 2015 Fedora Release Engineering - 9.4.1200-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 04 2015 Pavel Raiskup - 9.4.1200-1 -- rebase to most recent version (#1188827) - -* Mon Jul 14 2014 Pavel Raiskup - 9.3.1102-1 -- Rebase to most recent version (#1118667) -- revert back upstream commit for travis build - -* Sat Jun 07 2014 Fedora Release Engineering - 9.3.1101-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 19 2014 Pavel Raiskup - 9.3.1101-3 -- run upstream testsuite when '%%runselftest' defined - -* Wed Apr 23 2014 Mikolaj Izdebski - 9.3.1101-2 -- Add explicit requires on java-headless - -* Wed Apr 23 2014 Pavel Raiskup - 9.3.1101-1 -- Rebase to most recent version (#1090366) - -* Fri Mar 28 2014 Michael Simacek - 9.2.1002-5 -- Use Requires: java-headless rebuild (#1067528) - -* Tue Aug 06 2013 Pavel Raiskup - 9.2.1002-4 -- add javadoc subpackage - -* Tue Aug 06 2013 Pavel Raiskup - 9.2.1002-4 -- don't use removed macro %%add_to_maven_depmap (#992816) -- lint: trim-lines, reuse %%{name} macro, fedora-review fixes -- merge cleanup changes by Stano Ochotnicky - -* Sun Aug 04 2013 Fedora Release Engineering - 9.2.1002-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 9.2.1002-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Nov 14 2012 Tom Lane 9.2.1002-1 -- Update to build 9.2-1002 (just to correct mispackaging of source tarball) - -* Tue Nov 13 2012 Tom Lane 9.2.1001-1 -- Update to build 9.2-1001 for compatibility with PostgreSQL 9.2 - -* Sun Jul 22 2012 Tom Lane 9.1.902-1 -- Update to build 9.1-902 - -* Sat Jul 21 2012 Fedora Release Engineering - 9.1.901-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Feb 23 2012 Tom Lane 9.1.901-3 -- Change BuildRequires: java-1.6.0-openjdk-devel to just java-devel. - As of 9.1-901, upstream has support for JDBC4.1, so we don't have to - restrict to JDK6 anymore, and Fedora is moving to JDK7 -Resolves: #796580 - -* Sat Jan 14 2012 Fedora Release Engineering - 9.1.901-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Sep 12 2011 Tom Lane 9.1.901-1 -- Update to build 9.1-901 for compatibility with PostgreSQL 9.1 - -* Mon Aug 15 2011 Tom Lane 9.0.801-4 -- Add BuildRequires: java-1.6.0-openjdk-devel to ensure we have recent JDK -Related: #730588 -- Remove long-obsolete minimum versions from BuildRequires - -* Sun Jul 17 2011 Tom Lane 9.0.801-3 -- Switch to non-GCJ build, since GCJ is now deprecated in Fedora -Resolves: #722247 -- Use %%{_mavendepmapfragdir} to fix FTBFS with maven 3 - -* Wed Feb 09 2011 Fedora Release Engineering - 9.0.801-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 29 2010 Tom Lane 9.0.801-1 -- Update to build 9.0-801 - -* Mon May 31 2010 Tom Lane 8.4.701-4 -- Update gcj_support sections to meet Packaging/GCJGuidelines; - fixes FTBFS in F-14 rawhide - -* Tue Nov 24 2009 Tom Lane 8.4.701-3 -- Seems the .pom file *must* have a package version number in it, sigh -Resolves: #538487 - -* Mon Nov 23 2009 Tom Lane 8.4.701-2 -- Add a .pom file to ease use by maven-based packages (courtesy Deepak Bhole) -Resolves: #538487 - -* Tue Aug 18 2009 Tom Lane 8.4.701-1 -- Update to build 8.4-701 - -* Sun Jul 26 2009 Fedora Release Engineering - 0:8.3.603-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Tue Apr 21 2009 Tom Lane 8.3.603-3 -- Avoid multilib conflict caused by overeager attempt to rebuild translations - -* Thu Feb 26 2009 Fedora Release Engineering - 0:8.3.603-2.1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Jul 9 2008 Tom "spot" Callaway 8.3.603-1.1 -- drop repotag - -* Tue Feb 12 2008 Tom Lane 8.3.603-1jpp -- Update to build 8.3-603 - -* Sun Aug 12 2007 Tom Lane 8.2.506-1jpp -- Update to build 8.2-506 - -* Tue Apr 24 2007 Tom Lane 8.2.505-1jpp -- Update to build 8.2-505 -- Work around 1.4 vs 1.5 versioning inconsistency - -* Fri Dec 15 2006 Tom Lane 8.2.504-1jpp -- Update to build 8.2-504 - -* Wed Aug 16 2006 Tom Lane 8.1.407-1jpp.4 -- Fix Requires: for rebuild-gcj-db (bz #202544) - -* Wed Aug 16 2006 Fernando Nasser 8.1.407-1jpp.3 -- Merge with upstream - -* Sat Jul 22 2006 Jakub Jelinek 8.1.407-1jpp.2 -- Rebuilt - -* Wed Jul 12 2006 Jesse Keating - 0:8.1.407-1jpp.1 -- rebuild - -* Wed Jun 14 2006 Tom Lane 8.1.407-1jpp -- Update to build 8.1-407 - -* Mon Mar 27 2006 Tom Lane 8.1.405-2jpp -- Back-patch upstream fix to support unspecified-type strings. - -* Thu Feb 16 2006 Tom Lane 8.1.405-1jpp -- Split postgresql-jdbc into its own SRPM (at last). -- Build it from source. Add support for gcj compilation. +%autochangelog diff --git a/postgresql_jdbc_tests_init.sh b/postgresql_jdbc_tests_init.sh new file mode 100755 index 0000000..a711672 --- /dev/null +++ b/postgresql_jdbc_tests_init.sh @@ -0,0 +1,24 @@ +#!/usr/bin/bash + +# Before running tests, source this file. +# Call the function `setup_build_local_properties` and redirect its output into +# the file `build.local.properties` and run the tests in the same directory. + +. /usr/share/postgresql-setup/postgresql_pkg_tests.sh + +PGTESTS_LOCALE=C.UTF-8 + +function setup_build_local_properties +{ +cat << EOF +test.url.PGHOST=localhost +test.url.PGPORT=$PGTESTS_PORT +test.url.PGDBNAME=test +user=test +password=test +privilegedUser=$PGTESTS_ADMIN +privilegedPassword=$PGTESTS_ADMINPASS +preparethreshold=5 +loglevel=0 +EOF +} diff --git a/sources b/sources index ca19b55..5ede387 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c69ee412c0465529eb0c2f0d29b9e0a7 REL9.4.1209.tar.gz -c15959ae73c9afc52b77897b26216f97 REL1.0.8.tar.gz +SHA512 (postgresql-42.7.8-jdbc-src.tar.gz) = 4860f6446960ad4d38af28a3cd38cbc6bdd53d8acdd0c20cc3141df3e7a4b41aad67293f19aac6ae6d9da351b7e6379a0a02261d8bb188e1daae914f7ba0139f