[rpms/google-gson] epel10: Skip default jar plugin execution to fix FTBFS

[rpms/google-gson] epel10: Skip default jar plugin execution to fix FTBFS

[Michael Simacek]

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : 565d473dd5b63b564720b9d8cdafabac554ee4e5
Author : Michael Simacek <msimacek@redhat.com>
Date   : 2016-06-02T12:31:02+02:00
Stats  : +11/-4 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/565d473dd5b63b564720b9d8cdafabac554ee4e5?branch=epel10

Log:
Skip default jar plugin execution to fix FTBFS

---
diff --git a/google-gson.spec b/google-gson.spec
index a3725d5..a56aade 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -1,6 +1,6 @@
 Name:             google-gson
 Version:          2.3.1
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Java lib for conversion of Java objects into JSON representation
 License:          ASL 2.0
 URL:              https://github.com/google/gson
@@ -10,9 +10,6 @@ BuildArch:        noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-eclipse-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
@@ -40,6 +37,13 @@ rm src/test/java/com/google/gson/DefaultInetAddressTypeAdapterTest.java
 # Throwable has more fields serialized, probably incorrect test expectations
 rm src/test/java/com/google/gson/functional/ThrowableFunctionalTest.java
 
+# Fixes build with new maven-jar-plugin
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" "
+    <execution>
+      <id>default-jar</id>
+      <phase>skip</phase>
+    </execution>"
+
 %build
 # LANG="C" or LANG="en_US.utf8" needed for the tests
 %mvn_build
@@ -54,6 +58,9 @@ rm src/test/java/com/google/gson/functional/ThrowableFunctionalTest.java
 %doc LICENSE
 
 %changelog
+* Thu Jun 02 2016 Michael Simacek <msimacek@redhat.com> - 2.3.1-4
+- Skip default jar plugin execution to fix FTBFS
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild