Commit Graph

217 Commits

Author SHA1 Message Date
Christopher L. Shannon (cshannon) 1d0121ccd4 Revert "[maven-release-plugin] prepare release activemq-5.15.1"
This reverts commit 756b858fa4.
2017-09-28 10:05:01 -04:00
Christopher L. Shannon (cshannon) 756b858fa4 [maven-release-plugin] prepare release activemq-5.15.1 2017-09-28 09:59:18 -04:00
Christopher L. Shannon (cshannon) 76474fbc67 Revert "[maven-release-plugin] prepare release activemq-5.15.1"
This reverts commit 37227fbf8b.
2017-09-27 08:54:44 -04:00
Christopher L. Shannon (cshannon) ade1a87e09 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit e2eabeb1c2.
2017-09-27 08:54:36 -04:00
gtully 95b3ba50b0 [AMQ-6790] add netty kqueue osgi dependency to the activemq-amqp-client feature
(cherry picked from commit 33b52b5914)
2017-09-27 08:53:21 -04:00
Christopher L. Shannon (cshannon) e2eabeb1c2 [maven-release-plugin] prepare for next development iteration 2017-09-25 09:23:32 -04:00
Christopher L. Shannon (cshannon) 37227fbf8b [maven-release-plugin] prepare release activemq-5.15.1 2017-09-25 09:17:38 -04:00
Timothy Bish eabfa451dc AMQ-6790 Update to latest Qpid JMS and Qpid Proton versions
Moves to Qpid JMS 0.24.0 and Qpid Proton-J 0.20.0
(cherry picked from commit 267fe73898)
2017-08-08 13:40:35 -04:00
Christopher L. Shannon (cshannon) e7956b527d NO-JIRA: Incrementing version to 5.15.1-SNAPSHOT 2017-06-27 13:52:45 -04:00
Christopher L. Shannon (cshannon) 5f0d6943cb [maven-release-plugin] prepare release activemq-5.15.0 2017-06-27 13:41:01 -04:00
Christopher L. Shannon (cshannon) ab1bc5b549 AMQ-6681, AMQ-6704 - Update karaf and aries-blueprint-core 2017-06-24 09:50:58 -04:00
Christopher L. Shannon (cshannon) b3dff48a0a AMQ-5932 - removing all traces of Spring DM
Spring DM is not longer needed anymore after the upgrade to Camel 2.19.x
as everything is using Blueprint
2017-06-24 08:59:45 -04:00
Christopher L. Shannon (cshannon) a6782443c1 AMQ-6585 - Upgrade to Camel 2.18.4
Added the camel-blueprint feature to work with Spring 4.x as Spring DM
support for Camel was deprecated
2017-06-09 07:13:11 -04:00
Timothy Bish 4bf3152fa9 https://issues.apache.org/jira/browse/AMQ-6630
Update to QpidJMS 0.22.0 and Netty 4.1.9.Final
2017-04-21 11:44:06 -04:00
gtully d42b51a78e [AMQ-6630][AMQ-6493] fix feature and add explicit 2.0 jms dep to karaf for the amqp client test 2017-04-07 11:01:51 +01:00
Christian Schneider 2e953d96a3 [AMQ-6584] Remove spring-aspects as it works with just the range fix 2017-01-30 11:02:05 +01:00
Christian Schneider f56ac06ef6 [AMQ-6584] Fix feature to make it work for karaf 4.1.0 2017-01-30 10:29:04 +01:00
Krzysztof Sobkowiak 6534a83c40 [AMQ-6576] Problem while installing activemq-camel with Camel 2.17.x or 2.18.x 2017-01-24 00:57:03 +01:00
gtully 59bfffd2b4 Revert "[AMQ-6515] Adding javax.inject bundle to fix the issue on feature install"
guava 14 was the culprit - activemq-osgi does not need to import javax.inject

This reverts commit 00129837de.
2016-12-02 12:55:20 +00:00
Benjamin Graf 89c1a7b8ba AMQ-5344: Replace bundles with feature 2016-11-25 09:16:28 +01:00
Christian Schneider 00129837de [AMQ-6515] Adding javax.inject bundle to fix the issue on feature install 2016-11-22 12:09:23 +01:00
Timothy Bish c239bf01a9 https://issues.apache.org/jira/browse/AMQ-6493
Ensure the proper versions of dependencies for Qpid JMS are brought in
for the test.
2016-11-01 15:19:05 -04:00
Krzysztof Sobkowiak 132840b09f https://issues.apache.org/jira/browse/AMQ-6442
Config file org.apache.activemq.server-default.cfg points config to ${karaf.base}/etc
2016-09-27 07:57:33 -04:00
Christopher L. Shannon (cshannon) 06a21dbbb3 [maven-release-plugin] prepare for next development iteration 2016-08-02 09:03:37 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christian Schneider 5a6d1550fb [AMQ-6380] Bundle to create pooled ConnectionFactories from configs in OSGi 2016-08-01 13:56:04 -04:00
Seth Leger 927bef7345 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:17:14 -04:00
Hiram Chirino 7fd5fa9253 Add a method that Karaf can use to get the description of the command. Depends on a change in karaf too to get this to work. 2016-05-05 09:26:33 -04:00
Andrea Cosentino 98c866817d AMQ-6181 - Upgrade to Joda-time 2.9 2016-02-23 15:47:52 +01:00
Christopher L. Shannon (cshannon) 7eb25ec50b 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
2016-01-29 14:57:11 +00:00
Christopher L. Shannon (cshannon) 4ee29c363f https://issues.apache.org/jira/browse/AMQ-6136
Switching the version for Spring in features-core.xml to allow Spring
4.x versions.
2016-01-21 16:09:30 +00:00
Timothy Bish 4ecff14030 NO-JIRA Update master version to 5.14.0-SNAPSHOT to match the eventual
release version.
2016-01-20 12:40:20 -05: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