diff --git a/.gitignore b/.gitignore
index 71f315d..6256606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
/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
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index b1f4b1c..6ecdb3b 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -43,41 +43,34 @@
%{!?runselftest:%global runselftest 1}
-
%global section devel
%global source_path pgjdbc/src/main/java/org/postgresql
-%global parent_ver 1.1.6
-%global parent_poms_builddir ./pgjdbc-parent-poms
-
-%global pgjdbc_mvn_options -DwaffleEnabled=false -DosgiEnabled=false \\\
- -DexcludePackageNames=org.postgresql.osgi:org.postgresql.sspi -Dmaven.javadoc.skip=true
Summary: JDBC driver for PostgreSQL
Name: postgresql-jdbc
-Version: 42.2.12
+Version: 42.2.18
Release: 1%{?dist}
License: BSD
URL: http://jdbc.postgresql.org/
-Source0: https://github.com/pgjdbc/pgjdbc/archive/REL%{version}/pgjdbc-REL%{version}.tar.gz
+Source0: https://repo1.maven.org/maven2/org/postgresql/postgresql/%{version}/postgresql-%{version}-jdbc-src.tar.gz
Provides: pgjdbc = %version-%release
-# 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.
-Source1: https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver/pgjdbc-parent-poms-REL%{parent_ver}.tar.gz
-
BuildArch: noarch
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local
-BuildRequires: java-comment-preprocessor
+BuildRequires: maven-javadoc-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-plugin-bundle
-BuildRequires: maven-plugin-build-helper
BuildRequires: classloader-leak-test-framework
BuildRequires: mvn(com.ongres.scram:client)
BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
+BuildRequires: mvn(org.apache.maven.surefire:surefire-junit-platform)
+BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api)
+BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine)
+BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params)
+BuildRequires: mvn(org.junit.vintage:junit-vintage-engine)
%if %runselftest
BuildRequires: postgresql-contrib
@@ -103,40 +96,23 @@ This package contains the API Documentation for %{name}.
%prep
-%setup -c -q -a 1
-
-mv pgjdbc-REL%version/* .
-mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms
+%setup -c -q
+mv postgresql-%{version}-jdbc-src/* .
# remove any binary libs
-find -name "*.jar" -or -name "*.class" | xargs rm -f
+find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f
# 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
-%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
-
+%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']"
# compat symlink: requested by dtardon (libreoffice), reverts part of
# 0af97ce32de877 commit.
%mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql
-# Parent POMs should not be installed.
-%mvn_package ":*{parent,versions,prevjre}*" __noinstall
-
# 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
-
%build
# Ideally we would run "sh update-translations.sh" here, but that results
@@ -171,7 +147,7 @@ EOF
opts="-f"
%endif
-%mvn_build $opts -- %pgjdbc_mvn_options
+%mvn_build $opts --xmvn-javadoc
%install
@@ -183,11 +159,24 @@ opts="-f"
%doc README.md
-#%files javadoc -f .mfiles-javadoc
+%files javadoc -f .mfiles-javadoc
%license LICENSE
%changelog
+* 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-2
+- fixed XXE vulnerability (CVE-2020-13692)
+- fixed javadoc build problem
+
* Wed May 13 2020 Ondrej Dubaj - 42.2.12-1
- new upstream release + skip javadoc due to jdk-11
diff --git a/sources b/sources
index 299eea8..59f962f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (pgjdbc-REL42.2.12.tar.gz) = 60f93e02e7f6f507e2bec649c6a28c4893a03eca975e9a2755ce9fda4b5bb525adb791359efad1cfb3d0c5d0af036092552c3b6b6a61a98eb1cb93df6e5f4d3f
-SHA512 (pgjdbc-parent-poms-REL1.1.6.tar.gz) = 38e34a167744476568220e979bbc4139e43537f693e5e3e969ce58dc79d5b6361e92918d7f235ae9c00786b6997ad6bd98c6b680a6e59c5219da00b8b9b5760d
+SHA512 (postgresql-42.2.18-jdbc-src.tar.gz) = 694458f9b58a1470f0fd2c77870bf73f21818a5112d446ddabb819730616be7e2f038ed132c970ba4285fb4c956c4e8a888b664270eb6493510d1e14d30a4961