Skip to content

Commit 368669a

Browse files
committed
Add commons-lang3 to dola-generator classpath
1 parent d44eba8 commit 368669a

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
From cf9b689849a7f0c4f56d726b9d64b2fefa23cca8 Mon Sep 17 00:00:00 2001
1+
From a5543dbe75cf9f4f90dc4157aba941b2a44eb0a6 Mon Sep 17 00:00:00 2001
22
From: Mikolaj Izdebski <mizdebsk@redhat.com>
33
Date: Fri, 13 Jun 2025 15:49:34 +0200
4-
Subject: [PATCH] Use unique namespace for bootstrapping
4+
Subject: [PATCH 1/2] Use unique namespace for bootstrapping
55

66
When used in bootstrap mode, update file paths, RPM macro names
77
etc. so that they are distinct from non-bootstrap Dola packages.
@@ -296,5 +296,5 @@ index 95e9160..f56fd7b 100644
296296
-%__os_install_post %{lua:(require "dola-generator").os_install_post()}
297297
+%__os_install_post %{lua:(require "javapackages-bootstrap-dola-generator").os_install_post()}
298298
--
299-
2.50.1
299+
2.51.0
300300

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From 899845993742fd70b46271e0d486a296bbbaa534 Mon Sep 17 00:00:00 2001
2+
From: Mikolaj Izdebski <mizdebsk@redhat.com>
3+
Date: Fri, 10 Oct 2025 17:54:17 +0200
4+
Subject: [PATCH 2/2] Add commons-lang3 to dola-generator classpath
5+
6+
Forwarded: https://github.com/mizdebsk/dola/pull/42
7+
---
8+
dola-generator/src/main/conf/dola-generator.conf | 1 +
9+
1 file changed, 1 insertion(+)
10+
11+
diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf
12+
index 0f114b4..c61be88 100644
13+
--- a/dola-generator/src/main/conf/dola-generator.conf
14+
+++ b/dola-generator/src/main/conf/dola-generator.conf
15+
@@ -3,6 +3,7 @@ import io.kojan.dola.rpm from Realm:bsx-api
16+
load /usr/share/javapackages-bootstrap/asm.jar
17+
load /usr/share/javapackages-bootstrap/commons-compress.jar
18+
load /usr/share/javapackages-bootstrap/commons-io.jar
19+
+load /usr/share/javapackages-bootstrap/commons-lang3.jar
20+
load /usr/share/javapackages-bootstrap/xmvn-api.jar
21+
load /usr/share/javapackages-bootstrap/kojan-xml.jar
22+
load /usr/share/javapackages-bootstrap/xmvn-core.jar
23+
--
24+
2.51.0
25+

0 commit comments

Comments
 (0)