new upstream release
Resolves: rhbz#1750766 Version: 42.2.8-1
This commit is contained in:
parent
c297499ea0
commit
07f6edc725
@ -1,13 +1,13 @@
|
||||
diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
|
||||
index 188183a..c0e4cca 100644
|
||||
index 01d9fbf..f0c956d 100644
|
||||
--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
|
||||
+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
|
||||
@@ -104,7 +104,7 @@ import org.junit.runners.Suite;
|
||||
LoginTimeoutTest.class,
|
||||
TestACL.class,
|
||||
|
||||
- ConnectTimeoutTest.class,
|
||||
+ // ConnectTimeoutTest.class,
|
||||
|
||||
PGPropertyTest.class,
|
||||
|
||||
@@ -47,7 +47,7 @@ import org.junit.runners.Suite;
|
||||
CommandCompleteParserTest.class,
|
||||
ConcurrentStatementFetch.class,
|
||||
ConnectionTest.class,
|
||||
- ConnectTimeoutTest.class,
|
||||
+ // ConnectTimeoutTest.class,
|
||||
CopyLargeFileTest.class,
|
||||
CopyTest.class,
|
||||
CursorFetchTest.class,
|
||||
|
@ -1,12 +0,0 @@
|
||||
diff -ru pgjdbc-REL42.2.6/pgjdbc/pom.xml pgjdbc-REL42.2.6-edit/pgjdbc/pom.xml
|
||||
--- pgjdbc-REL42.2.6/pgjdbc/pom.xml 2019-06-19 21:49:52.000000000 +0200
|
||||
+++ pgjdbc-REL42.2.6-edit/pgjdbc/pom.xml 2019-06-25 13:46:05.912225119 +0200
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>org.postgresql</groupId>
|
||||
<artifactId>pgjdbc-core-parent</artifactId>
|
||||
- <version>1.1.5</version>
|
||||
+ <version>1.1.6</version>
|
||||
<relativePath />
|
||||
</parent>
|
||||
|
@ -54,8 +54,8 @@
|
||||
|
||||
Summary: JDBC driver for PostgreSQL
|
||||
Name: postgresql-jdbc
|
||||
Version: 42.2.6
|
||||
Release: 2%{?dist}
|
||||
Version: 42.2.8
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
URL: http://jdbc.postgresql.org/
|
||||
|
||||
@ -70,13 +70,11 @@ Source1: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver/pgj
|
||||
# disable test that makes unpredictable assumptions about non-routable IPs
|
||||
# See https://github.com/pgjdbc/pgjdbc/issues/556
|
||||
Patch0: disable-ConnectTimeoutTest.patch
|
||||
patch1: fix-parent-pom-version.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
|
||||
@ -115,7 +113,6 @@ mv pgjdbc-REL%version/* .
|
||||
mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
# remove any binary libs
|
||||
find -name "*.jar" -or -name "*.class" | xargs rm -f
|
||||
@ -125,6 +122,10 @@ find -name "*.jar" -or -name "*.class" | xargs rm -f
|
||||
%pom_xpath_inject pom:parent "<relativePath>pgjdbc-parent-poms/pgjdbc-versions</relativePath>"
|
||||
%pom_xpath_set pom:relativePath ../pgjdbc-parent-poms/pgjdbc-core-parent pgjdbc
|
||||
%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" pgjdbc
|
||||
%pom_remove_plugin :karaf-maven-plugin pgjdbc
|
||||
%pom_remove_plugin :properties-maven-plugin pgjdbc-parent-poms/pgjdbc-core-parent
|
||||
%pom_remove_plugin :properties-maven-plugin pgjdbc-parent-poms/pgjdbc-versions
|
||||
|
||||
|
||||
# compat symlink: requested by dtardon (libreoffice), reverts part of
|
||||
# 0af97ce32de877 commit.
|
||||
@ -192,6 +193,9 @@ opts="-f"
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Sep 20 2019 Pavel Raiskup <praiskup@redhat.com> - 42.2.8-1
|
||||
- new upstream release (rhbz#1750766)
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 42.2.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (pgjdbc-REL42.2.6.tar.gz) = 09979f1ffea4768afc3d688a0b19d2382853ada2cd68bd583a6ee4d17b39f486abf70c3073dd36367ab47f40476b37190e50dd47b0eee289d73891d3e70016cc
|
||||
SHA512 (pgjdbc-REL42.2.8.tar.gz) = e66dc4856b9e2410a1b3c03c350b9f2db9d01eaa9a29123d37077b5f50bf85bc4eaa5c85ad196b677c7c1651ba65d3449f233f397f97b0cd6a0cf68100972d3a
|
||||
SHA512 (pgjdbc-parent-poms-REL1.1.6.tar.gz) = 38e34a167744476568220e979bbc4139e43537f693e5e3e969ce58dc79d5b6361e92918d7f235ae9c00786b6997ad6bd98c6b680a6e59c5219da00b8b9b5760d
|
||||
|
Loading…
Reference in New Issue
Block a user