diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0fe1524 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/maven-shared-utils-3.2.1-source-release.zip diff --git a/.rh-maven36-maven-shared-utils.metadata b/.rh-maven36-maven-shared-utils.metadata new file mode 100644 index 0000000..0fe940c --- /dev/null +++ b/.rh-maven36-maven-shared-utils.metadata @@ -0,0 +1 @@ +015559e466938c7e9053603d37b96ef3e03b802b SOURCES/maven-shared-utils-3.2.1-source-release.zip diff --git a/SOURCES/0001-Restore-compatibility-with-current-maven.patch b/SOURCES/0001-Restore-compatibility-with-current-maven.patch new file mode 100644 index 0000000..0051408 --- /dev/null +++ b/SOURCES/0001-Restore-compatibility-with-current-maven.patch @@ -0,0 +1,82 @@ +From e3d2a29743e1b36beaf1063567da9dfd2e5a8aa8 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Mon, 26 Feb 2018 16:21:04 +0100 +Subject: [PATCH] Restore compatibility with current maven + +--- + .../maven/shared/utils/logging/AnsiMessageBuilder.java | 18 ++++++++++++++++++ + .../maven/shared/utils/logging/MessageBuilder.java | 3 +++ + .../shared/utils/logging/PlainMessageBuilder.java | 18 ++++++++++++++++++ + 3 files changed, 39 insertions(+) + +diff --git a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java +index 0103a6b..23b6d14 100644 +--- a/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java ++++ b/src/main/java/org/apache/maven/shared/utils/logging/AnsiMessageBuilder.java +@@ -153,4 +153,22 @@ class AnsiMessageBuilder + { + return ansi.toString(); + } ++ ++ @Override ++ public MessageBuilder debug(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder info(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder error(Object message) { ++ a(message); ++ return this; ++ } + } +diff --git a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java +index b60bb4e..1dc2624 100644 +--- a/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java ++++ b/src/main/java/org/apache/maven/shared/utils/logging/MessageBuilder.java +@@ -26,6 +26,9 @@ package org.apache.maven.shared.utils.logging; + */ + public interface MessageBuilder + { ++ MessageBuilder debug( Object message ); ++ MessageBuilder info( Object message ); ++ MessageBuilder error( Object message ); + /** + * Append message content in success style. + * By default, bold green +diff --git a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java +index 2eec001..5236e99 100644 +--- a/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java ++++ b/src/main/java/org/apache/maven/shared/utils/logging/PlainMessageBuilder.java +@@ -139,4 +139,22 @@ class PlainMessageBuilder + { + return buffer.toString(); + } ++ ++ @Override ++ public MessageBuilder debug(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder info(Object message) { ++ a(message); ++ return this; ++ } ++ ++ @Override ++ public MessageBuilder error(Object message) { ++ a(message); ++ return this; ++ } + } +-- +2.14.3 + diff --git a/SOURCES/0002-Port-to-hamcrest-2.1.patch b/SOURCES/0002-Port-to-hamcrest-2.1.patch new file mode 100644 index 0000000..f975bac --- /dev/null +++ b/SOURCES/0002-Port-to-hamcrest-2.1.patch @@ -0,0 +1,79 @@ +From 613f27fe7ff4a89c21689a16f6f6b9b3e0b7c347 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Thu, 29 Aug 2019 15:04:46 +0200 +Subject: [PATCH] Port to hamcrest 2.1 + +--- + .../shared/utils/reflection/ReflectorTest.java | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +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 0088361..09f6048 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 +@@ -50,7 +50,7 @@ public class ReflectorTest + public void newInstanceClassNull() + throws Exception + { +- assertThat( reflector.newInstance( Object.class, null ), is( Object.class ) ); ++ assertThat( reflector.newInstance( Object.class, null ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -64,7 +64,7 @@ public class ReflectorTest + public void newInstanceClassEmptyArray() + throws Exception + { +- assertThat( reflector.newInstance( Object.class, new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.newInstance( Object.class, new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = ReflectorException.class ) +@@ -156,7 +156,7 @@ public class ReflectorTest + public void getSingletonClassNull() + throws Exception + { +- assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), is( Object.class ) ); ++ assertThat( reflector.getSingleton( (Class)Object.class, (Object)null ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -170,7 +170,7 @@ public class ReflectorTest + public void getSingletonClassEmptyArray() + throws Exception + { +- assertThat( reflector.getSingleton( Object.class, new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.getSingleton( Object.class, new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = ReflectorException.class ) +@@ -787,7 +787,7 @@ public class ReflectorTest + public void invokeStaticClassNullNull() + throws Exception + { +- assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), is( Object.class ) ); ++ assertThat( reflector.invokeStatic( Object.class, (String)null, (Object)null ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -801,7 +801,7 @@ public class ReflectorTest + public void invokeStaticClassNullEmptyArray() + throws Exception + { +- assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.invokeStatic( Object.class, null, new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = NullPointerException.class ) +@@ -829,7 +829,7 @@ public class ReflectorTest + public void invokeStaticClassEmptyEmptyArray() + throws Exception + { +- assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), is( Object.class ) ); ++ assertThat( reflector.invokeStatic( Object.class, "", new Object[0] ), isA( Object.class ) ); + } + + @Test( expected = IllegalArgumentException.class ) +-- +2.21.0 + diff --git a/SPECS/maven-shared-utils.spec b/SPECS/maven-shared-utils.spec new file mode 100644 index 0000000..d0b35e5 --- /dev/null +++ b/SPECS/maven-shared-utils.spec @@ -0,0 +1,156 @@ +%{?scl:%scl_package maven-shared-utils} +%{!?scl:%global pkg_name %{name}} + +Name: %{?scl_prefix}maven-shared-utils +Version: 3.2.1 +Release: 0.2.2%{?dist} +Summary: Maven shared utility classes +License: ASL 2.0 +URL: http://maven.apache.org/shared/maven-shared-utils +BuildArch: noarch + +Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{pkg_name}/%{version}/%{pkg_name}-%{version}-source-release.zip +# XXX temporary for maven upgrade +Patch1: 0001-Restore-compatibility-with-current-maven.patch + +Patch2: 0002-Port-to-hamcrest-2.1.patch + +BuildRequires: %{?scl_prefix}maven-local +BuildRequires: %{?scl_prefix}mvn(com.google.code.findbugs:jsr305) +BuildRequires: %{?scl_prefix}mvn(commons-io:commons-io) +BuildRequires: %{?scl_prefix}mvn(junit:junit) +BuildRequires: %{?scl_prefix}mvn(org.apache.commons:commons-lang3) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven:maven-core) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) +BuildRequires: %{?scl_prefix}mvn(org.apache.maven.shared:maven-shared-components:pom:) +BuildRequires: %{?scl_prefix}mvn(org.codehaus.plexus:plexus-container-default) +BuildRequires: %{?scl_prefix}mvn(org.fusesource.jansi:jansi) +BuildRequires: %{?scl_prefix}mvn(org.hamcrest:hamcrest-core) + +%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. + +%{?module_package} +%{?javadoc_package} + +%prep +%setup -n %{pkg_name}-%{version} -q + +%patch1 -p1 +%patch2 -p1 + +%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin + +%build +%mvn_build + +%install +%mvn_install + +%files -n %{name} -f .mfiles +%license LICENSE NOTICE + +%changelog +* Wed Sep 4 2019 Mikolaj Izdebski - 3.2.1-0.2.2 +- Mass rebuild 2019-09-04 + +* Tue Sep 3 2019 Java Maintainers - 3.2.1-0.2.1 +- Automated package import and SCL-ization + +* Fri May 24 2019 Mikolaj Izdebski - 3.2.1-0.2 +- Mass rebuild for javapackages-tools 201901 + +* Mon Feb 26 2018 Michael Simacek - 3.2.1-0.1 +- Update to upstream version 3.2.1 (patched temporary) + +* Thu Feb 08 2018 Fedora Release Engineering - 3.1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 3.1.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Feb 13 2017 Michael Simacek - 3.1.0-4 +- Regenerate BuildRequires + +* Fri Feb 10 2017 Fedora Release Engineering - 3.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Jul 27 2016 Mikolaj Izdebski - 3.1.0-2 +- Re-enable tests + +* Fri Jul 22 2016 Mikolaj Izdebski - 3.1.0-0.1.RC +- Update to upstream version 3.1.0 +- Temporarly disable tests + +* Fri Jul 15 2016 Mikolaj Izdebski - 3.0.1-2 +- Remove unneeded build-requires + +* Thu Jun 2 2016 Mikolaj Izdebski - 3.0.1-1 +- Update to upstream version 3.0.1 + +* Thu Feb 04 2016 Fedora Release Engineering - 3.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Oct 16 2015 Mikolaj Izdebski - 3.0.0-2 +- Enable all tests + +* Mon Oct 12 2015 Mikolaj Izdebski - 3.0.0-1 +- Update to upstream version 3.0.0 + +* Mon Sep 21 2015 Mikolaj Izdebski - 0.9-1 +- Update to upstream version 0.9 + +* Mon Jun 22 2015 Michal Srb - 0.8-1 +- Update to upstream release 0.8 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Oct 24 2014 Mikolaj Izdebski - 0.7-1 +- Update to upstream version 0.7 + +* Sat Jun 07 2014 Fedora Release Engineering - 0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon Mar 24 2014 Mikolaj Izdebski - 0.6-1 +- Update to upstream version 0.6 + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0.5-3 +- Use Requires: java-headless rebuild (#1067528) + +* Wed Feb 19 2014 Mikolaj Izdebski - 0.5-2 +- Fix unowned directory + +* 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 + +* 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