From ad53f4f5f4d253a5d3c8376f72598bdc8cf7d42c Mon Sep 17 00:00:00 2001 From: Craig <3979063+craig8@users.noreply.github.com> Date: Fri, 10 Jul 2026 15:17:17 -0700 Subject: [PATCH] fix: resolve SSL runner export deps (pax-logging-log4j2, drop stale shiro pin) The release.yml build-artifacts step failed at export.goss-core-ssl because the SSL runner bndrun required two dependencies unresolvable on a clean runner: 1. pax-logging-service:2.2.7 does not exist on Maven Central. The pax-logging 2.x line renamed the backend bundle: the correct artifact is pax-logging-log4j2:2.2.7 (bundle symbolic name org.ops4j.pax.logging.pax-logging-log4j2). pax-logging-service only published through the 1.x line. Updated central.maven, the libraries.bnd macro and runpath, and the goss-core.shared.bndrun osgi.identity runrequires filter. NOTE: this is a genuine logging-backend continuation, not a cosmetic rename. pax-logging-service (1.x) was the legacy aggregator; pax-logging-log4j2 (2.x) is the Log4j 2.x backend. Verify runner log output and config format post-merge if any logging-behavior question arises later. 2. shiro-core;version='[1.13.0,2)' was hardcoded in goss-core-ssl.bndrun but was both redundant and self-conflicting: the same bndrun already pulls shiro-core 2.0.0 via activemq-runpath (required by activemq-shiro 6.2.0), and the [1.13.0,2) range excludes 2.0.0. Removed the line; shiro-core 2.0.0 resolves via activemq-runpath. Verified locally: export.goss-core and export.goss-core-ssl both build green, producing goss-core.jar and goss-core-ssl.jar (the SSL jar embeds pax-logging-log4j2-2.2.7 and shiro-core-2.0.0). Fixes the second layer of the release-workflow breakage after the stale-launcher fix. --- cnf/ext/central.maven | 2 +- cnf/ext/libraries.bnd | 4 ++-- pnnl.goss.core.runner/goss-core-ssl.bndrun | 1 - pnnl.goss.core.runner/goss-core.shared.bndrun | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/cnf/ext/central.maven b/cnf/ext/central.maven index c4b91af8..2639c19a 100644 --- a/cnf/ext/central.maven +++ b/cnf/ext/central.maven @@ -26,7 +26,7 @@ org.apache.felix:org.apache.felix.fileinstall:3.7.4 # Pax Logging - OSGi logging framework org.ops4j.pax.logging:pax-logging-api:2.2.7 -org.ops4j.pax.logging:pax-logging-service:2.2.7 +org.ops4j.pax.logging:pax-logging-log4j2:2.2.7 # H2 Database com.h2database:h2:2.3.232 diff --git a/cnf/ext/libraries.bnd b/cnf/ext/libraries.bnd index d68a33dd..eae8a353 100644 --- a/cnf/ext/libraries.bnd +++ b/cnf/ext/libraries.bnd @@ -269,9 +269,9 @@ scr-runpath: ${scr};version=file,\ # Pax Logging (OSGi logging framework) pax-logging-api: ${repo;org.ops4j.pax.logging:pax-logging-api;[2.2.0,3);HIGHEST} -pax-logging-service: ${repo;org.ops4j.pax.logging:pax-logging-service;[2.2.0,3);HIGHEST} +pax-logging-log4j2: ${repo;org.ops4j.pax.logging:pax-logging-log4j2;[2.2.0,3);HIGHEST} pax-logging-runpath: ${pax-logging-api};version=file,\ - ${pax-logging-service};version=file + ${pax-logging-log4j2};version=file # Felix HTTP Service http-servlet-api: ${repo;org.apache.felix:org.apache.felix.http.servlet-api;[3.0.0,4);HIGHEST} diff --git a/pnnl.goss.core.runner/goss-core-ssl.bndrun b/pnnl.goss.core.runner/goss-core-ssl.bndrun index 7b286381..137bbd47 100644 --- a/pnnl.goss.core.runner/goss-core-ssl.bndrun +++ b/pnnl.goss.core.runner/goss-core-ssl.bndrun @@ -20,7 +20,6 @@ ${commons-io-runpath},\ ${xstream-runpath},\ ${gson-runpath},\ - org.apache.shiro:shiro-core;version='[1.13.0,2)',\ javax.annotation:javax.annotation-api;version='[1.3.2,2)',\ pnnl.goss.core.core-api;version=latest,\ pnnl.goss.core.goss-client;version=latest,\ diff --git a/pnnl.goss.core.runner/goss-core.shared.bndrun b/pnnl.goss.core.runner/goss-core.shared.bndrun index c6befa22..daa39bfb 100644 --- a/pnnl.goss.core.runner/goss-core.shared.bndrun +++ b/pnnl.goss.core.runner/goss-core.shared.bndrun @@ -33,7 +33,7 @@ shared.runrequires: \ osgi.identity;filter:='(osgi.identity=pnnl.goss.core.runner)',\ osgi.identity;filter:='(&(osgi.identity=org.apache.felix.scr)(version>=2.2.10))',\ osgi.identity;filter:='(osgi.identity=org.ops4j.pax.logging.pax-logging-api)',\ - osgi.identity;filter:='(osgi.identity=org.ops4j.pax.logging.pax-logging-service)',\ + osgi.identity;filter:='(osgi.identity=org.ops4j.pax.logging.pax-logging-log4j2)',\ osgi.identity;filter:='(&(osgi.identity=org.apache.felix.gogo.runtime)(version>=1.1.6))',\ osgi.identity;filter:='(&(osgi.identity=org.apache.felix.gogo.shell)(version>=1.1.4))',\ osgi.identity;filter:='(&(osgi.identity=org.apache.felix.gogo.command)(version>=1.1.2))',\