msimacek pushed to os-maven-plugin (master). "Port to current plexus-utils"

[notifications at fedoraproject.org]

>From 2998aa5d0cb0570cda648432982350db7cbbde4b Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek at redhat.com>
Date: Mon, 30 Mar 2015 15:51:19 +0200
Subject: Port to current plexus-utils


diff --git a/0001-Port-to-current-plexus-utils.patch b/0001-Port-to-current-plexus-utils.patch
new file mode 100644
index 0000000..cfb33b7
--- /dev/null
+++ b/0001-Port-to-current-plexus-utils.patch
@@ -0,0 +1,25 @@
+From 7d45d9ad8717f8e94c2497f85adc54d4d5f16ba4 Mon Sep 17 00:00:00 2001
+From: Michael Simacek <msimacek at redhat.com>
+Date: Mon, 30 Mar 2015 15:40:16 +0200
+Subject: [PATCH] Port to current plexus-utils
+
+---
+ src/main/java/kr/motd/maven/os/DetectExtension.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/kr/motd/maven/os/DetectExtension.java b/src/main/java/kr/motd/maven/os/DetectExtension.java
+index 88c5e61..9ebe6dd 100644
+--- a/src/main/java/kr/motd/maven/os/DetectExtension.java
++++ b/src/main/java/kr/motd/maven/os/DetectExtension.java
+@@ -180,7 +180,7 @@ public class DetectExtension extends AbstractMavenLifecycleParticipant {
+                 break;
+             }
+ 
+-            InterpolationFilterReader reader = new InterpolationFilterReader(new StringReader(value), dict);
++            InterpolationFilterReader reader = new InterpolationFilterReader(new StringReader(value), (Map)dict);
+             StringWriter writer = new StringWriter(value.length());
+             for (;;) {
+                 int ch = 0;
+-- 
+2.1.0
+
diff --git a/os-maven-plugin.spec b/os-maven-plugin.spec
index 5b23ae7..7b790e9 100644
--- a/os-maven-plugin.spec
+++ b/os-maven-plugin.spec
@@ -2,7 +2,7 @@
 
 Name:           os-maven-plugin
 Version:        1.2.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Maven plugin for generating platform-dependent properties
 License:        ASL 2.0
 URL:            https://github.com/trustin/os-maven-plugin/
@@ -10,6 +10,8 @@ BuildArch:      noarch
 
 Source0:        https://github.com/trustin/%{name}/archive/%{name}-%{version}.Final.tar.gz
 
+Patch0:         0001-Port-to-current-plexus-utils.patch
+
 BuildRequires:  maven-local
 BuildRequires:  maven-shared
 BuildRequires:  plexus-containers-component-metadata
@@ -34,6 +36,8 @@ This package provides %{summary}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}.%{vertag}
 
+%patch0 -p1
+
 # Remove Eclipse plugin (not needed in Fedora)
 %pom_remove_dep org.eclipse:ui
 %pom_remove_plugin :maven-jar-plugin
@@ -55,5 +59,8 @@ find -name plugin.xml -delete
 %doc LICENSE.txt
 
 %changelog
+* Mon Mar 30 2015 Michael Simacek <msimacek at redhat.com> - 1.2.3-2
+- Port to current plexus-utils
+
 * Tue Jul  8 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.3-1
 - Initial pagkaging
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/os-maven-plugin.git/commit/?h=master&id=2998aa5d0cb0570cda648432982350db7cbbde4b