Commit Graph

205 Commits

Author SHA1 Message Date
Christian Schneider 6757300a0d [AMQ-6584] Remove spring-aspects as it works with just the range fix 2017-01-30 11:02:45 +01:00
Christian Schneider 10500ab6ee [AMQ-6584] Fix feature to make it work for karaf 4.1.0 2017-01-30 11:02:37 +01:00
Daniel Kulp f4d99591da [maven-release-plugin] prepare for next development iteration 2016-12-16 13:10:42 -05:00
Daniel Kulp 321ddd71ae [maven-release-plugin] prepare release activemq-5.13.5 2016-12-16 13:10:24 -05:00
Christopher L. Shannon (cshannon) c1a2998660 [maven-release-plugin] prepare for next development iteration 2016-07-14 11:10:08 -04:00
Christopher L. Shannon (cshannon) 9d48997177 [maven-release-plugin] prepare release activemq-5.13.4 2016-07-14 11:09:17 -04:00
Seth Leger 982f739e24 AMQ-6301: Changed activemq-osgi so that it embeds the spring-dm bundles
so that we can avoid loading the spring-dm feature which causes Spring
version conflicts.
2016-07-12 12:29:01 -04:00
Christopher L. Shannon (cshannon) e82e5c5e3c [maven-release-plugin] prepare for next development iteration 2016-04-28 12:28:08 +00:00
Christopher L. Shannon (cshannon) f2f130b3c8 [maven-release-plugin] prepare release activemq-5.13.3 2016-04-28 12:27:29 +00:00
Christopher L. Shannon (cshannon) 4c109cf273 Revert "[maven-release-plugin] prepare release activemq-5.13.3"
This reverts commit c49ab9fb51.
2016-04-28 11:47:44 +00:00
Christopher L. Shannon (cshannon) 2e9c35bf26 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit ff2241d795.
2016-04-28 11:47:32 +00:00
Christopher L. Shannon (cshannon) ff2241d795 [maven-release-plugin] prepare for next development iteration 2016-04-26 13:32:03 +00:00
Christopher L. Shannon (cshannon) c49ab9fb51 [maven-release-plugin] prepare release activemq-5.13.3 2016-04-26 13:31:15 +00:00
Christopher L. Shannon (cshannon) 369a430538 [maven-release-plugin] prepare for next development iteration 2016-03-01 16:39:41 +00:00
Christopher L. Shannon (cshannon) 6a2e71f11c [maven-release-plugin] prepare release activemq-5.13.2 2016-03-01 16:39:02 +00:00
Christopher L. Shannon (cshannon) 86e51d2461 [maven-release-plugin] prepare for next development iteration 2016-02-02 17:11:44 +00:00
Christopher L. Shannon (cshannon) d60b73402c [maven-release-plugin] prepare release activemq-5.13.1 2016-02-02 17:11:03 +00:00
Christopher L. Shannon (cshannon) 0ebc7a4da8 Revert "https://issues.apache.org/jira/browse/AMQ-6136"
This reverts commit 4ee29c363f.

We need to remove the dependency on Spring DM before doing this

(cherry picked from commit 7eb25ec50b)
2016-01-29 14:58:31 +00:00
Christopher L. Shannon (cshannon) 957fb85786 https://issues.apache.org/jira/browse/AMQ-6136
Switching the version for Spring in features-core.xml to allow Spring
4.x versions.

