From b5633d26f5c445f2eacde89c98df053c5cfc1bb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 7 Aug 2026 10:40:22 +0000 Subject: [PATCH 1/2] build(deps): bump xbean-version from 4.31 to 5.0.0 Bumps `xbean-version` from 4.31 to 5.0.0. Updates `org.apache.xbean:xbean-spring` from 4.31 to 5.0.0 Updates `org.apache.xbean:maven-xbean-plugin` from 4.31 to 5.0.0 Updates `org.apache.xbean:xbean-blueprint` from 4.31 to 5.0.0 Updates `org.apache.xbean:xbean-finder` from 4.31 to 5.0.0 Updates `org.apache.xbean:xbean-asm-util` from 4.31 to 5.0.0 Updates `org.apache.xbean:xbean-bundleutils` from 4.31 to 5.0.0 --- updated-dependencies: - dependency-name: org.apache.xbean:xbean-spring dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.xbean:maven-xbean-plugin dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.xbean:xbean-blueprint dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.apache.xbean:xbean-finder dependency-version: 5.0.0 dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.apache.xbean:xbean-asm-util dependency-version: 5.0.0 dependency-type: direct:development update-type: version-update:semver-major - dependency-name: org.apache.xbean:xbean-bundleutils dependency-version: 5.0.0 dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1b1adc24ecf..71dd39fc92c 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ 1.2.5 1.1.4c 1.4.21 - 4.31 + 5.0.0 2.12.2 4.0.16 3.1.0 From 256813e774262f9bd97c958f5f37cb12033b2ac4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?JB=20Onofr=C3=A9?= Date: Wed, 26 Aug 2026 08:09:33 +0200 Subject: [PATCH 2/2] Adapt build to xbean 5.0.0 maven-xbean-plugin 5.0.0 is a rewrite on the Maven 3.9 API and carries two upstream regressions, so keep the plugin on 4.31 via a dedicated property and let only the runtime/OSGi artifacts move to 5.0.0: - it attaches the generated schema doc with the classifier "chema" instead of "schema", which would rename the published activemq-spring--schema.html - propertyEditorPaths now defaults to the non-existent package org.apache.xben.spring.context.impl Also bind activemq-ra's mapping execution to generate-sources explicitly. The goal's default phase moved from generate-sources to generate-resources in 5.0.0, which put it after the process-sources replacer execution that scrubs the timestamp out of the generated spring.handlers/spring.schemas (XBEAN-335), so a clean build failed with "basedir target/xbean/META-INF does not exist". Finally, widen the org.apache.xbean Import-Package ranges from [3.13,5) to [3.13,6). xbean-blueprint 5.0.0 exports its packages at 5.0.0, which the old upper bound excluded. --- activemq-blueprint/pom.xml | 2 +- activemq-http/pom.xml | 2 +- activemq-ra/pom.xml | 5 ++++- activemq-spring/pom.xml | 2 +- activemq-web-console/pom.xml | 2 +- activemq-web-demo/pom.xml | 2 +- pom.xml | 4 ++++ 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml index 8be78713c43..8515fc3520b 100644 --- a/activemq-blueprint/pom.xml +++ b/activemq-blueprint/pom.xml @@ -54,7 +54,7 @@ - org.apache.xbean*;version="[3.13,5)", + org.apache.xbean*;version="[3.13,6)", org.apache.aries.blueprint.*;version="[1.0,2)", * diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml index 40ff58ca4ad..aa064410dfd 100644 --- a/activemq-http/pom.xml +++ b/activemq-http/pom.xml @@ -181,7 +181,7 @@ !org.apache.activemq.transport.ws*;version=${project.version}, !org.apache.activemq.transport.xstream;version=${project.version}, !org.apache.activemq.transport.util;version=${project.version}, - org.apache.xbean*;version="[3.13,5)", + org.apache.xbean*;version="[3.13,6)", org.apache.activemq*;version=${project.version};resolution:=optional diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index e862e536af3..987989a24d9 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -86,9 +86,12 @@ org.apache.xbean maven-xbean-plugin - ${xbean-version} + ${xbean-maven-plugin-version} + + generate-sources false http://activemq.apache.org/schema/ra diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index 9d6d1898e45..024561b1f16 100644 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -221,7 +221,7 @@ org.apache.xbean maven-xbean-plugin - ${xbean-version} + ${xbean-maven-plugin-version} process-classes diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 8d18b3e0c4d..d629f5a8a0d 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -151,7 +151,7 @@ javax.net.ssl, org.osgi.framework;version="[1.5,2)", org.osgi.service.cm, - org.apache.xbean*;version="[3.13,5)", + org.apache.xbean*;version="[3.13,6)", org.apache.commons.logging;version="[1.1,2)";resolution:=optional, org.slf4j;version="[1.6,2)";resolution:=optional, org.slf4j.spi;version="[1.6,2)";resolution:=optional, diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index a81ae8278cb..6312c252729 100644 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -122,7 +122,7 @@ org.osgi.framework, org.osgi.service.cm, org.apache.commons.logging;version="[1.1,2)";resolution:=optional, - org.apache.xbean*;version="[3.13,5)", + org.apache.xbean*;version="[3.13,6)", org.slf4j;version="[1.6,2)";resolution:=optional, org.slf4j.spi;version="[1.6,2)";resolution:=optional, org.apache.log4j;version="[2,3)";resolution:=optional, diff --git a/pom.xml b/pom.xml index 71dd39fc92c..5975dd05a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -107,6 +107,10 @@ 1.1.4c 1.4.21 5.0.0 + + 4.31 2.12.2 4.0.16 3.1.0