diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec index d29e8f1..ac7e132 100644 --- a/postgresql-jdbc.spec +++ b/postgresql-jdbc.spec @@ -49,7 +49,7 @@ Summary: JDBC driver for PostgreSQL Name: postgresql-jdbc Version: 42.2.18 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD URL: http://jdbc.postgresql.org/ @@ -59,13 +59,11 @@ Provides: pgjdbc = %version-%release BuildArch: noarch BuildRequires: java-devel >= 1.8 BuildRequires: maven-local -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-plugin-bundle +BuildRequires: maven-enforcer-plugin +BuildRequires: maven-plugin-bundle 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) @@ -106,6 +104,8 @@ find -type f \( -name "*.jar" -or -name "*.class" \) | xargs rm -f # Build parent POMs in the same Maven call. %pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-shade-plugin']" +%pom_remove_plugin -r :maven-javadoc-plugin + # compat symlink: requested by dtardon (libreoffice), reverts part of # 0af97ce32de877 commit. %mvn_file org.postgresql:postgresql %{name}/postgresql %{name} postgresql @@ -164,6 +164,9 @@ opts="-f" %changelog +* Wed Jun 30 2020 Ondrej Dubaj - 42.2.18-4 +- remove unnecessary maven-plugin-* dependencies (#1976951) + * Fri Apr 16 2021 Mohan Boddu - 42.2.18-3 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937