From 37918d766322f132caa795b20dba8bf87b4cb125 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Thu, 9 Apr 2015 11:09:33 +0200
Subject: [PATCH] Update to upstream version 3.0.22

---
 .gitignore                         |  1 +
 0001-Don-t-use-NioFiles.copy.patch | 38 ------------------------------
 plexus-utils.spec                  | 18 +++++---------
 sources                            |  2 +-
 4 files changed, 8 insertions(+), 51 deletions(-)
 delete mode 100644 0001-Don-t-use-NioFiles.copy.patch

diff --git a/.gitignore b/.gitignore
index ed13d61..2fb0d29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ plexus-utils-3.0.tar.xz
 /plexus-utils-3.0.16.tar.gz
 /plexus-utils-3.0.18.tar.gz
 /plexus-utils-3.0.21.tar.gz
+/plexus-utils-3.0.22.tar.gz
diff --git a/0001-Don-t-use-NioFiles.copy.patch b/0001-Don-t-use-NioFiles.copy.patch
deleted file mode 100644
index bd9a531..0000000
--- a/0001-Don-t-use-NioFiles.copy.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f9d81b7f32f11c2446e6392c09e2655e803a758a Mon Sep 17 00:00:00 2001
-From: Michael Simacek <msimacek@redhat.com>
-Date: Mon, 30 Mar 2015 17:10:07 +0200
-Subject: [PATCH] Don't use NioFiles.copy
-
----
- src/main/java/org/codehaus/plexus/util/FileUtils.java | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java
-index 3a036a7..8f05b76 100644
---- a/src/main/java/org/codehaus/plexus/util/FileUtils.java
-+++ b/src/main/java/org/codehaus/plexus/util/FileUtils.java
-@@ -1081,14 +1081,14 @@ public static void copyFile( final File source, final File destination )
-             return;
-         }
-         mkdirsFor( destination );
--        if (Java7Detector.isJava7())
--        {
--            NioFiles.copy( source, destination );
--        }
--        else
--        {
-+        // if (Java7Detector.isJava7())
-+        // {
-+        //     NioFiles.copy( source, destination );
-+        // }
-+        // else
-+        // {
-             doCopyFile( source, destination );
--        }
-+        // }
- 
-         if ( source.length() != destination.length() )
-         {
--- 
-2.1.0
-
diff --git a/plexus-utils.spec b/plexus-utils.spec
index cbf162f..4317f27 100644
--- a/plexus-utils.spec
+++ b/plexus-utils.spec
@@ -1,9 +1,6 @@
-%global parent plexus
-%global subname utils
-
 Name:           plexus-utils
-Version:        3.0.21
-Release:        3%{?dist}
+Version:        3.0.22
+Release:        1%{?dist}
 Summary:        Plexus Common Utilities
 # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ 
 # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory
@@ -17,13 +14,9 @@ License:        ASL 1.1 and ASL 2.0 and xpp and BSD and Public Domain
 URL:            https://github.com/codehaus-plexus/plexus-utils
 BuildArch:      noarch
 
-Source0:        https://github.com/sonatype/%{name}/archive/%{name}-%{version}.tar.gz
+Source0:        https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz
 Source1:        http://apache.org/licenses/LICENSE-2.0.txt
 
-# https://github.com/sonatype/plexus-utils/issues/18
-# patch not submitted as it's just a workaround
-Patch0:         0001-Don-t-use-NioFiles.copy.patch
-
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 
@@ -46,8 +39,6 @@ Javadoc for %{name}.
 
 cp %{SOURCE1} .
 
-%patch0 -p1
-
 %mvn_file : plexus/utils
 %mvn_alias : plexus:plexus-utils
 
@@ -79,6 +70,9 @@ cp %{SOURCE1} .
 %doc NOTICE.txt LICENSE-2.0.txt
 
 %changelog
+* Thu Apr 09 2015 Michael Simacek <msimacek@redhat.com> - 3.0.22-1
+- Update to upstream version 3.0.22
+
 * Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.0.21-3
 - Update upstream URL
 
diff --git a/sources b/sources
index dc93303..f52bf29 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-632fc0f42d9b1c1e4b7f8bcecdf23bda  plexus-utils-3.0.21.tar.gz
+d5fd539c6f489efb9111f4960e1ecefb  plexus-utils-3.0.22.tar.gz
 3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt