From ea95feb16d44a58c9960638d93f8b0b79e3ec3fa Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Nov 17 2016 08:22:19 +0000
Subject: Don't use deprecated config parameter of maven-assembly-plugin


---

diff --git a/maven-scm.spec b/maven-scm.spec
index 2fa00aa..236da91 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,7 +30,7 @@
 
 Name:           maven-scm
 Version:        1.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 URL:            http://maven.apache.org/scm
@@ -109,6 +109,13 @@ sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META
 %pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-jazz
 %pom_remove_dep org.mockito: maven-scm-providers/maven-scm-provider-accurev
 
+# Don't use deprecated "descriptorId" configuration parameter of Maven
+# Assembly Plugin, which was removed in version 3.0.0.
+%pom_xpath_replace "pom:plugin[pom:artifactId='maven-assembly-plugin']/pom:configuration/pom:descriptorId" "
+    <descriptorRefs>
+      <descriptorRef>jar-with-dependencies</descriptorRef>
+    </descriptorRefs>" maven-scm-client
+
 # Put TCK tests into a separate sub-package
 %mvn_package :%{name}-provider-cvstest test
 %mvn_package :%{name}-provider-gittest test
@@ -134,6 +141,9 @@ sed -i s/cvsjava.CvsJava/cvsexe.CvsExe/ maven-scm-client/src/main/resources/META
 %doc LICENSE NOTICE
 
 %changelog
+* Thu Nov 17 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.9.5-2
+- Don't use deprecated config parameter of maven-assembly-plugin
+
 * Fri Aug 12 2016 Michael Simacek <msimacek@redhat.com> - 1.9.5-1
 - Update to upstream version 1.9.5