Compare commits
No commits in common. "c8-stream-3.6" and "stream-maven-3.5-rhel-8.9.0" have entirely different histories.
c8-stream-
...
stream-mav
|
|
@ -1 +1,12 @@
|
|||
SOURCES/maven-shared-utils-3.2.1-source-release.zip
|
||||
/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
|
||||
/maven-shared-utils-0.6-source-release.zip
|
||||
/maven-shared-utils-0.7-source-release.zip
|
||||
/maven-shared-utils-0.8-source-release.zip
|
||||
/maven-shared-utils-0.9-source-release.zip
|
||||
/maven-shared-utils-3.0.0-source-release.zip
|
||||
/maven-shared-utils-3.0.1-source-release.zip
|
||||
/maven-shared-utils-3.1.0-source-release.zip
|
||||
/maven-shared-utils-3.2.1-source-release.zip
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
015559e466938c7e9053603d37b96ef3e03b802b SOURCES/maven-shared-utils-3.2.1-source-release.zip
|
||||
015559e466938c7e9053603d37b96ef3e03b802b maven-shared-utils-3.2.1-source-release.zip
|
||||
|
|
|
|||
|
|
@ -1,79 +0,0 @@
|
|||
From 613f27fe7ff4a89c21689a16f6f6b9b3e0b7c347 Mon Sep 17 00:00:00 2001
|
||||
From: Marian Koncek <mkoncek@redhat.com>
|
||||
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
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
Name: maven-shared-utils
|
||||
Version: 3.2.1
|
||||
Release: 0.5%{?dist}
|
||||
Release: 0.2%{?dist}
|
||||
Summary: Maven shared utility classes
|
||||
License: ASL 2.0
|
||||
URL: http://maven.apache.org/shared/maven-shared-utils
|
||||
|
|
@ -8,14 +8,12 @@ BuildArch: noarch
|
|||
|
||||
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
|
||||
# XXX temporary for maven upgrade
|
||||
Patch1: 0001-Restore-compatibility-with-current-maven.patch
|
||||
Patch0: 0001-Restore-compatibility-with-current-maven.patch
|
||||
Patch1: 0002-Unconditionally-single-quote-executable-and-argument.patch
|
||||
|
||||
Patch2: 0002-Port-to-hamcrest-2.1.patch
|
||||
Patch3: 0003-Unconditionally-single-quote-executable-and-argument.patch
|
||||
|
||||
BuildRequires: maven-local-openjdk8
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(com.google.code.findbugs:jsr305)
|
||||
BuildRequires: %{?module_prefix}mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(commons-io:commons-io)
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.commons:commons-lang3)
|
||||
BuildRequires: mvn(org.apache.maven:maven-core)
|
||||
|
|
@ -32,15 +30,17 @@ 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}
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
API documentation for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
|
||||
|
||||
|
|
@ -50,23 +50,17 @@ a lot of unused code.
|
|||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -n %{?module_prefix}%{name} -f .mfiles
|
||||
%files -f .mfiles
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE NOTICE
|
||||
|
||||
%changelog
|
||||
* Tue Apr 05 2022 Marián Konček <mkoncek@redhat.com> - 3.2.1-0.5
|
||||
* Tue Apr 05 2022 Marián Konček <mkoncek@redhat.com> - 3.2.1-0.2
|
||||
- Fix commandline injection vulnerability
|
||||
- Resolves: CVE-2022-29599
|
||||
|
||||
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.4
|
||||
- Build with OpenJDK 8
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 3.2.1-0.1
|
||||
- Update to upstream version 3.2.1 (patched temporary)
|
||||
|
||||
Loading…
Reference in New Issue