rpms/maven-shared-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 3.3.3

Browse Source
This commit is contained in:
Marian Koncek 2020-09-11 11:05:17 +02:00
parent 485f5f5dc6
commit e54cfbba77
5 changed files with 38 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -10,3 +10,4 @@
/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
/maven-shared-utils-3.3.3-source-release.zip

79
0002-Port-to-hamcrest-2.1.patch
View File

@ -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

25
0002-Port-to-plexus-utils-3.0.10.patch Normal file
View File

@ -0,0 +1,25 @@
From 15924bb52d1774f04cd8cd34ef2d568d429cd05e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 11 Sep 2020 11:02:29 +0200
Subject: [PATCH] Port to plexus-utils 3.0.10
---
.../java/org/apache/maven/shared/utils/io/FileUtilsTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
index cd3338c..4ad8f6b 100644
--- a/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
+++ b/src/test/java/org/apache/maven/shared/utils/io/FileUtilsTest.java
@@ -655,7 +655,7 @@ public class FileUtilsTest
private FileUtils.FilterWrapper[] wrappers( String key, String value )
{
- final Map<String, String> map = new HashMap<>();
+ final Map<String, Object> map = new HashMap<>();
map.put( key, value );
return new FileUtils.FilterWrapper[]
{
--
2.26.2

17
maven-shared-utils.spec
View File

@ -1,16 +1,15 @@
Name: maven-shared-utils
Version: 3.2.1
Release: 0.4%{?dist}
Version: 3.3.3
Release: 1%{?dist}
Summary: Maven shared utility classes
License: ASL 2.0
URL: http://maven.apache.org/shared/maven-shared-utils
URL: https://maven.apache.org/shared/maven-shared-utils
BuildArch: noarch
Source0: http://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
Source0: https://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
Patch2: 0002-Port-to-hamcrest-2.1.patch
Patch2: 0002-Port-to-plexus-utils-3.0.10.patch
BuildRequires: maven-local-openjdk8
BuildRequires: mvn(com.google.code.findbugs:jsr305)
@ -42,6 +41,9 @@ a lot of unused code.
%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
%pom_remove_dep org.apache.commons:commons-text
rm src/test/java/org/apache/maven/shared/utils/CaseTest.java
%build
%mvn_build
@ -52,6 +54,9 @@ a lot of unused code.
%license LICENSE NOTICE
%changelog
* Fri Sep 11 2020 Marian Koncek <mkoncek@redhat.com> - 3.3.3-1
- Update to upstream version 3.3.3
* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.1-0.4
- Build with OpenJDK 8

2
sources
View File

@ -1 +1 @@
SHA512 (maven-shared-utils-3.2.1-source-release.zip) = 055a29985e6e27cdca0e81c62b6e441013e166470d17a3cc6640a56b23fe68506ed7cd115fef28e92f0a261025691b3cdcf01cafeded65fd7606e52c02f30cfa
SHA512 (maven-shared-utils-3.3.3-source-release.zip) = 6085d3bb3d065efaca7ed43f7342c2b71c624235ff38cd1410a06a4c915e39a13cb00e65e8c0cd7203dc5b2d1deeb392eaab2aa0a43bfadb7c9d4286a2b473bc