rpms/javapackages-bootstrap
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Ensure stable order of Sisu component list

Browse Source 
Related: RHEL-17126
This commit is contained in:
Marián Konček 2024-02-02 14:09:23 +01:00
parent 6081ceae84
commit 269aa7a6e2
2 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0002-Ensure-stable-order-of-Sisu-component-list.patch Normal file
View File

@ -0,0 +1,38 @@
From 1338780416e7f046b72d5d269bf6167e5281f66e Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Fri, 2 Feb 2024 14:05:08 +0100
Subject: [PATCH] Ensure stable order of Sisu component list Upstream related
fix:
https://github.com/fedora-java/javapackages-bootstrap/commit/d18cc7bd703f6a53baeb6145ac0c876d56cef46a
---
mbi/cdc/src/org/fedoraproject/mbi/tool/cdc/CdcTool.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/mbi/cdc/src/org/fedoraproject/mbi/tool/cdc/CdcTool.java b/mbi/cdc/src/org/fedoraproject/mbi/tool/cdc/CdcTool.java
index 6965b0c..bf22268 100644
--- a/mbi/cdc/src/org/fedoraproject/mbi/tool/cdc/CdcTool.java
+++ b/mbi/cdc/src/org/fedoraproject/mbi/tool/cdc/CdcTool.java
@@ -20,8 +20,8 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
import java.util.stream.Collectors;
import javax.inject.Named;
@@ -62,7 +62,7 @@ public class CdcTool
private Element plexusComponents;
- private List<String> sisuComponents = new ArrayList<>();
+ private Set<String> sisuComponents = new TreeSet<>();
@Override
public void initialize()
--
2.43.0

7
javapackages-bootstrap.spec
View File

@ -17,7 +17,7 @@
Name: javapackages-bootstrap
Version: 1.7.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: A means of bootstrapping Java Packages Tools
# For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING
License: ASL 2.0 and ASL 1.1 and (ASL 2.0 or EPL-2.0) and (EPL-2.0 or GPLv2 with exceptions) and MIT and BSD with advertising and BSD and EPL-1.0 and EPL-2.0 and CDDL-1.0 and xpp and CC0 and Public Domain
@ -150,6 +150,7 @@ Source1107: xmvn.tar.xz
Source1108: xz-java.tar.xz
Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch
Patch1: 0002-Ensure-stable-order-of-Sisu-component-list.patch
Provides: bundled(ant) = 1.10.12
Provides: bundled(apache-parent) = 26
@ -308,6 +309,7 @@ do
done
%patch0 -p1
%patch1 -p1
for patch_path in patches/*/*
do
@ -361,6 +363,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_
%doc AUTHORS
%changelog
* Fri Feb 02 2024 Marián Konček <mkoncek@redhat.com> - 1.7.1-3
- Ensure stable order of Sisu component list
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild