Skip to content

Add commons-lang3 to dola-generator classpath #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mizdebsk merged 1 commit into from
Oct 10, 2025
Merged

Add commons-lang3 to dola-generator classpath #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions patches/dola/0001-Use-unique-namespace-for-bootstrapping.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From cf9b689849a7f0c4f56d726b9d64b2fefa23cca8 Mon Sep 17 00:00:00 2001
From a5543dbe75cf9f4f90dc4157aba941b2a44eb0a6 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 13 Jun 2025 15:49:34 +0200
Subject: [PATCH] Use unique namespace for bootstrapping
Subject: [PATCH 1/2] Use unique namespace for bootstrapping

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

25 changes: 25 additions & 0 deletions patches/dola/0002-Add-commons-lang3-to-dola-generator-classpath.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 899845993742fd70b46271e0d486a296bbbaa534 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 10 Oct 2025 17:54:17 +0200
Subject: [PATCH 2/2] Add commons-lang3 to dola-generator classpath

Forwarded: https://github.com/mizdebsk/dola/pull/42
---
dola-generator/src/main/conf/dola-generator.conf | 1 +
1 file changed, 1 insertion(+)

diff --git a/dola-generator/src/main/conf/dola-generator.conf b/dola-generator/src/main/conf/dola-generator.conf
index 0f114b4..c61be88 100644
--- a/dola-generator/src/main/conf/dola-generator.conf
+++ b/dola-generator/src/main/conf/dola-generator.conf
@@ -3,6 +3,7 @@ import io.kojan.dola.rpm from Realm:bsx-api
load /usr/share/javapackages-bootstrap/asm.jar
load /usr/share/javapackages-bootstrap/commons-compress.jar
load /usr/share/javapackages-bootstrap/commons-io.jar
+load /usr/share/javapackages-bootstrap/commons-lang3.jar
load /usr/share/javapackages-bootstrap/xmvn-api.jar
load /usr/share/javapackages-bootstrap/kojan-xml.jar
load /usr/share/javapackages-bootstrap/xmvn-core.jar
--
2.51.0