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 1b1adc24ecf..5975dd05a0d 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,11 @@ 1.2.5 1.1.4c 1.4.21 - 4.31 + 5.0.0 + + 4.31 2.12.2 4.0.16 3.1.0