1- From 317e281e2fc5331c24ebf412f23372ce18c5fe75 Mon Sep 17 00:00:00 2001
1+ From cf9b689849a7f0c4f56d726b9d64b2fefa23cca8 Mon Sep 17 00:00:00 2001
22From: Mikolaj Izdebski <mizdebsk@redhat.com>
33Date: Fri, 13 Jun 2025 15:49:34 +0200
44Subject: [PATCH] Use unique namespace for bootstrapping
@@ -15,15 +15,15 @@ Forwarded: not-needed
1515 dola-dbs/src/main/conf/dola-dbs.conf | 6 ++--
1616 .../io/kojan/dola/imperator/Imperator.java | 12 ++++----
1717 dola-dbs/src/main/lua/dola-dbs.lua | 2 +-
18- dola-dbs/src/main/rpm/macros.dola-dbs | 8 +++ ---
19- .../src/main/conf/dola-generator.conf | 28 ++++++++++ ---------
20- .../generator/stub/CompoundGenerator.java | 8 +++ ---
18+ dola-dbs/src/main/rpm/macros.dola-dbs | 8 ++---
19+ .../src/main/conf/dola-generator.conf | 30 +++++++++- ---------
20+ .../generator/stub/CompoundGenerator.java | 8 ++---
2121 .../dola/generator/stub/CompoundHook.java | 4 +--
2222 .../src/main/lua/dola-generator.lua | 2 +-
23- dola-generator/src/main/rpm/dolagen.attr | 8 +++ ---
24- .../src/main/rpm/macros.dola-generator | 8 +++ ---
23+ dola-generator/src/main/rpm/dolagen.attr | 8 ++---
24+ .../src/main/rpm/macros.dola-generator | 8 ++---
2525 .../src/main/rpm/macros.dola-generator-etc | 2 +-
26- 15 files changed, 52 insertions(+), 50 deletions(-)
26+ 15 files changed, 52 insertions(+), 52 deletions(-)
2727
2828diff --git a/dola-bsx-api/src/main/conf/dola-bsx-api.conf b/dola-bsx-api/src/main/conf/dola-bsx-api.conf
2929index c4c3159..603aa83 100644
@@ -59,7 +59,7 @@ index e178d0b..6dbba8c 100644
5959 -- Initialize JVM
6060 if not lujavrite.initialized() then
6161diff --git a/dola-bsx/src/main/rpm/macros.dola-bsx b/dola-bsx/src/main/rpm/macros.dola-bsx
62- index 1cce21e..bc34ca9 100644
62+ index 1cce21e..176a7c8 100644
6363--- a/dola-bsx/src/main/rpm/macros.dola-bsx
6464+++ b/dola-bsx/src/main/rpm/macros.dola-bsx
6565@@ -1,5 +1,5 @@
@@ -155,25 +155,27 @@ index f0331de..d389903 100644
155155+ %buildsystem_maven_build(-) %{lua:(require "javapackages-bootstrap-dola-dbs").build()}
156156+ %buildsystem_maven_install(-) %{lua:(require "javapackages-bootstrap-dola-dbs").install()}
157157diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf
158- index 1f3c286 ..0f114b4 100644
158+ index 3c7cc57 ..0f114b4 100644
159159--- a/dola-generator/src/main/conf/dola-generator.conf
160160+++ b/dola-generator/src/main/conf/dola-generator.conf
161- @@ -1,15 +1,17 @@
161+ @@ -1,17 +1,17 @@
162162 [Realm:generator]
163163 import io.kojan.dola.rpm from Realm:bsx-api
164- - load /usr/share/java/dola/dola-generator.jar
165164- load /usr/share/java/objectweb-asm/asm.jar
166165- load /usr/share/java/commons-compress.jar
167166- load /usr/share/java/commons-io.jar
168167- load /usr/share/java/xmvn5/xmvn-api-5.0.0.jar
169168- load /usr/share/java/kojan-xml/kojan-xml.jar
170169- load /usr/share/java/xmvn5/xmvn-core-5.0.0.jar
171- - load /usr/share/java/maven4/maven-api-model-4.0.0-rc-3 .jar
172- - load /usr/share/java/maven4/maven-impl-4.0.0-rc-3 .jar
173- - load /usr/share/java/maven4/maven-api-xml-4.0.0-rc-3 .jar
174- - load /usr/share/java/maven4/maven-xml-4.0.0-rc-3 .jar
175- - load /usr/share/java/maven4/maven-support-4.0.0-rc-3 .jar
170+ - load /usr/share/java/maven4/maven-api-model-4.0.0-rc-4 .jar
171+ - load /usr/share/java/maven4/maven-impl-4.0.0-rc-4 .jar
172+ - load /usr/share/java/maven4/maven-api-xml-4.0.0-rc-4 .jar
173+ - load /usr/share/java/maven4/maven-xml-4.0.0-rc-4 .jar
174+ - load /usr/share/java/maven4/maven-support-4.0.0-rc-4 .jar
176175- load /usr/share/java/plexus-utils4/plexus-utils-4.0.2.jar
176+ - load /usr/share/java/woodstox-core/woodstox-core.jar
177+ - load /usr/share/java/stax2-api/stax2-api.jar
178+ - load /usr/share/java/dola/dola-generator.jar
177179+ load /usr/share/javapackages-bootstrap/asm.jar
178180+ load /usr/share/javapackages-bootstrap/commons-compress.jar
179181+ load /usr/share/javapackages-bootstrap/commons-io.jar
0 commit comments