From 69ff199d585ed88f044fbc19402410fb140004ec0a45bdc3e9a01363bcd1a917 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2023 23:28:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=34 --- groovy18-timestamp.patch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/groovy18-timestamp.patch b/groovy18-timestamp.patch index 9e3d0d7..1773be5 100644 --- a/groovy18-timestamp.patch +++ b/groovy18-timestamp.patch @@ -23,7 +23,7 @@ public void visit(ASTNode[] astNodes, SourceUnit sourceUnit) { --- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 00:14:26.176051747 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 01:19:28.711554694 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-15 01:27:52.518115209 +0200 @@ -432,13 +432,13 @@ ClassHelper.long_TYPE, //"", @@ -46,14 +46,14 @@ protected void addCovariantMethods(ClassNode classNode) { - Map methodsToAdd = new HashMap(); - Map genericsSpec = new HashMap(); -+ Map methodsToAdd = new LinkedHashMap(); -+ Map genericsSpec = new LinkedHashMap(); ++ Map methodsToAdd = new TreeMap(); ++ Map genericsSpec = new TreeMap(); // unimplemented abstract methods from interfaces - Map abstractMethods = new HashMap(); - Map allInterfaceMethods = new HashMap(); -+ Map abstractMethods = new LinkedHashMap(); -+ Map allInterfaceMethods = new LinkedHashMap(); ++ Map abstractMethods = new TreeMap(); ++ Map allInterfaceMethods = new TreeMap(); ClassNode[] interfaces = classNode.getInterfaces(); for (ClassNode iface : interfaces) { Map ifaceMethodsMap = iface.getDeclaredMethodsMap(); @@ -62,7 +62,7 @@ addCovariantMethods(classNode, declaredMethods, abstractMethods, methodsToAdd, genericsSpec); - Map declaredMethodsMap = new HashMap(); -+ Map declaredMethodsMap = new LinkedHashMap(); ++ Map declaredMethodsMap = new TreeMap(); if (methodsToAdd.size() > 0) { for (MethodNode mn : declaredMethods) { declaredMethodsMap.put(mn.getTypeDescriptor(), mn); @@ -71,7 +71,7 @@ private Map createGenericsSpec(ClassNode current, Map oldSpec) { - Map ret = new HashMap(oldSpec); -+ Map ret = new LinkedHashMap(oldSpec); ++ Map ret = new TreeMap(oldSpec); // ret contains the type specs, what we now need is the type spec for the // current class. To get that we first apply the type parameters to the // current class and then use the type names of the current class to reset