(cherry picked from commit 4ee29c363f)
2016-01-21 16:11:07 +00:00
Christopher L. Shannon (cshannon) 95fc593975 Update version for next patch release iteration. 2015-11-30 14:35:26 +00:00
Christopher L. Shannon (cshannon) cfb4ca9f54 [maven-release-plugin] prepare for next development iteration 2015-11-30 13:48:58 +00:00
Christopher L. Shannon (cshannon) abfe038ddf [maven-release-plugin] prepare release activemq-5.13.0 2015-11-30 13:48:11 +00:00
Chad Zobrisky f92c23a64e Updated jodatime to 2.8.2 2015-10-13 15:02:21 +00:00
Timothy Bish 94b56977d2 https://issues.apache.org/jira/browse/AMQ-5957
update the xstream bundle version.
2015-09-29 10:08:23 -04:00
Christopher L. Shannon (cshannon) 0f492f3b4b https://issues.apache.org/jira/browse/AMQ-5356
Migrated to Karaf 4.  This was required to support Jetty 9.2.x.
Fixed all OSGi unit tests.
2015-09-03 12:42:22 +00:00
Timothy Bish 6cdd750ddc [maven-release-plugin] prepare for next development iteration 2015-08-10 11:04:26 -04:00
Timothy Bish a9eeb03520 [maven-release-plugin] prepare release activemq-5.12.0 2015-08-10 11:04:17 -04:00
Dejan Bosanac b8698953f3 https://issues.apache.org/jira/browse/AMQ-5744 - jasypt-spring31 2015-04-24 11:56:26 +02:00
Jeff Genender 6d6ed4eaaf AMQ-5721 - Update ActiveMQ to use commons-pool2 instead of commons-pool.AMQ-5636 will need it. The JMS pool and other components should use it as well. 2015-04-16 16:01:39 +02:00
Dejan Bosanac 01d0155149 https://issues.apache.org/jira/browse/AMQ-5558 - enable producer/consumer commands in karaf 2015-02-11 12:42:46 +01:00
Dejan Bosanac 35683c1c1c Upgrade dependencies 2015-02-11 11:40:37 +01:00
gtully ae595c95b1 [maven-release-plugin] prepare for next development iteration 2015-01-30 12:46:19 +00:00
gtully 4ba1a1689f [maven-release-plugin] prepare release activemq-5.11.0 2015-01-30 12:46:08 +00:00
gtully bf5a2997c7 [maven-release-plugin] prepare for next development iteration 2015-01-26 16:48:46 +00:00
gtully eec2955bde [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:48:37 +00:00
gtully 64fa706d54 Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit f47fbe4b89.
2015-01-26 16:39:35 +00:00
gtully f47fbe4b89 [maven-release-plugin] prepare release activemq-5.11.0 2015-01-26 16:17:43 +00:00
gtully 3a6d67e8f9 https://issues.apache.org/jira/browse/AMQ-4727 - use OsgiBundleXmlApplicationContext from service factory so that an embedded camel route can find a required bundlecontext 2015-01-26 15:39:04 +00:00
gtully 25f18ad20d https://issues.apache.org/jira/browse/AMQ-5526 - tidy up karaf-itest, features amqp now work,still issue with camel and bundlecontext null 2015-01-21 15:10:09 +00:00
gtully 548aa1e415 https://issues.apache.org/jira/browse/AMQ-5525 - worked around the issue with blueprint converter - all. All of the activemq commands have the same single arg signature, so the conversion should be trivial, doing the conversion inline in the default case 2015-01-20 11:47:01 +00:00
Hadrian Zbarcea aedcae139b Revert "[maven-release-plugin] prepare release activemq-5.11.0"
This reverts commit 48b0cf396c.
2015-01-05 12:25:58 -05:00
Hadrian Zbarcea 89995f4723 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 7b285c6f52.
2015-01-05 12:25:47 -05:00
Dejan Bosanac 7b285c6f52 [maven-release-plugin] prepare for next development iteration 2014-12-29 12:44:32 +01:00
Dejan Bosanac 48b0cf396c [maven-release-plugin] prepare release activemq-5.11.0 2014-12-29 12:44:20 +01:00
Dejan Bosanac fb684db4a8 https://issues.apache.org/jira/browse/AMQ-5121 - use jmxLocal in karaf only for jmx-based commands 2014-09-18 15:25:22 +02:00
gtully 66a689df0e fix up karaf-itests , related commits https://issues.apache.org/jira/browse/AMQ-5224 https://issues.apache.org/jira/browse/AMQ-5105 Update poms to fully load into M2E - 06bb7a2716 2014-07-28 15:30:12 +01:00
Dejan Bosanac fa086396a7 [maven-release-plugin] prepare for next development iteration 2014-06-05 11:59:29 +02:00
Dejan Bosanac 58dd93e42e [maven-release-plugin] prepare release activemq-5.10.0 2014-06-05 11:59:17 +02:00
Dejan Bosanac c2cf78542f [maven-release-plugin] prepare for next development iteration 2014-06-04 11:33:17 +02:00
Dejan Bosanac 5bc741f227 [maven-release-plugin] prepare release activemq-5.10.0 2014-06-04 11:33:03 +02:00