From abafb820c98ddf475bb2fadf1e1c20175d738988 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 6 Dec 2018 16:30:17 +0000 Subject: [PATCH] Prevent NPE in maven-shade-plugin --- byte-buddy.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/byte-buddy.spec b/byte-buddy.spec index 3aa11df..1e2c9b0 100644 --- a/byte-buddy.spec +++ b/byte-buddy.spec @@ -4,7 +4,7 @@ Name: byte-buddy Version: 1.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Runtime code generation for the Java virtual machine License: ASL 2.0 URL: http://bytebuddy.net/ @@ -107,6 +107,9 @@ mv byte-buddy-dep/src/precompiled/java/net/bytebuddy/test/precompiled/*.java \ %pom_remove_plugin :clirr-maven-plugin %pom_remove_plugin :maven-release-plugin +# Not interested in shading sources (causes NPE on old versions of shade plugin) +%pom_xpath_set "pom:createSourcesJar" "false" byte-buddy + # Drop build dep on findbugs annotations, used only by the above check plugins %pom_remove_dep :findbugs-annotations sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings) @@ -150,6 +153,9 @@ sed -i -e '/SuppressFBWarnings/d' $(grep -lr SuppressFBWarnings) %license LICENSE NOTICE %changelog +* Thu Dec 06 2018 Mat Booth - 1.9.5-4 +- Prevent NPE in maven-shade-plugin + * Wed Dec 05 2018 Mat Booth - 1.9.5-3 - Enable test suites