From 4a72a27ddbabf0e4d4d0af4b3ec6db71e248450e6b19ae3263ded1394d6c83ef Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Sep 2023 17:58:43 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/groovy18?expand=0&rev=44 --- reproducible-builds.patch | 332 ++++++++++++++------------------------ 1 file changed, 124 insertions(+), 208 deletions(-) diff --git a/reproducible-builds.patch b/reproducible-builds.patch index 10d29f4..31b6558 100644 --- a/reproducible-builds.patch +++ b/reproducible-builds.patch @@ -1,222 +1,138 @@ ---- groovy-core-GROOVY_1_8_9/src/main/groovy/lang/ExpandoMetaClass.java 2023-09-26 13:31:23.322875980 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/groovy/lang/ExpandoMetaClass.java 2023-09-26 18:35:02.982905358 +0200 -@@ -21,9 +21,8 @@ - import java.util.ArrayList; - import java.util.Collection; +--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/ClassNode.java 2023-09-26 13:31:23.339542759 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/ClassNode.java 2023-09-26 19:47:32.055269643 +0200 +@@ -406,7 +406,7 @@ + } + + public Set getAllInterfaces () { +- Set res = new HashSet(); ++ Set res = new LinkedHashSet(); + getAllInterfaces(res); + return res; + } +--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 13:31:23.339542759 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/VariableScope.java 2023-09-26 19:45:48.534571007 +0200 +@@ -16,8 +16,8 @@ + package org.codehaus.groovy.ast; + import java.util.Collections; --import java.util.HashSet; -+import java.util.TreeSet; +-import java.util.HashMap; import java.util.Iterator; --import java.util.LinkedHashSet; - import java.util.List; ++import java.util.LinkedHashMap; import java.util.Map; - import java.util.Set; -@@ -279,7 +278,7 @@ - final private boolean allowChangesAfterInit; - public boolean inRegistry; - -- private final Set inheritedMetaMethods = new HashSet(); -+ private final Set inheritedMetaMethods = new TreeSet(); - private final Map beanPropertyCache = new ConcurrentHashMap(); - private final Map staticBeanPropertyCache = new ConcurrentHashMap(); - private final Map expandoMethods = new ConcurrentHashMap(); -@@ -291,7 +290,7 @@ - private final ConcurrentHashMap expandoSubclassMethods = new ConcurrentHashMap(); - private final Map expandoProperties = new ConcurrentHashMap(); - private ClosureStaticMetaMethod invokeStaticMethodMethod; -- private final Set mixinClasses = new LinkedHashSet(); -+ private final Set mixinClasses = new TreeSet(); - - private ExpandoMetaClass(Class theClass, boolean register, boolean allowChangesAfterInit, MetaMethod[] add) { - super(GroovySystem.getMetaClassRegistry(), theClass, add); ---- groovy-core-GROOVY_1_8_9/src/main/groovy/util/ProxyGenerator.java 2023-09-26 13:31:23.332876047 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/groovy/util/ProxyGenerator.java 2023-09-26 16:00:10.274451173 +0200 -@@ -96,7 +96,7 @@ - } - - public GroovyObject instantiateAggregateFromBaseClass(Closure cl, Class clazz) { -- Map m = new HashMap(); -+ Map m = new TreeMap(); - m.put("*", cl); - return instantiateAggregateFromBaseClass(m, clazz, null); - } -@@ -132,7 +132,7 @@ - } - - public GroovyObject instantiateAggregate(Map closureMap, List interfaces, Class clazz, Object[] constructorArgs) { -- Map map = new HashMap(); -+ Map map = new TreeMap(); - if (closureMap != null) { - map = closureMap; - } -@@ -181,7 +181,7 @@ - buffer.append(" }\n"); - - // add overwriting methods -- Map selectedMethods = new HashMap(); -+ Map selectedMethods = new TreeMap(); - List publicAndProtectedMethods = getInheritedMethods(baseClass, new ArrayList()); - boolean closureIndicator = map.containsKey("*"); - for (Method method : publicAndProtectedMethods) { -@@ -269,7 +269,7 @@ - } - - public GroovyObject instantiateDelegateWithBaseClass(Map closureMap, List interfaces, Object delegate, Class baseClass, String name) { -- Map map = new HashMap(); -+ Map map = new TreeMap(); - if (closureMap != null) { - map = closureMap; - } ---- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 13:31:23.336209403 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ant/Groovyc.java 2023-09-26 13:31:35.556291444 +0200 -@@ -53,11 +53,11 @@ - import java.util.Arrays; - import java.util.Enumeration; - import java.util.Iterator; --import java.util.LinkedHashSet; - import java.util.List; - import java.util.Map; - import java.util.Set; - import java.util.StringTokenizer; -+import java.util.TreeSet; /** - * Compiles Groovy source files. This task can take the following arguments: -@@ -127,7 +127,7 @@ - private boolean keepStubs; - private String scriptBaseClass; +@@ -107,17 +107,17 @@ + VariableScope copy = new VariableScope(); + copy.clazzScope = clazzScope; + if (declaredVariables.size() > 0) { +- copy.declaredVariables = new HashMap(); ++ copy.declaredVariables = new LinkedHashMap(); + copy.declaredVariables.putAll(declaredVariables); + } + copy.inStaticContext = inStaticContext; + copy.parent = parent; + if (referencedClassVariables.size() > 0) { +- copy.referencedClassVariables = new HashMap(); ++ copy.referencedClassVariables = new LinkedHashMap(); + copy.referencedClassVariables.putAll(referencedClassVariables); + } + if (referencedLocalVariables.size() > 0) { +- copy.referencedLocalVariables = new HashMap(); ++ copy.referencedLocalVariables = new LinkedHashMap(); + copy.referencedLocalVariables.putAll(referencedLocalVariables); + } + copy.resolvesDynamic = resolvesDynamic; +@@ -126,7 +126,7 @@ -- private Set scriptExtensions = new LinkedHashSet(); -+ private Set scriptExtensions = new TreeSet(); - - /** - * Adds a path for source compilation. -@@ -658,7 +658,7 @@ - */ - protected void resetFileLists() { - compileList = new File[0]; -- scriptExtensions = new LinkedHashSet(); -+ scriptExtensions = new TreeSet(); + public void putDeclaredVariable(Variable var) { + if (declaredVariables == Collections.EMPTY_MAP) +- declaredVariables = new HashMap(); ++ declaredVariables = new LinkedHashMap(); + declaredVariables.put(var.getName(), var); } - /** ---- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java 2023-09-26 13:31:23.336209403 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/antlr/AntlrParserPlugin.java 2023-09-26 18:44:07.573225992 +0200 -@@ -42,7 +42,7 @@ - import java.security.AccessController; - import java.security.PrivilegedAction; +@@ -144,13 +144,13 @@ + + public void putReferencedLocalVariable(Variable var) { + if (referencedLocalVariables == Collections.EMPTY_MAP) +- referencedLocalVariables = new HashMap(); ++ referencedLocalVariables = new LinkedHashMap(); + referencedLocalVariables.put(var.getName(), var); + } + + public void putReferencedClassVariable(Variable var) { + if (referencedClassVariables == Collections.EMPTY_MAP) +- referencedClassVariables = new HashMap(); ++ referencedClassVariables = new LinkedHashMap(); + referencedClassVariables.put(var.getName(), var); + } + +--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java 2023-09-26 13:31:23.362876249 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/ASTTransformationVisitor.java 2023-09-26 19:55:46.378599493 +0200 +@@ -59,7 +59,7 @@ + private Map> transforms; + private Map, ASTTransformation> transformInstances; + private static CompilationUnit compUnit; +- private static Set globalTransformNames = new HashSet(); ++ private static Set globalTransformNames = new LinkedHashSet(); + + private ASTTransformationVisitor(CompilePhase phase) { + this.phase = phase; +--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java 2023-09-26 13:31:23.362876249 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/CategoryASTTransformation.java 2023-09-26 19:55:31.251830932 +0200 +@@ -31,7 +31,7 @@ + import groovy.lang.Reference; + + import java.util.Arrays; +-import java.util.HashSet; ++import java.util.LinkedHashSet; + import java.util.LinkedList; + import java.util.List; + import java.util.Set; +@@ -71,7 +71,7 @@ + ClassNode targetClass = getTargetClass(source, annotation); + + final LinkedList> varStack = new LinkedList>(); +- Set names = new HashSet(); ++ Set names = new LinkedHashSet(); + for (FieldNode field : parent.getFields()) { + names.add(field.getName()); + } +@@ -83,7 +83,7 @@ + } + + private void addVariablesToStack(Parameter[] params) { +- Set names = new HashSet(); ++ Set names = new LinkedHashSet(); + names.addAll(varStack.getLast()); + for (Parameter param : params) { + names.add(param.getName()); +@@ -107,7 +107,7 @@ + + @Override + public void visitBlockStatement(BlockStatement block) { +- Set names = new HashSet(); ++ Set names = new LinkedHashSet(); + names.addAll(varStack.getLast()); + varStack.add(names); + super.visitBlockStatement(block); +--- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java 2023-09-26 13:31:23.362876249 +0200 ++++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/transform/DelegateASTTransformation.java 2023-09-26 19:51:23.170159705 +0200 +@@ -34,7 +34,7 @@ import java.util.ArrayList; + import java.util.Arrays; + import java.util.Collections; -import java.util.HashSet; -+import java.util.TreeSet; - import java.util.Iterator; - import java.util.LinkedList; ++import java.util.LinkedHashSet; import java.util.List; -@@ -2573,7 +2573,7 @@ - private void checkDuplicateNamedParams(AST elist, List expressionList) { - if (expressionList.isEmpty()) return; + import java.util.Set; -- Set namedArgumentNames = new HashSet(); -+ Set namedArgumentNames = new TreeSet(); - for (Object expression : expressionList) { - MapEntryExpression meExp = (MapEntryExpression) expression; - if (meExp.getKeyExpression() instanceof ConstantExpression) { ---- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/ModuleNode.java 2023-09-26 13:31:23.339542759 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/ast/ModuleNode.java 2023-09-26 18:45:07.250294772 +0200 -@@ -44,10 +44,10 @@ - private BlockStatement statementBlock = new BlockStatement(); - List classes = new LinkedList(); - private List methods = new ArrayList(); -- private Map imports = new HashMap(); -+ private Map imports = new TreeMap(); - private List starImports = new ArrayList(); -- private Map staticImports = new LinkedHashMap(); -- private Map staticStarImports = new LinkedHashMap(); -+ private Map staticImports = new TreeMap(); -+ private Map staticStarImports = new TreeMap(); - private CompileUnit unit; - private PackageNode packageNode; - private String description; ---- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-26 13:31:23.342876115 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/classgen/Verifier.java 2023-09-26 15:48:16.126304739 +0200 -@@ -139,7 +139,7 @@ - for (ClassNode classNode : classNodes) { - interfaces.add(classNode.getName()); - } -- Set interfaceSet = new HashSet(interfaces); -+ Set interfaceSet = new TreeSet(interfaces); - if (interfaceSet.size() != interfaces.size()) { - throw new RuntimeParserException("Duplicate interfaces in implements list: " + interfaces, classNode); - } -@@ -832,7 +832,7 @@ - List staticStatements = new ArrayList(); - final boolean isEnum = node.isEnum(); - List initStmtsAfterEnumValuesInit = new ArrayList(); -- Set explicitStaticPropsInEnum = new HashSet(); -+ Set explicitStaticPropsInEnum = new TreeSet(); - if (isEnum) { - for (PropertyNode propNode : node.getProperties()) { - if (!propNode.isSynthetic() && propNode.getField().isStatic()) { -@@ -1051,12 +1051,12 @@ +@@ -111,7 +111,7 @@ } - protected void addCovariantMethods(ClassNode classNode) { -- Map methodsToAdd = new HashMap(); -- Map genericsSpec = new HashMap(); -+ Map methodsToAdd = new TreeMap(); -+ Map genericsSpec = new TreeMap(); - - // unimplemented abstract methods from interfaces -- Map abstractMethods = new HashMap(); -- Map allInterfaceMethods = new HashMap(); -+ Map abstractMethods = new TreeMap(); -+ Map allInterfaceMethods = new TreeMap(); - ClassNode[] interfaces = classNode.getInterfaces(); - for (ClassNode iface : interfaces) { - Map ifaceMethodsMap = iface.getDeclaredMethodsMap(); -@@ -1086,7 +1086,7 @@ - - addCovariantMethods(classNode, declaredMethods, abstractMethods, methodsToAdd, genericsSpec); - -- Map declaredMethodsMap = new HashMap(); -+ Map declaredMethodsMap = new TreeMap(); - if (methodsToAdd.size() > 0) { - for (MethodNode mn : declaredMethods) { - declaredMethodsMap.put(mn.getTypeDescriptor(), mn); -@@ -1336,7 +1336,7 @@ - } - - private Map createGenericsSpec(ClassNode current, Map oldSpec) { -- Map ret = new HashMap(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 ---- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/runtime/ClassExtender.java 2023-09-26 13:31:23.352876182 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/runtime/ClassExtender.java 2023-09-26 18:56:10.658079617 +0200 -@@ -17,7 +17,7 @@ - - import groovy.lang.Closure; - --import java.util.HashMap; -+import java.util.TreeMap; - import java.util.Map; - - -@@ -82,6 +82,6 @@ - } - - protected Map createMap() { -- return new HashMap(); -+ return new TreeMap(); - } - } ---- groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java 2023-09-26 13:31:23.359542893 +0200 -+++ groovy-core-GROOVY_1_8_9/src/main/org/codehaus/groovy/tools/FileSystemCompiler.java 2023-09-26 13:54:05.625117288 +0200 -@@ -246,6 +246,7 @@ - if (errors) { - return null; - } else { -+ Collections.sort(fileList); - return fileList.toArray(new String[fileList.size()]); - } - } + private Set getInterfacesAndSuperInterfaces(ClassNode type) { +- Set res = new HashSet(); ++ Set res = new LinkedHashSet(); + if (type.isInterface()) { + res.add(type); + return res;