Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Miroslav Šulc" <fordfrog@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/commons-collections/, dev-java/commons-collections/files/
Date: Wed, 21 Apr 2021 09:33:24
Message-Id: 1618997589.e90a6173247f06514731825677f3fc67c62bdc52.fordfrog@gentoo
1 commit: e90a6173247f06514731825677f3fc67c62bdc52
2 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 21 09:31:11 2021 +0000
4 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 21 09:33:09 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90a6173
7
8 dev-java/commons-collections: bump to 3.2.2
9
10 Bug: https://bugs.gentoo.org/739348
11 Closes: https://bugs.gentoo.org/784131
12 Closes: https://bugs.gentoo.org/780153
13 Package-Manager: Portage-3.0.18, Repoman-3.0.3
14 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
15
16 dev-java/commons-collections/Manifest | 1 +
17 .../commons-collections-3.2.2.ebuild | 67 +++++++
18 .../files/commons-collections-3.2.2-fixes.patch | 201 +++++++++++++++++++++
19 3 files changed, 269 insertions(+)
20
21 diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
22 index acb1b279814..83ee54781b0 100644
23 --- a/dev-java/commons-collections/Manifest
24 +++ b/dev-java/commons-collections/Manifest
25 @@ -1,2 +1,3 @@
26 DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
27 +DIST commons-collections-3.2.2-src.tar.gz 630693 BLAKE2B a70cebe9526291d5207db7edd7c9b50060413880d41dcb28c01cf05f7e00a9f5e1560012c3c3c763162412282db9512bc2b64a5788f210c5c8866943d912dafb SHA512 2e8ef638f07515b028a3e7e97851fcf1d9023a2c188e211bd1e936f35d3d91c2885adf3b1103ad17dfb7aeea6e7a67ce7826ee346a8a29c1aa7c6b0cf14e9230
28 DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
29
30 diff --git a/dev-java/commons-collections/commons-collections-3.2.2.ebuild b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
31 new file mode 100644
32 index 00000000000..b127e357b05
33 --- /dev/null
34 +++ b/dev-java/commons-collections/commons-collections-3.2.2.ebuild
35 @@ -0,0 +1,67 @@
36 +# Copyright 1999-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +JAVA_PKG_IUSE="doc source test"
42 +MAVEN_ID="commons-collections:commons-collections:3.2.1"
43 +
44 +inherit java-pkg-2 java-ant-2 java-utils-2
45 +
46 +DESCRIPTION="Jakarta-Commons Collections Component"
47 +HOMEPAGE="https://commons.apache.org/collections/"
48 +SRC_URI="mirror://apache/${PN/-//}/source/${P}-src.tar.gz"
49 +
50 +LICENSE="Apache-2.0"
51 +SLOT="0"
52 +KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
53 +IUSE="test"
54 +RESTRICT="!test? ( test )"
55 +
56 +DEPEND="
57 + >=virtual/jdk-1.8:*
58 + test? (
59 + dev-java/junit:0
60 + dev-java/ant-junit:0
61 + )"
62 +
63 +RDEPEND=">=virtual/jre-1.8:*"
64 +
65 +S="${WORKDIR}/${P}-src"
66 +
67 +PATCHES=(
68 + "${FILESDIR}/${P}-fixes.patch"
69 +)
70 +
71 +src_prepare() {
72 + default
73 +}
74 +
75 +src_compile() {
76 + local antflags
77 + if use test; then
78 + antflags="tf.jar -Djunit.jar=$(java-pkg_getjars --build-only junit)"
79 + fi
80 + eant jar $(use_doc) ${antflags}
81 +}
82 +
83 +src_test() {
84 + if [[ "${ARCH}" = "ppc" ]]; then
85 + einfo "tests are disabled on ppc"
86 + else
87 + ANT_TASKS="ant-junit" eant testjar -Djunit.jar="$(java-pkg_getjars junit)"
88 + fi
89 +}
90 +
91 +src_install() {
92 + java-pkg_newjar build/${P}.jar ${PN}.jar
93 + use test && \
94 + java-pkg_newjar build/${PN}-testframework-${PV}.jar \
95 + ${PN}-testframework.jar
96 +
97 + java-pkg_dohtml *.html
98 + if use doc; then
99 + java-pkg_dojavadoc build/docs/apidocs
100 + fi
101 + use source && java-pkg_dosrc src/java/*
102 +}
103
104 diff --git a/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch b/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch
105 new file mode 100644
106 index 00000000000..24a7bb2d709
107 --- /dev/null
108 +++ b/dev-java/commons-collections/files/commons-collections-3.2.2-fixes.patch
109 @@ -0,0 +1,201 @@
110 +diff --git a/build.xml b/build.xml
111 +index d6282d0..ea4c7b7 100644
112 +--- a/build.xml
113 ++++ b/build.xml
114 +@@ -154,8 +154,7 @@
115 +
116 + <!-- NOTE: A jar built using JDK1.4 is incompatible with JDK1.2 -->
117 + <jar jarfile="${build.jar.name}"
118 +- basedir="${build.classes}"
119 +- manifest="${build.conf}/MANIFEST.MF"/>
120 ++ basedir="${build.classes}"/>
121 + </target>
122 +
123 + <!-- ====================================================================== -->
124 +diff --git a/src/java/org/apache/commons/collections/MultiHashMap.java b/src/java/org/apache/commons/collections/MultiHashMap.java
125 +index 7fec9af..53470d1 100644
126 +--- a/src/java/org/apache/commons/collections/MultiHashMap.java
127 ++++ b/src/java/org/apache/commons/collections/MultiHashMap.java
128 +@@ -331,7 +331,7 @@ public class MultiHashMap extends HashMap implements MultiMap {
129 + * @param item the value to remove
130 + * @return the value removed (which was passed in), null if nothing removed
131 + */
132 +- public Object remove(Object key, Object item) {
133 ++ public Object removeMapping(Object key, Object item) {
134 + Collection valuesForKey = getCollection(key);
135 + if (valuesForKey == null) {
136 + return null;
137 +diff --git a/src/java/org/apache/commons/collections/MultiMap.java b/src/java/org/apache/commons/collections/MultiMap.java
138 +index be9455b..60375a6 100644
139 +--- a/src/java/org/apache/commons/collections/MultiMap.java
140 ++++ b/src/java/org/apache/commons/collections/MultiMap.java
141 +@@ -66,7 +66,7 @@ public interface MultiMap extends Map {
142 + * @throws ClassCastException if the key or value is of an invalid type
143 + * @throws NullPointerException if the key or value is null and null is invalid
144 + */
145 +- public Object remove(Object key, Object item);
146 ++ public Object removeMapping(Object key, Object item);
147 +
148 + //-----------------------------------------------------------------------
149 + /**
150 +diff --git a/src/java/org/apache/commons/collections/map/MultiKeyMap.java b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
151 +index 9e3e02d..65bffe9 100644
152 +--- a/src/java/org/apache/commons/collections/map/MultiKeyMap.java
153 ++++ b/src/java/org/apache/commons/collections/map/MultiKeyMap.java
154 +@@ -197,7 +197,7 @@ public class MultiKeyMap
155 + * @param key2 the second key
156 + * @return the value mapped to the removed key, null if key not in map
157 + */
158 +- public Object remove(Object key1, Object key2) {
159 ++ public Object removeMultiKey(Object key1, Object key2) {
160 + int hashCode = hash(key1, key2);
161 + int index = map.hashIndex(hashCode, map.data.length);
162 + AbstractHashedMap.HashEntry entry = map.data[index];
163 +diff --git a/src/java/org/apache/commons/collections/map/MultiValueMap.java b/src/java/org/apache/commons/collections/map/MultiValueMap.java
164 +index f44999b..fb1a4d1 100644
165 +--- a/src/java/org/apache/commons/collections/map/MultiValueMap.java
166 ++++ b/src/java/org/apache/commons/collections/map/MultiValueMap.java
167 +@@ -153,7 +153,7 @@ public class MultiValueMap extends AbstractMapDecorator implements MultiMap {
168 + * @param value the value to remove
169 + * @return the value removed (which was passed in), null if nothing removed
170 + */
171 +- public Object remove(Object key, Object value) {
172 ++ public Object removeMapping(Object key, Object value) {
173 + Collection valuesForKey = getCollection(key);
174 + if (valuesForKey == null) {
175 + return null;
176 +diff --git a/src/test/org/apache/commons/collections/TestMultiHashMap.java b/src/test/org/apache/commons/collections/TestMultiHashMap.java
177 +index eca833a..9d47438 100644
178 +--- a/src/test/org/apache/commons/collections/TestMultiHashMap.java
179 ++++ b/src/test/org/apache/commons/collections/TestMultiHashMap.java
180 +@@ -217,7 +217,7 @@ public class TestMultiHashMap extends AbstractTestMap {
181 + MultiHashMap one = new MultiHashMap();
182 + Integer value = new Integer(1);
183 + one.put("One", value);
184 +- one.remove("One", value);
185 ++ one.removeMapping("One", value);
186 +
187 + MultiHashMap two = new MultiHashMap();
188 + assertEquals(two, one);
189 +@@ -269,7 +269,7 @@ public class TestMultiHashMap extends AbstractTestMap {
190 + assertEquals(4, map.totalSize());
191 + map.remove("A");
192 + assertEquals(3, map.totalSize());
193 +- map.remove("B", "BC");
194 ++ map.removeMapping("B", "BC");
195 + assertEquals(2, map.totalSize());
196 + }
197 +
198 +@@ -292,7 +292,7 @@ public class TestMultiHashMap extends AbstractTestMap {
199 + map.remove("A");
200 + assertEquals(0, map.size("A"));
201 + assertEquals(3, map.size("B"));
202 +- map.remove("B", "BC");
203 ++ map.removeMapping("B", "BC");
204 + assertEquals(0, map.size("A"));
205 + assertEquals(2, map.size("B"));
206 + }
207 +@@ -464,11 +464,11 @@ public class TestMultiHashMap extends AbstractTestMap {
208 + map.put("A", "AA");
209 + map.put("A", "AB");
210 + map.put("A", "AC");
211 +- assertEquals(null, map.remove("C", "CA"));
212 +- assertEquals(null, map.remove("A", "AD"));
213 +- assertEquals("AC", map.remove("A", "AC"));
214 +- assertEquals("AB", map.remove("A", "AB"));
215 +- assertEquals("AA", map.remove("A", "AA"));
216 ++ assertEquals(null, map.removeMapping("C", "CA"));
217 ++ assertEquals(null, map.removeMapping("A", "AD"));
218 ++ assertEquals("AC", map.removeMapping("A", "AC"));
219 ++ assertEquals("AB", map.removeMapping("A", "AB"));
220 ++ assertEquals("AA", map.removeMapping("A", "AA"));
221 + assertEquals(new MultiHashMap(), map);
222 + }
223 +
224 +diff --git a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
225 +index dfde362..8287f33 100644
226 +--- a/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
227 ++++ b/src/test/org/apache/commons/collections/collection/AbstractTestCollection.java
228 +@@ -1116,7 +1116,7 @@ public abstract class AbstractTestCollection extends AbstractTestObject {
229 + verify();
230 +
231 + try {
232 +- array = collection.toArray(null);
233 ++ array = collection.toArray((Object[]) null);
234 + fail("toArray(null) should raise NPE");
235 + } catch (NullPointerException e) {
236 + // expected
237 +diff --git a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
238 +index b1ee3d0..9845721 100644
239 +--- a/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
240 ++++ b/src/test/org/apache/commons/collections/map/TestMultiKeyMap.java
241 +@@ -315,10 +315,10 @@ public class TestMultiKeyMap extends AbstractTestIterableMap {
242 + switch (key.size()) {
243 + case 2:
244 + assertEquals(true, multimap.containsKey(key.getKey(0), key.getKey(1)));
245 +- assertEquals(value, multimap.remove(key.getKey(0), key.getKey(1)));
246 ++ assertEquals(value, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
247 + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
248 + assertEquals(size - 1, multimap.size());
249 +- assertEquals(null, multimap.remove(key.getKey(0), key.getKey(1)));
250 ++ assertEquals(null, multimap.removeMultiKey(key.getKey(0), key.getKey(1)));
251 + assertEquals(false, multimap.containsKey(key.getKey(0), key.getKey(1)));
252 + break;
253 + case 3:
254 +diff --git a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
255 +index b9a5ac8..3138a83 100644
256 +--- a/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
257 ++++ b/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
258 +@@ -161,7 +161,7 @@ public class TestMultiValueMap extends TestCase {
259 + MultiValueMap one = new MultiValueMap();
260 + Integer value = new Integer(1);
261 + one.put("One", value);
262 +- one.remove("One", value);
263 ++ one.removeMapping("One", value);
264 +
265 + MultiValueMap two = new MultiValueMap();
266 + assertEquals(two, one);
267 +@@ -187,7 +187,7 @@ public class TestMultiValueMap extends TestCase {
268 + assertEquals(4, map.totalSize());
269 + map.remove("A");
270 + assertEquals(3, map.totalSize());
271 +- map.remove("B", "BC");
272 ++ map.removeMapping("B", "BC");
273 + assertEquals(2, map.totalSize());
274 + }
275 +
276 +@@ -204,7 +204,7 @@ public class TestMultiValueMap extends TestCase {
277 + assertEquals(2, map.size());
278 + map.remove("A");
279 + assertEquals(2, map.size());
280 +- map.remove("B", "BC");
281 ++ map.removeMapping("B", "BC");
282 + assertEquals(2, map.size());
283 + }
284 +
285 +@@ -227,7 +227,7 @@ public class TestMultiValueMap extends TestCase {
286 + map.remove("A");
287 + assertEquals(0, map.size("A"));
288 + assertEquals(3, map.size("B"));
289 +- map.remove("B", "BC");
290 ++ map.removeMapping("B", "BC");
291 + assertEquals(0, map.size("A"));
292 + assertEquals(2, map.size("B"));
293 + }
294 +@@ -338,11 +338,11 @@ public class TestMultiValueMap extends TestCase {
295 + map.put("A", "AA");
296 + map.put("A", "AB");
297 + map.put("A", "AC");
298 +- assertEquals(null, map.remove("C", "CA"));
299 +- assertEquals(null, map.remove("A", "AD"));
300 +- assertEquals("AC", map.remove("A", "AC"));
301 +- assertEquals("AB", map.remove("A", "AB"));
302 +- assertEquals("AA", map.remove("A", "AA"));
303 ++ assertEquals(null, map.removeMapping("C", "CA"));
304 ++ assertEquals(null, map.removeMapping("A", "AD"));
305 ++ assertEquals("AC", map.removeMapping("A", "AC"));
306 ++ assertEquals("AB", map.removeMapping("A", "AB"));
307 ++ assertEquals("AA", map.removeMapping("A", "AA"));
308 + assertEquals(new MultiValueMap(), map);
309 + }
310 +
Report Message
Find on MARC Find on Google Groups