diff --git a/.gitignore b/.gitignore
index 5f78f50..e210f88 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/maven-shared-utils-0.2-source-release.zip
/maven-shared-utils-0.3-source-release.zip
/maven-shared-utils-0.4-source-release.zip
+/maven-shared-utils-0.5-source-release.zip
diff --git a/maven-shared-utils-tests.patch b/maven-shared-utils-tests.patch
deleted file mode 100644
index 214108d..0000000
--- a/maven-shared-utils-tests.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-diff --git a/pom.xml b/pom.xml
-index e12f7e6..bb0745f 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -56,7 +56,7 @@
-
- junit
- junit
-- 4.9
-+ 4.11
- test
-
-
-diff --git a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
-index 298cb70..b032da9 100644
---- a/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
-+++ b/src/test/java/org/apache/maven/shared/utils/ExpandTest.java
-@@ -73,6 +73,7 @@ public class ExpandTest
- * @return
- */
- private File getTestTargetDir()
-+ throws Exception
- {
- return tempFolder.newFolder( TEST_ZIP_TARGET_FOLDER );
- }
-diff --git a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
-index 6d8cca3..e9e2ca5 100644
---- a/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
-+++ b/src/test/java/org/apache/maven/shared/utils/reflection/ReflectorTest.java
-@@ -25,6 +25,7 @@ import java.lang.reflect.Constructor;
-
- import static org.hamcrest.CoreMatchers.*;
- import static org.junit.Assert.assertThat;
-+import static org.junit.Assert.assertTrue;
- import static org.junit.Assert.fail;
-
- import static org.apache.maven.shared.utils.testhelpers.ExceptionHelper.*;
-@@ -116,8 +117,8 @@ public class ReflectorTest
- public void newInstancePublicConstructor()
- throws Exception
- {
-- assertThat( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } ),
-- is( ReflectorTestHelper.class ) );
-+ assertTrue( reflector.newInstance( ReflectorTestHelper.class, new Object[]{ "" } )
-+ instanceof ReflectorTestHelper );
- }
-
- @Test( expected = NullPointerException.class )
-@@ -222,8 +223,8 @@ public class ReflectorTest
- public void getSingletonPublicMethod()
- throws Exception
- {
-- assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } ),
-- is( ReflectorTestHelper.class ) );
-+ assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "" } )
-+ instanceof ReflectorTestHelper );
- }
-
- @Test( expected = NullPointerException.class )
-@@ -252,8 +253,8 @@ public class ReflectorTest
- public void getSingletonNonStaticMethod()
- throws Exception
- {
-- assertThat( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } ),
-- is( ReflectorTestHelper.class ) );
-+ assertTrue( reflector.getSingleton( ReflectorTestHelper.class, new Object[]{ "", Boolean.FALSE } )
-+ instanceof ReflectorTestHelper );
- }
-
- //// invoke( Object, String, Object[] )
-@@ -866,8 +867,8 @@ public class ReflectorTest
- public void invokeStaticPublicMethod()
- throws Exception
- {
-- assertThat( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } ),
-- is( ReflectorTestHelper.class ) );
-+ assertTrue( reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "" } )
-+ instanceof ReflectorTestHelper );
- }
-
- @Test( expected = NullPointerException.class )
-@@ -896,9 +897,9 @@ public class ReflectorTest
- public void invokeStaticNonStaticMethod()
- throws Exception
- {
-- assertThat(
-- reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } ),
-- is( ReflectorTestHelper.class ) );
-+ assertTrue(
-+ reflector.invokeStatic( ReflectorTestHelper.class, "getInstance", new Object[]{ "", Boolean.FALSE } )
-+ instanceof ReflectorTestHelper );
- }
-
- //// getConstructor( Class, Class[] )
diff --git a/maven-shared-utils.spec b/maven-shared-utils.spec
index 2f364d5..8fa0e66 100644
--- a/maven-shared-utils.spec
+++ b/maven-shared-utils.spec
@@ -1,13 +1,10 @@
Name: maven-shared-utils
-Version: 0.4
-Release: 2%{?dist}
+Version: 0.5
+Release: 1%{?dist}
Summary: Maven shared utility classes
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-shared-utils
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
-# Patching tests so that they are compatible with JUnit 4.11
-# (upstream bug http://jira.codehaus.org/browse/MSHARED-285)
-Patch0: %{name}-tests.patch
BuildArch: noarch
@@ -33,7 +30,6 @@ API documentation for %{name}.
%prep
%setup -q
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
-%patch0 -p1
%build
%mvn_build
@@ -48,6 +44,10 @@ API documentation for %{name}.
%doc LICENSE NOTICE
%changelog
+* Mon Dec 23 2013 Mikolaj Izdebski - 0.5-1
+- Update to upstream version 0.5
+- Remove patch for MSHARED-285 (accepted upstream)
+
* Sat Aug 03 2013 Fedora Release Engineering - 0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 65db798..b887e9f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-19eae55f89777e7f89b4b31537e32c4d maven-shared-utils-0.4-source-release.zip
+5d432a3ec86f7dfccea04f8824931ad1 maven-shared-utils-0.5-source-release.zip