From dec452d68bf7342db7df64a7fbe9921a1fbebd0f Mon Sep 17 00:00:00 2001 From: moauto <54212639+mo-auto@users.noreply.github.com> Date: Tue, 23 Jun 2026 13:16:09 +0300 Subject: [PATCH] fix(flex-linux-setup): fetch admin-ui-plugin from the jans GitHub release jenkins.jans.io was shut off when Janssen moved artifact publishing to GitHub release assets, so flex_setup.py's admin-ui-plugin download (jenkins.jans.io/maven/...) 404'd and admin-ui-plugin--distribution.jar was missing from /opt/dist/jans in the flex packages. Route it through jans-linux-setup's base.determine_jans_artifact_url with app_info['jans_version'] - the same helper jans-linux-setup uses for the auth-client/fido2 jars - so the asset name and release tag (nightly vs v) stay consistent with the jans build being installed. Drop the now-unused maven_base_url constant and urljoin import. Signed-off-by: moauto <54212639+mo-auto@users.noreply.github.com> --- flex-linux-setup/flex_linux_setup/flex_setup.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/flex-linux-setup/flex_linux_setup/flex_setup.py b/flex-linux-setup/flex_linux_setup/flex_setup.py index 12d5823f70..c4497d71bf 100644 --- a/flex-linux-setup/flex_linux_setup/flex_setup.py +++ b/flex-linux-setup/flex_linux_setup/flex_setup.py @@ -16,7 +16,6 @@ from pathlib import Path from urllib import request -from urllib.parse import urljoin from xml.etree import ElementTree argsp = None @@ -295,8 +294,6 @@ def set_app_versions_from_arguments(brgsp): base.argsp = arg_parser.get_parser() set_app_versions_from_arguments(base.argsp) -maven_base_url = 'https://jenkins.jans.io/maven/io/jans/' - node_installer = NodeInstaller() httpd_installer = HttpdInstaller() jans_installer = JansInstaller() @@ -365,9 +362,9 @@ def download_files(self, force=False): self.source_files += [ ('https://nodejs.org/dist/{0}/node-{0}-linux-x64.tar.xz'.format(app_versions['NODE_VERSION']), os.path.join(Config.dist_app_dir, 'node-{0}-linux-x64.tar.xz'.format(app_versions['NODE_VERSION']))), - (urljoin(maven_base_url, - 'jans-config-api/plugins/admin-ui-plugin/{0}{1}/admin-ui-plugin-{0}{1}-distribution.jar'.format( - app_versions['JANS_APP_VERSION'], app_versions['JANS_BUILD'])), + (base.determine_jans_artifact_url( + 'maven/io/jans/jans-config-api/plugins/admin-ui-plugin/{0}/admin-ui-plugin-{0}-distribution.jar'.format( + base.current_app.app_info['jans_version'])), self.admin_ui_plugin_source_path), ( 'https://raw.githubusercontent.com/JanssenProject/jans/{}/jans-config-api/server/src/main/resources/log4j2.xml'.format(