From 1334fdbd79d2a6709c5731249451ca38d1149d1a Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Tue, 14 Apr 2026 20:22:42 -0500 Subject: [PATCH 1/4] Bump Install4J Bundled JRE to Zulu 17.0.18 Signed-off-by: Mitch Gaffigan --- tools/install4j/oie-installer-config.install4j | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j index 30dc8cada..c787418f9 100644 --- a/tools/install4j/oie-installer-config.install4j +++ b/tools/install4j/oie-installer-config.install4j @@ -4,7 +4,7 @@ - + From 07fb4df5bd163b0a05fdabe904bb3744bf1b0420 Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Tue, 14 Apr 2026 20:23:39 -0500 Subject: [PATCH 2/4] Fix install4j build after oieserver was added in tree Signed-off-by: Mitch Gaffigan --- tools/install4j/oie-installer-config.install4j | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j index c787418f9..eb074b206 100644 --- a/tools/install4j/oie-installer-config.install4j +++ b/tools/install4j/oie-installer-config.install4j @@ -17,15 +17,19 @@ + + + + - - + + @@ -33,7 +37,6 @@ - From fb2186fdceb534b2517a4d4f6a3d53294ae11b07 Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Tue, 14 Apr 2026 20:24:31 -0500 Subject: [PATCH 3/4] Auto-stop and auto-start service after install (avoid failed upgrades) Signed-off-by: Mitch Gaffigan --- tools/install4j/oie-installer-config.install4j | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j index eb074b206..ac3fdc0e8 100644 --- a/tools/install4j/oie-installer-config.install4j +++ b/tools/install4j/oie-installer-config.install4j @@ -430,6 +430,11 @@ return true; com.oie.oieservice + + + 25 + + @@ -504,6 +509,11 @@ return console.askYesNo(message, true); + + + 25 + + From 20f9a0c041260f93fac580242fe8acd716d0101f Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Tue, 14 Apr 2026 20:25:13 -0500 Subject: [PATCH 4/4] Allow one-click installer build from single repo Signed-off-by: Mitch Gaffigan --- tools/install4j/.gitignore | 1 + .../install4j/oie-installer-config.install4j | 26 ++++++++++-------- ...oie_logo_only_white_background_128x128.png | Bin 0 -> 9185 bytes 3 files changed, 15 insertions(+), 12 deletions(-) create mode 100644 tools/install4j/.gitignore create mode 100644 tools/install4j/oie_logo_only_white_background_128x128.png diff --git a/tools/install4j/.gitignore b/tools/install4j/.gitignore new file mode 100644 index 000000000..935600cae --- /dev/null +++ b/tools/install4j/.gitignore @@ -0,0 +1 @@ +*.install4j~ \ No newline at end of file diff --git a/tools/install4j/oie-installer-config.install4j b/tools/install4j/oie-installer-config.install4j index ac3fdc0e8..fd1e9adca 100644 --- a/tools/install4j/oie-installer-config.install4j +++ b/tools/install4j/oie-installer-config.install4j @@ -1,8 +1,8 @@ - - + + - + @@ -15,7 +15,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -64,7 +64,7 @@ -Dapple.awt.UIElement=true - + @@ -85,7 +85,7 @@ -Dapple.awt.UIElement=true - + @@ -97,7 +97,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -120,7 +120,7 @@ - ${compiler:installer:mediaRoot}/../governance/branding/icons/oie_logo_only_white_background_128x128.png + ${compiler:installer:mediaRoot}tools/install4j/oie_logo_only_white_background_128x128.png @@ -257,7 +257,7 @@ return console.askOkCancel(message, true); en - ${compiler:installer:mediaRoot}/server/setup/docs/LICENSE.txt + ${compiler:installer:mediaRoot}server/setup/docs/LICENSE.txt @@ -319,7 +319,7 @@ return console.askOkCancel(message, true); en - ${compiler:installer:mediaRoot}/tools/install4j/readme.html + ${compiler:installer:mediaRoot}tools/install4j/readme.html @@ -849,6 +849,8 @@ return console.askYesNo(message, true); + + diff --git a/tools/install4j/oie_logo_only_white_background_128x128.png b/tools/install4j/oie_logo_only_white_background_128x128.png new file mode 100644 index 0000000000000000000000000000000000000000..02a39c876658405edd58360fff0e4857ed60f83e GIT binary patch literal 9185 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