From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evrtw-0004zA-1U for guix-patches@gnu.org; Tue, 13 Mar 2018 17:56:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evrtr-0003nR-Ua for guix-patches@gnu.org; Tue, 13 Mar 2018 17:56:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:52187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evrtr-0003nK-Qm for guix-patches@gnu.org; Tue, 13 Mar 2018 17:56:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1evrtr-0002Ap-GK for guix-patches@gnu.org; Tue, 13 Mar 2018 17:56:03 -0400 Subject: [bug#30811] [PATCH] gnu: java-simple-xml: Fix java8 test failures. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:45557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evrtE-0004JO-8F for guix-patches@gnu.org; Tue, 13 Mar 2018 17:55:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evrtA-0003Vn-1Q for guix-patches@gnu.org; Tue, 13 Mar 2018 17:55:24 -0400 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:42895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1evrt9-0003Vd-N2 for guix-patches@gnu.org; Tue, 13 Mar 2018 17:55:19 -0400 Received: by mail-wr0-x22e.google.com with SMTP id s18so2406414wrg.9 for ; Tue, 13 Mar 2018 14:55:19 -0700 (PDT) From: =?UTF-8?Q?G=C3=A1bor?= Boskovits Date: Tue, 13 Mar 2018 22:55:10 +0100 Message-Id: <20180313215510.27700-1-boskovits@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 30811@debbugs.gnu.org Cc: =?UTF-8?Q?G=C3=A1bor?= Boskovits * gnu/packages/patches/javas-simple-xml-fix-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/java.scm (java-simple-xml)[source](patches): Add it. --- gnu/local.mk | 1 + .../patches/java-simple-xml-fix-tests.patch | 37 ++++++++++++++++++++++ gnu/packages/xml.scm | 3 +- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/java-simple-xml-fix-tests.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5a3ae502f..5c7ce9cb2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -788,6 +788,7 @@ dist_patch_DATA = \ %D%/packages/patches/jacal-fix-texinfo.patch \ %D%/packages/patches/java-jeromq-fix-tests.patch \ %D%/packages/patches/java-powermock-fix-java-files.patch \ + %D%/packages/patches/java-simple-xml-fix-tests.patch \ %D%/packages/patches/java-xerces-bootclasspath.patch \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ diff --git a/gnu/packages/patches/java-simple-xml-fix-tests.patch b/gnu/packages/patches/java-simple-xml-fix-tests.patch new file mode 100644 index 000000000..6270b8700 --- /dev/null +++ b/gnu/packages/patches/java-simple-xml-fix-tests.patch @@ -0,0 +1,37 @@ +From b3b7a305f1278ec414500bf96c4c7a7f634c941b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jens=20Thee=C3=9F?= +Date: Thu, 15 Sep 2016 13:08:26 +0200 +Subject: [PATCH] Dictionary uses stable order. This fixes unit tests. + +This is upstream pull request #15: +https://github.com/ngallagher/simplexml/pull/15 +This software is unmaintained, this pull request will no get merged. +The patch is modified, to match the directory layout of the tarball. + +--- + src/main/java/org/simpleframework/xml/util/Dictionary.java | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/org/simpleframework/xml/util/Dictionary.java b/src/main/java/org/simpleframework/xml/util/Dictionary.java +index 077d2514..c7327426 100644 +--- a/src/org/simpleframework/xml/util/Dictionary.java ++++ b/src/org/simpleframework/xml/util/Dictionary.java +@@ -19,8 +19,8 @@ + package org.simpleframework.xml.util; + + import java.util.AbstractSet; +-import java.util.HashMap; + import java.util.Iterator; ++import java.util.LinkedHashMap; + + /** + * The Dictionary object represents a mapped set of entry +@@ -134,7 +134,7 @@ public T remove(String name) { + * + * @see org.simpleframework.xml.util.Entry + */ +- private static class Table extends HashMap { ++ private static class Table extends LinkedHashMap { + + /** + * Constructor for the Table object. This will diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 4087c75e1..47949f140 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -1309,7 +1309,8 @@ SAX2 APIs.") version ".zip")) (sha256 (base32 - "0w19k1awslmihpwsxwjbg89hv0vjhk4k3i0vrfchy3mqknd988y5")))) + "0w19k1awslmihpwsxwjbg89hv0vjhk4k3i0vrfchy3mqknd988y5")) + (patches (search-patches "java-simple-xml-fix-tests.patch")))) (build-system ant-build-system) (arguments `(#:build-target "build" -- 2.16.2