From e0a5f003ee26013567e8e089397f184ce2b949f0 Mon Sep 17 00:00:00 2001 From: gil Date: Jun 22 2016 15:59:26 +0000 Subject: fix build failure --- diff --git a/glassfish-hk2.spec b/glassfish-hk2.spec index c29abb0..d9f1847 100644 --- a/glassfish-hk2.spec +++ b/glassfish-hk2.spec @@ -3,7 +3,7 @@ Name: glassfish-hk2 Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Hundred Kilobytes Kernel License: CDDL or GPLv2 with exceptions URL: http://hk2.java.net/ @@ -261,6 +261,14 @@ find ./ -name "*.java" -exec sed -i "s/org.glassfish.hk2.external.org.objectweb. %pom_remove_plugin -r :jacoco-maven-plugin %pom_remove_dep -r :jacoco-maven-plugin + +# fix build failure. 'useDefaultManifestFile' has been removed from the maven-jar-plugin >= 3.0.0 +%pom_xpath_remove "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:useDefaultManifestFile" +%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration" ' + + ${project.build.outputDirectory}/META-INF/MANIFEST.MF +' + %pom_disable_module external %pom_disable_module examples # Use unavailable: org.ops4j.pax.exam, org.ops4j.pax.url @@ -501,6 +509,9 @@ sed -i 's/\r//' LICENSE.txt %license LICENSE.txt %changelog +* Wed Jun 22 2016 gil cattaneo 2.4.0-4 +- fix build failure + * Fri Apr 29 2016 gil cattaneo 2.4.0-3 - rebuilt with tiger-types 2.2