[maven-license-plugin] Fix FTBFS - Update to current guidelines and maven-local build macros

[Guido Grazioli]

commit 679eba053adb111f31268ae02a7de4c296dc8b5d
Author: Guido Grazioli <guido.grazioli at gmail.com>
Date:   Fri Feb 27 15:24:30 2015 +1100

    Fix FTBFS - Update to current guidelines and maven-local build macros

 001-mavenlicenseplugin-fixbuild.patch | 21 ++++++------
 maven-license-plugin.spec             | 61 +++++++++--------------------------
 2 files changed, 28 insertions(+), 54 deletions(-)
---
diff --git a/001-mavenlicenseplugin-fixbuild.patch b/001-mavenlicenseplugin-fixbuild.patch
index fd37b01..0df130c 100644
--- a/001-mavenlicenseplugin-fixbuild.patch
+++ b/001-mavenlicenseplugin-fixbuild.patch
@@ -1,12 +1,3 @@
-From a1f7f0c16eb2333e527448c2e48a512ef8da50ed Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky at redhat.com>
-Date: Tue, 24 Apr 2012 09:04:34 +0200
-Subject: [PATCH] Fix build by removing some unneeded dependencies
-
----
- pom.xml |   72 ++++++--------------------------------------------------------
- 1 files changed, 7 insertions(+), 65 deletions(-)
-
 diff --git a/pom.xml b/pom.xml
 index a806a49..e806c77 100644
 --- a/pom.xml
@@ -114,3 +105,15 @@ index a806a49..e806c77 100644
 -- 
 1.7.7.6
 
+--- a/src/main/java/com/google/code/mojo/license/util/FileUtils.java	2010-08-06 13:00:51.000000000 +1000
++++ b/src/main/java/com/google/code/mojo/license/util/FileUtils.java	2015-02-27 15:04:46.157580507 +1100
+@@ -52,7 +52,8 @@
+     }
+ 
+     public static String read(URL location, Map<String, String> properties) throws IOException {
+-        Reader reader = new InterpolationFilterReader(new BufferedReader(new InputStreamReader(location.openStream())), properties);
++        Map<Object,Object> propertiesMap = java.util.Collections.<Object,Object>unmodifiableMap(properties);
++        Reader reader = new InterpolationFilterReader(new BufferedReader(new InputStreamReader(location.openStream())), propertiesMap);
+         try {
+             return IOUtil.toString(reader);
+         } finally {
diff --git a/maven-license-plugin.spec b/maven-license-plugin.spec
index 586e32e..3feedad 100644
--- a/maven-license-plugin.spec
+++ b/maven-license-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-license-plugin
 Version:        1.8.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Maven plugin to update header licenses of source files
 
 Group:          Development/Libraries
@@ -19,35 +19,15 @@ BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  apache-resource-bundles
 BuildRequires:  maven-local
-BuildRequires:  maven-assembly-plugin
-BuildRequires:  maven-deploy-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-source-plugin
-BuildRequires:  maven-changelog-plugin
-BuildRequires:  maven-changes-plugin
-BuildRequires:  maven-clean-plugin
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-dependency-plugin
-BuildRequires:  maven-help-plugin
-BuildRequires:  maven-idea-plugin
-BuildRequires:  maven-install-plugin
 BuildRequires:  maven-plugin-plugin
-BuildRequires:  maven-pmd-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-repository-plugin
-BuildRequires:  maven-remote-resources-plugin
-BuildRequires:  maven-site-plugin
 BuildRequires:  maven-shared
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-plugin-testing-harness
-BuildRequires:  maven-release-plugin
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-classworlds
 BuildRequires:  xml-commons-apis
 BuildRequires:  xmltool
 
 Requires:       jpackage-utils
+Requires:       java-headless >= 1:1.6.0
 Requires:       maven
 Requires:       maven-shared
 Requires:       xmltool
@@ -82,37 +62,28 @@ sed -i 's/\r//' NOTICE.txt
 # Remove wagon-webdav extension which is not available
 %pom_xpath_remove pom:build/pom:extensions
 
+# Set sources/resources encoding
+%pom_xpath_inject "pom:properties" "<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>"
+
 %build
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f
 
 %install
+%mvn_install
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 
-# jar
-install -Dp -m 644 target/%{name}-%{version}.jar \
-$RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%license LICENSE.txt
+%doc NOTICE.txt
 
-%files
-%doc NOTICE.txt LICENSE.txt
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
+%files javadoc  -f .mfiles-javadoc
 
 %changelog
+* Fri Feb 27 2015 Guido Grazioli <guido.grazioli at gmail.com> - 1.8.0-18
+- Update to current guidelines and maven-local build macros
+- Fix FTBFS
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.8.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild