From 2850691853dae9bf49a623d29ff303a56a4c7892 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 31 2016 08:30:41 +0000 Subject: import rh-maven33-maven-shared-utils-0.4-3.13.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..70eca51 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-shared-utils-0.4-source-release.zip diff --git a/.rh-maven33-maven-shared-utils.metadata b/.rh-maven33-maven-shared-utils.metadata new file mode 100644 index 0000000..935ca63 --- /dev/null +++ b/.rh-maven33-maven-shared-utils.metadata @@ -0,0 +1 @@ +4b298412e66e26b53a43700be4e76589124336e3 SOURCES/maven-shared-utils-0.4-source-release.zip diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/maven-shared-utils-tests.patch b/SOURCES/maven-shared-utils-tests.patch new file mode 100644 index 0000000..214108d --- /dev/null +++ b/SOURCES/maven-shared-utils-tests.patch @@ -0,0 +1,94 @@ +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/SPECS/maven-shared-utils.spec b/SPECS/maven-shared-utils.spec new file mode 100644 index 0000000..74a540d --- /dev/null +++ b/SPECS/maven-shared-utils.spec @@ -0,0 +1,135 @@ +%global pkg_name maven-shared-utils +%{?scl:%scl_package %{pkg_name}} +%{?maven_find_provides_and_requires} + +Name: %{?scl_prefix}%{pkg_name} +Version: 0.4 +Release: 3.13%{?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/%{pkg_name}/%{version}/%{pkg_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: %{pkg_name}-tests.patch + +BuildArch: noarch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}apache-commons-lang3 +BuildRequires: %{?scl_prefix}apache-rat +BuildRequires: %{?scl_prefix}maven-shared +BuildRequires: %{?scl_prefix}maven-shade-plugin +BuildRequires: %{?scl_prefix}jsr-305 + +%description +This project aims to be a functional replacement for plexus-utils in Maven. + +It is not a 100% API compatible replacement though but a replacement with +improvements: lots of methods got cleaned up, generics got added and we dropped +a lot of unused code. + +%package javadoc +Summary: Javadoc for %{pkg_name} + +%description javadoc +API documentation for %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version} +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin +%patch0 -p1 +%{?scl:EOF} + +%build +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_build +%{?scl:EOF} + +%install +%{?scl:scl enable %{scl} - <<"EOF"} +set -e -x +%mvn_install +%{?scl:EOF} + +%files -f .mfiles +%dir %{_mavenpomdir}/%{pkg_name} +%{_javadir}/%{pkg_name} +%doc LICENSE NOTICE + +%files javadoc -f .mfiles-javadoc +%doc LICENSE NOTICE + +%changelog +* Mon Feb 08 2016 Michal Srb - 0.4-3.13 +- Fix BR on maven-local & co. + +* Mon Jan 11 2016 Michal Srb - 0.4-3.12 +- maven33 rebuild #2 + +* Sat Jan 09 2016 Michal Srb - 0.4-3.11 +- maven33 rebuild + +* Thu Jan 15 2015 Michal Srb - 0.4-3.10 +- Fix directory ownership + +* Tue Jan 13 2015 Michael Simacek - 0.4-3.9 +- Mass rebuild 2015-01-13 + +* Tue Jan 06 2015 Michael Simacek - 0.4-3.8 +- Mass rebuild 2015-01-06 + +* Mon May 26 2014 Mikolaj Izdebski - 0.4-3.7 +- Mass rebuild 2014-05-26 + +* Wed Feb 19 2014 Mikolaj Izdebski - 0.4-3.6 +- Mass rebuild 2014-02-19 + +* Tue Feb 18 2014 Mikolaj Izdebski - 0.4-3.5 +- Mass rebuild 2014-02-18 + +* Mon Feb 17 2014 Mikolaj Izdebski - 0.4-3.4 +- Add missing BR: jsr-305 + +* Mon Feb 17 2014 Michal Srb - 0.4-3.3 +- SCL-ize BR/R + +* Thu Feb 13 2014 Mikolaj Izdebski - 0.4-3.2 +- Rebuild to regenerate auto-requires + +* Tue Feb 11 2014 Mikolaj Izdebski - 0.4-3.1 +- First maven30 software collection build + +* Fri Dec 27 2013 Daniel Mach - 0.4-3 +- Mass rebuild 2013-12-27 + +* Fri Jun 28 2013 Mikolaj Izdebski - 0.4-2 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Mon Apr 22 2013 Tomas Radej - 0.4-1 +- Updated to latest upstream version +- Fixed and reenabled tests + +* Mon Apr 08 2013 Michal Srb - 0.3-2 +- Disable tests (they don't work with junit >= 4.11) + +* Fri Mar 15 2013 Michal Srb - 0.3-1 +- Update to upstream version 0.3 + +* Tue Feb 19 2013 Mikolaj Izdebski - 0.2-4 +- Build with xmvn + +* Thu Feb 14 2013 Fedora Release Engineering - 0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Feb 06 2013 Java SIG - 0.2-2 +- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild +- Replace maven BuildRequires with maven-local + +* Wed Jan 16 2013 Tomas Radej - 0.2-1 +- Initial version +