!7 [sync] PR-2: Upgrade to 42.2.25 for fix CVE-2022-21724

From: @openeuler-sync-bot 
Reviewed-by: @wangchong1995924 
Signed-off-by: @wangchong1995924

0000-disable-ConnectTimeoutTest.patch

@@ -1,13 +0,0 @@
-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
---- 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,
- 

9000-disable-the-failed-tests-that-caused-by-BEP.patch

@@ -1,40 +0,0 @@
-From c8a3de804253174624c6c7677958d307afa599df Mon Sep 17 00:00:00 2001
-From: wangjia <wangjia55@huawei.com>
-Date: Tue, 30 Apr 2019 19:14:28 -0400
-Subject: [PATCH] disable the failed tests that caused by BEP
-
----
- pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java | 3 ---
- 1 file changed, 0 insertions(+), 3 deletions(-)
-
-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 96890d0..d41578c 100644
---- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
-+++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
-@@ -88,7 +88,6 @@ import org.junit.runners.Suite;
-         OidValueOfTest.class,
- 
-         PreparedStatementTest.class,
--        StatementTest.class,
-         QuotationTest.class,
- 
-         ServerPreparedStmtTest.class,
-@@ -101,7 +101,6 @@ import org.junit.runners.Suite;
-         DeepBatchedInsertStatementTest.class,
-         JBuilderTest.class,
-         MiscTest.class,
--        NotifyTest.class,
-         DatabaseEncodingTest.class,
-         ClientEncodingTest.class,
- 
-@@ -118,7 +118,6 @@ import org.junit.runners.Suite;
-         IntervalTest.class,
-         GeometricTest.class,
- 
--        LoginTimeoutTest.class,
-         TestACL.class,
- 
-         // ConnectTimeoutTest.class,
--- 
-1.8.3.1
-

postgresql-jdbc.spec

@@ -1,15 +1,11 @@
 Name:		postgresql-jdbc
 Summary:	Postgresql JDBC Driver
-Version:	42.2.4
+Version:	42.2.25
-Release:	4
+Release:	1
 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
-Source1:	https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL1.1.5/pgjdbc-parent-poms-REL1.1.5.tar.gz
-
-Patch0:         0000-disable-ConnectTimeoutTest.patch
-Patch9000:      9000-disable-the-failed-tests-that-caused-by-BEP.patch
 
 BuildRequires:	maven-local java-comment-preprocessor properties-maven-plugin	classloader-leak-test-framework
 BuildRequires:	maven-enforcer-plugin maven-plugin-bundle maven-plugin-build-helper java-devel >= 1.8
@@ -35,19 +31,10 @@ This package contains the API Documentation for %{name}.
 %package_help
 
 %prep
-%setup -c -q -a 1
+%setup -c -q
-mv pgjdbc-REL%version/* .
+mv postgresql-%{version}-jdbc-src/* .
-mv pgjdbc-parent-poms-REL1.1.5 pgjdbc-parent-poms
+find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f
-
+%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']"
-%patch0 -p1
-%patch9000 -p1
-
-find -name "*.jar" -or -name "*.class" | xargs rm -f
-
-%pom_xpath_inject pom:modules "<module>./pgjdbc-parent-poms</module>"
-%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
 %mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql
 %mvn_package ":*{parent,versions,prevjre}*" __noinstall
 %mvn_alias org.postgresql:postgresql postgresql:postgresql
@@ -77,6 +64,10 @@ find %{_buildrootdir} -name "%{name}.xml" | xargs sed -i '/pgjdbc-aggregate.pom<
 %doc README.md
 
 %changelog
+* Wed Feb 16 2022 houyingchao <houyingchao@huawei.com> - 42.2.25-1
+- Upgrade to 42.2.25
+- Fix CVE-2022-21724
+
 * Thu Dec 11 2019 caomeng<caomeng5@huawei.com> - 42.2.4-4
 - Package init
 
@@ -96,4 +87,4 @@ find %{_buildrootdir} -name "%{name}.xml" | xargs sed -i '/pgjdbc-aggregate.pom<
 - Type:enhancement
 - ID:NA
 - SUG:NA
-- DESC:disable the failed tests that caused by BEP to repair binary diffrence
+- DESC:disable the failed tests that caused by BEP to repair binary diffrence