diff --git a/Jenkinsfile b/Jenkinsfile index bbbd75f61c..d3b36528da 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -117,7 +117,7 @@ pipeline { stage('Deploy') { when { expression { - env.BRANCH_NAME ==~ /(activemq-5.17.x|activemq-5.16.x|activemq-5.15.x|main)/ + env.BRANCH_NAME ==~ /(activemq-5.18.x|activemq-5.17.x|main)/ } } steps { @@ -132,7 +132,7 @@ pipeline { // If this build failed, send an email to the list. failure { script { - if(env.BRANCH_NAME == "activemq-5.17.x" || env.BRANCH_NAME == "activemq-5.15.x" || env.BRANCH_NAME == "activemq-5.16.x" || env.BRANCH_NAME == "main") { + if(env.BRANCH_NAME == "activemq-5.18.x" || env.BRANCH_NAME == "activemq-5.17.x" || env.BRANCH_NAME == "main") { emailext( subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -149,7 +149,7 @@ Check console output at "${env.JOB_NAME} [${env.BRANC // If this build didn't fail, but there were failing tests, send an email to the list. unstable { script { - if(env.BRANCH_NAME == "activemq-5.17.x" || env.BRANCH_NAME == "activemq-5.15.x" || env.BRANCH_NAME == "activemq-5.16.x" || env.BRANCH_NAME == "main") { + if(env.BRANCH_NAME == "activemq-5.18.x" || env.BRANCH_NAME == "activemq-5.17.x" || env.BRANCH_NAME == "main") { emailext( subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ @@ -169,7 +169,7 @@ Check console output at "${env.JOB_NAME} [${env.BRANC // (in this cae we probably don't have to do any post-build analysis) deleteDir() script { - if ((env.BRANCH_NAME == "activemq-5.17.x" || env.BRANCH_NAME == "activemq-5.15.x" || env.BRANCH_NAME == "activemq-5.16.x" || env.BRANCH_NAME == "main") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { + if ((env.BRANCH_NAME == "activemq-5.18.x" || env.BRANCH_NAME == "activemq-5.17.x" || env.BRANCH_NAME == "main") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) { emailext ( subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'", body: """ diff --git a/SECURITY.md b/SECURITY.md index 3ac9264f11..84778b948e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -4,6 +4,7 @@ | Version | Supported | | ------- | ------------------ | +| 6.0.x | :white_check_mark: | | 5.18.x | :white_check_mark: | | 5.17.x | :white_check_mark: | | <= 5.16.x | :x: | diff --git a/activemq-all/pom.xml b/activemq-all/pom.xml index 55dc5bb8b1..b31aed2d15 100644 --- a/activemq-all/pom.xml +++ b/activemq-all/pom.xml @@ -14,7 +14,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-all diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml index c6caa03e68..9285330f3d 100644 --- a/activemq-amqp/pom.xml +++ b/activemq-amqp/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-amqp diff --git a/activemq-blueprint/pom.xml b/activemq-blueprint/pom.xml index bbbf949351..a8050e4a04 100644 --- a/activemq-blueprint/pom.xml +++ b/activemq-blueprint/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-blueprint diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml index fddfc9a260..2f70972c5a 100644 --- a/activemq-broker/pom.xml +++ b/activemq-broker/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-broker diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml index aed37f7e18..dafccc307b 100644 --- a/activemq-cf/pom.xml +++ b/activemq-cf/pom.xml @@ -24,7 +24,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-cf diff --git a/activemq-client-jakarta/pom.xml b/activemq-client-jakarta/pom.xml index d868f6e497..fa9d36ed36 100644 --- a/activemq-client-jakarta/pom.xml +++ b/activemq-client-jakarta/pom.xml @@ -20,7 +20,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-client-jakarta pom diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index 9ed2fc172d..b71f9632d9 100644 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-client diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index 2321eaf0d9..110b557746 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-console diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml index b18a9c5003..0fcb4055ea 100644 --- a/activemq-http/pom.xml +++ b/activemq-http/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-http diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml index 5717a8d391..c8aebc8d7b 100644 --- a/activemq-jaas/pom.xml +++ b/activemq-jaas/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-jaas diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml index 0e2cb1d02a..410c106540 100644 --- a/activemq-jdbc-store/pom.xml +++ b/activemq-jdbc-store/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-jdbc-store diff --git a/activemq-jms-pool/pom.xml b/activemq-jms-pool/pom.xml index b4c65dc337..2ed1eb9861 100644 --- a/activemq-jms-pool/pom.xml +++ b/activemq-jms-pool/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-jms-pool diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml index 1b82d92866..5579192846 100644 --- a/activemq-kahadb-store/pom.xml +++ b/activemq-kahadb-store/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-kahadb-store diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index d1fdb08f3e..71eb0b45d1 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-karaf-itest diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml index a7b26f6d5b..e7556e7ce4 100644 --- a/activemq-karaf/pom.xml +++ b/activemq-karaf/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-karaf diff --git a/activemq-log4j-appender/pom.xml b/activemq-log4j-appender/pom.xml index 8925a96406..c170649b38 100644 --- a/activemq-log4j-appender/pom.xml +++ b/activemq-log4j-appender/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-log4j-appender diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index 6a52f8605f..71ceb03760 100644 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-mqtt diff --git a/activemq-openwire-generator/pom.xml b/activemq-openwire-generator/pom.xml index a35e2e76c6..ca9ff6edb8 100644 --- a/activemq-openwire-generator/pom.xml +++ b/activemq-openwire-generator/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-openwire-generator diff --git a/activemq-openwire-legacy/pom.xml b/activemq-openwire-legacy/pom.xml index 3c28174c68..baf7f24cf1 100644 --- a/activemq-openwire-legacy/pom.xml +++ b/activemq-openwire-legacy/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-openwire-legacy diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml index ac72352055..5066072972 100644 --- a/activemq-osgi/pom.xml +++ b/activemq-osgi/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-osgi diff --git a/activemq-osgi/src/main/resources/META-INF/spring.schemas b/activemq-osgi/src/main/resources/META-INF/spring.schemas index 808bd4c2be..9ce895dee3 100644 --- a/activemq-osgi/src/main/resources/META-INF/spring.schemas +++ b/activemq-osgi/src/main/resources/META-INF/spring.schemas @@ -83,6 +83,7 @@ http\://activemq.apache.org/schema/core/activemq-core-5.17.2.xsd=activemq.xsd http\://activemq.apache.org/schema/core/activemq-core-5.17.3.xsd=activemq.xsd http\://activemq.apache.org/schema/core/activemq-core-5.17.4.xsd=activemq.xsd http\://activemq.apache.org/schema/core/activemq-core-5.18.0.xsd=activemq.xsd +http\://activemq.apache.org/schema/core/activemq-core-6.0.0.xsd=activemq.xsd http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd diff --git a/activemq-pool/pom.xml b/activemq-pool/pom.xml index f39cc18623..16bf16a4a3 100644 --- a/activemq-pool/pom.xml +++ b/activemq-pool/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-pool diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index 78b44cd3c6..4c9229117f 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-ra diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index b7a3c8d337..033bdc67cd 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-rar diff --git a/activemq-run/pom.xml b/activemq-run/pom.xml index 2357e472fb..93f78bdbe4 100644 --- a/activemq-run/pom.xml +++ b/activemq-run/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-run diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml index 76ae01fb2d..eaa96dd6c7 100644 --- a/activemq-runtime-config/pom.xml +++ b/activemq-runtime-config/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-runtime-config diff --git a/activemq-shiro/pom.xml b/activemq-shiro/pom.xml index 1b4a70f536..c88e3f1ca1 100644 --- a/activemq-shiro/pom.xml +++ b/activemq-shiro/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-shiro diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml index dbd1dd88e1..0da39ae306 100644 --- a/activemq-spring/pom.xml +++ b/activemq-spring/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-spring diff --git a/activemq-spring/src/main/resources/META-INF/spring.schemas b/activemq-spring/src/main/resources/META-INF/spring.schemas index cc132eb240..d0e9858d83 100644 --- a/activemq-spring/src/main/resources/META-INF/spring.schemas +++ b/activemq-spring/src/main/resources/META-INF/spring.schemas @@ -84,7 +84,7 @@ http\://activemq.apache.org/schema/core/activemq-core-5.17.3.xsd=activemq.xsd http\://activemq.apache.org/schema/core/activemq-core-5.17.4.xsd=activemq.xsd http\://activemq.apache.org/schema/core/activemq-core-5.18.0.xsd=activemq.xsd http\://activemq.apache.org/schema/core/activemq-core-5.18.1.xsd=activemq.xsd -http\://activemq.apache.org/schema/core/activemq-core-5.19.0.xsd=activemq.xsd +http\://activemq.apache.org/schema/core/activemq-core-6.0.0.xsd=activemq.xsd http\://camel.apache.org/schema/osgi/camel-osgi.xsd=camel-osgi.xsd http\://camel.apache.org/schema/spring/camel-spring.xsd=camel-spring.xsd diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml index 9e5ad0e736..4bbc5554d1 100644 --- a/activemq-stomp/pom.xml +++ b/activemq-stomp/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-stomp diff --git a/activemq-tooling/activemq-joram-jms-tests/pom.xml b/activemq-tooling/activemq-joram-jms-tests/pom.xml index b496fd8960..a7e3922cc0 100644 --- a/activemq-tooling/activemq-joram-jms-tests/pom.xml +++ b/activemq-tooling/activemq-joram-jms-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq.tooling activemq-tooling - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-joram-jms-tests diff --git a/activemq-tooling/activemq-junit/pom.xml b/activemq-tooling/activemq-junit/pom.xml index 60b47c8441..484b4d7c36 100644 --- a/activemq-tooling/activemq-junit/pom.xml +++ b/activemq-tooling/activemq-junit/pom.xml @@ -21,7 +21,7 @@ org.apache.activemq.tooling activemq-tooling - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-junit diff --git a/activemq-tooling/activemq-maven-plugin/pom.xml b/activemq-tooling/activemq-maven-plugin/pom.xml index 793d0ab236..30479efc01 100644 --- a/activemq-tooling/activemq-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.activemq.tooling activemq-tooling - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-maven-plugin diff --git a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml index b00d48a2ff..c12628ce76 100644 --- a/activemq-tooling/activemq-memtest-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-memtest-maven-plugin/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq.tooling activemq-tooling - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-memtest-maven-plugin diff --git a/activemq-tooling/activemq-perf-maven-plugin/pom.xml b/activemq-tooling/activemq-perf-maven-plugin/pom.xml index e366c14362..57bcae2b42 100644 --- a/activemq-tooling/activemq-perf-maven-plugin/pom.xml +++ b/activemq-tooling/activemq-perf-maven-plugin/pom.xml @@ -21,7 +21,7 @@ org.apache.activemq.tooling activemq-tooling - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-perf-maven-plugin diff --git a/activemq-tooling/pom.xml b/activemq-tooling/pom.xml index 43a1bea325..7d8ea3c5d4 100644 --- a/activemq-tooling/pom.xml +++ b/activemq-tooling/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT org.apache.activemq.tooling diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml index 9e232fa366..fd742a7d78 100644 --- a/activemq-unit-tests/pom.xml +++ b/activemq-unit-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-unit-tests diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml index 33788f9027..522f71117b 100644 --- a/activemq-web-console/pom.xml +++ b/activemq-web-console/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-web-console diff --git a/activemq-web-demo/pom.xml b/activemq-web-demo/pom.xml index eb38e2de6b..b9bb54fe11 100644 --- a/activemq-web-demo/pom.xml +++ b/activemq-web-demo/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-web-demo diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml index da822f98dc..ea51dbf309 100644 --- a/activemq-web/pom.xml +++ b/activemq-web/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT activemq-web diff --git a/assembly/pom.xml b/assembly/pom.xml index a5b44bcf21..5244460b52 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -22,7 +22,7 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT apache-activemq diff --git a/pom.xml b/pom.xml index d4d6a59b6b..2594562007 100644 --- a/pom.xml +++ b/pom.xml @@ -25,14 +25,14 @@ org.apache.activemq activemq-parent - 5.19.0-SNAPSHOT + 6.0.0-SNAPSHOT pom ActiveMQ 2005 - 2023-03-28T14:10:59Z + 2023-09-15T14:06:56Z activemq-${project.version} Apache ActiveMQ