1- From 1848d8360cbd5affef98fa7619f1c5499b791034 Mon Sep 17 00:00:00 2001
1+ From 317e281e2fc5331c24ebf412f23372ce18c5fe75 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
@@ -10,20 +10,20 @@ Forwarded: not-needed
1010---
1111 dola-bsx-api/src/main/conf/dola-bsx-api.conf | 2 +-
1212 dola-bsx/src/main/conf/dola-bsx.conf | 2 +-
13- dola-bsx/src/main/lua/dola-bsx.lua | 6 ++---
13+ dola-bsx/src/main/lua/dola-bsx.lua | 6 ++--
1414 dola-bsx/src/main/rpm/macros.dola-bsx | 4 +--
15- dola-dbs/src/main/conf/dola-dbs.conf | 6 ++---
16- .../io/kojan/dola/imperator/Imperator.java | 12 ++++-----
15+ dola-dbs/src/main/conf/dola-dbs.conf | 6 ++--
16+ .../io/kojan/dola/imperator/Imperator.java | 12 ++++----
1717 dola-dbs/src/main/lua/dola-dbs.lua | 2 +-
1818 dola-dbs/src/main/rpm/macros.dola-dbs | 8 +++---
19- .../src/main/conf/dola-generator.conf | 26 +++++++++- ---------
19+ .../src/main/conf/dola-generator.conf | 28 ++++++++++ ---------
2020 .../generator/stub/CompoundGenerator.java | 8 +++---
2121 .../dola/generator/stub/CompoundHook.java | 4 +--
2222 .../src/main/lua/dola-generator.lua | 2 +-
2323 dola-generator/src/main/rpm/dolagen.attr | 8 +++---
2424 .../src/main/rpm/macros.dola-generator | 8 +++---
2525 .../src/main/rpm/macros.dola-generator-etc | 2 +-
26- 15 files changed, 50 insertions(+), 50 deletions(-)
26+ 15 files changed, 52 insertions(+), 50 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
@@ -155,10 +155,10 @@ 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..505a40e 100644
158+ index 1f3c286..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,15 @@
161+ @@ -1,15 +1,17 @@
162162 [Realm:generator]
163163 import io.kojan.dola.rpm from Realm:bsx-api
164164- load /usr/share/java/dola/dola-generator.jar
@@ -174,7 +174,6 @@ index 1f3c286..505a40e 100644
174174- load /usr/share/java/maven4/maven-xml-4.0.0-rc-3.jar
175175- load /usr/share/java/maven4/maven-support-4.0.0-rc-3.jar
176176- load /usr/share/java/plexus-utils4/plexus-utils-4.0.2.jar
177- + load /usr/share/javapackages-bootstrap/dola-generator.jar
178177+ load /usr/share/javapackages-bootstrap/asm.jar
179178+ load /usr/share/javapackages-bootstrap/commons-compress.jar
180179+ load /usr/share/javapackages-bootstrap/commons-io.jar
@@ -187,6 +186,9 @@ index 1f3c286..505a40e 100644
187186+ load /usr/share/javapackages-bootstrap/maven-xml-4.0.0-rc-4.jar
188187+ load /usr/share/javapackages-bootstrap/maven-support-4.0.0-rc-4.jar
189188+ load /usr/share/javapackages-bootstrap/plexus-utils-4.0.2.jar
189+ + load /usr/share/javapackages-bootstrap/woodstox-core.jar
190+ + load /usr/share/javapackages-bootstrap/stax2-api.jar
191+ + load /usr/share/javapackages-bootstrap/dola-generator.jar
190192diff --git a/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java b/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java
191193index 04641da..1f47f7c 100644
192194--- a/dola-generator/src/main/java/io/kojan/dola/generator/stub/CompoundGenerator.java
0 commit comments