postgresql-jdbc.git / summary / log / commit / refs

commit    1fd6c4fe5ccc93ab7d08bf77bcd5344bc60dd334
Author:   Pavel Raiskup <praiskup@redhat.com>
Date:     Thu Nov 30 10:47:12 2017 +0000

    packaging: rpm_ci: don't shade scram jar into pgjdbc
    
    Drop the maven-shade-plugin dependency entirely.
    
    Complements: 4e0cdc13ec659f


 packaging/rpm/postgresql-jdbc.spec.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/rpm/postgresql-jdbc.spec.tpl b/packaging/rpm/postgresql-jdbc.spec.tpl
index 4d43549e..0bb4f2a5 100644
--- a/packaging/rpm/postgresql-jdbc.spec.tpl
+++ b/packaging/rpm/postgresql-jdbc.spec.tpl
@@ -69,7 +69,6 @@ BuildRequires:	maven-plugin-build-helper
 BuildRequires:	classloader-leak-test-framework
 
 BuildRequires:	mvn(com.ongres.scram:client)
-BuildRequires:	mvn(org.apache.maven.plugins:maven-shade-plugin)
 
 %if %runselftest
 BuildRequires:	postgresql-contrib
@@ -116,6 +115,7 @@ find -name "*.jar" -or -name "*.class" | xargs rm -f
 %pom_xpath_inject pom:modules "<module>%parent_poms_builddir</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
 
 # compat symlink: requested by dtardon (libreoffice), reverts part of
 # 0af97ce32de877 commit.


[parent: 4e0cdc13ec65]