diff --git a/0001-Port-to-Java-8.patch b/0001-Port-to-Java-8.patch index 25f40f7..6cd852d 100644 --- a/0001-Port-to-Java-8.patch +++ b/0001-Port-to-Java-8.patch @@ -1,16 +1,17 @@ -From 066f654cd6a1b9d3bfd54565af1d618dada2deb4 Mon Sep 17 00:00:00 2001 +From 93a0da9fde8676714db9d79ac003749940a76044 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Nov 2015 01:02:55 +0100 Subject: [PATCH] Port to Java 8 --- - src/java/org/apache/commons/collections/MultiHashMap.java | 8 ++++---- - src/java/org/apache/commons/collections/MultiMap.java | 4 ++-- - src/java/org/apache/commons/collections/map/MultiKeyMap.java | 8 +++++--- - src/java/org/apache/commons/collections/map/MultiValueMap.java | 8 ++++---- - src/test/org/apache/commons/collections/TestMultiHashMap.java | 10 +++++----- - .../org/apache/commons/collections/map/TestMultiKeyMap.java | 4 ++-- - 6 files changed, 22 insertions(+), 20 deletions(-) + .../org/apache/commons/collections/MultiHashMap.java | 8 ++++---- + src/java/org/apache/commons/collections/MultiMap.java | 4 ++-- + .../apache/commons/collections/map/MultiKeyMap.java | 8 +++++--- + .../apache/commons/collections/map/MultiValueMap.java | 8 ++++---- + .../apache/commons/collections/TestMultiHashMap.java | 10 +++++----- + .../commons/collections/map/TestMultiKeyMap.java | 4 ++-- + .../commons/collections/map/TestMultiValueMap.java | 10 +++++----- + 7 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java index 7fec9af..bcb4a11 100644 @@ -160,6 +161,27 @@ index b1ee3d0..66fcade 100644 assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1))); break; case 3: +diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java +index b9a5ac8..b37dc0c 100644 +--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java ++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java +@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase { + map.put("A", "AA"); + map.put("A", "AB"); + map.put("A", "AC"); +- assertEquals(null, map.remove("C", "CA")); +- assertEquals(null, map.remove("A", "AD")); +- assertEquals("AC", map.remove("A", "AC")); +- assertEquals("AB", map.remove("A", "AB")); +- assertEquals("AA", map.remove("A", "AA")); ++ assertEquals(false, map.remove("C", "CA")); ++ assertEquals(false, map.remove("A", "AD")); ++ assertEquals(true, map.remove("A", "AC")); ++ assertEquals(true, map.remove("A", "AB")); ++ assertEquals(true, map.remove("A", "AA")); + assertEquals(new MultiValueMap(), map); + } + -- -2.5.0 +2.21.0 diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 3501044..4851f4c 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -1,22 +1,18 @@ -%global base_name collections -%global short_name commons-%{base_name} - -Name: apache-%{short_name} +Name: apache-commons-collections Version: 3.2.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Provides new interfaces, implementations and utilities for Java Collections License: ASL 2.0 -URL: http://commons.apache.org/%{base_name}/ -Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz +URL: http://commons.apache.org/collections/ +BuildArch: noarch + +Source0: http://www.apache.org/dist/commons/collections/source/commons-collections-%{version}-src.tar.gz Patch0: 0001-Port-to-Java-8.patch -BuildArch: noarch - -BuildRequires: ant BuildRequires: maven-local +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) %description The introduction of the Collections API by Sun in JDK 1.2 has been a @@ -33,22 +29,14 @@ Java2-style collections. - methods to test or create typical set-theory properties of collections such as union, intersection, and closure. -%package testframework -Summary: Testframework for %{name} -Requires: %{name} = %{version}-%{release} - -%description testframework -%{summary}. - %package javadoc Summary: Javadoc for %{name} -Provides: %{name}-testframework-javadoc = %{version}-%{release} %description javadoc %{summary}. %prep -%setup -q -n %{short_name}-%{version}-src +%setup -q -n commons-collections-%{version}-src # remove all binary libs find . -name "*.jar" -exec rm -f {} \; @@ -59,17 +47,12 @@ find . -name "*.class" -exec rm -f {} \; # Fix file eof sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt -%mvn_package :%{short_name}-testframework testframework -%mvn_file ':%{short_name}{,-testframework}' %{name}@1 %{short_name}@1 +%pom_remove_plugin :maven-antrun-plugin + +%mvn_file :commons-collections %{name} commons-collections %build -# 2017-09-18 mizdebsk: Temporarly disable tests, they stopped working -# after Maven Surefire upgrade to 2.20, need to investigate why. -%mvn_build -- -DskipTests - -ant tf.javadoc -Dtf.build.docs=target/site/apidocs/ - -%mvn_artifact %{short_name}:%{short_name}-testframework:%{version} target/%{short_name}-testframework-%{version}.jar +%mvn_build %install %mvn_install @@ -78,13 +61,14 @@ ant tf.javadoc -Dtf.build.docs=target/site/apidocs/ %doc PROPOSAL.html README.txt %license LICENSE.txt NOTICE.txt -%files testframework -f .mfiles-testframework - %files javadoc -f .mfiles-javadoc %license LICENSE.txt NOTICE.txt %changelog +* Fri Jun 28 2019 Mikolaj Izdebski - 3.2.2-12 +- Disable testframework package + * Fri May 24 2019 Mikolaj Izdebski - 3.2.2-11 - Mass rebuild for javapackages-tools 201901