Commit Graph

94 Commits

Author SHA1 Message Date
Christian Schneider 2d4b13be3f [AMQ-6597] Do not add the camel component decriptors to activemq-osgi 2017-02-15 14:26:27 +01:00
Krzysztof Sobkowiak a579023e78 [AMQ-6576] Problem while installing activemq-camel with Camel 2.17.x or 2.18.x
(cherry picked from commit 6534a83c40)
2017-01-25 07:38:36 -05:00
Christopher L. Shannon (cshannon) b36262ebba [maven-release-plugin] prepare for next development iteration 2016-12-19 10:33:54 -05:00
Christopher L. Shannon (cshannon) 58dddb9181 [maven-release-plugin] prepare release activemq-5.14.3 2016-12-19 10:32:45 -05:00
Christian Schneider 3998cd6367 [AMQ-6544] Create spring.schemas with schemas of activemq and spring
(cherry picked from commit 50dae26788)
2016-12-19 09:21:09 -05:00
Christopher L. Shannon (cshannon) 8d1136e699 [maven-release-plugin] prepare for next development iteration 2016-12-05 09:35:12 -05:00
Christopher L. Shannon (cshannon) 2462711684 [maven-release-plugin] prepare release activemq-5.14.2 2016-12-05 09:33:48 -05:00
Christopher L. Shannon (cshannon) 9ab56d59cc [maven-release-plugin] prepare for next development iteration 2016-09-27 13:06:49 -04:00
Christopher L. Shannon (cshannon) 594c79e531 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 13:06:12 -04:00
Christopher L. Shannon (cshannon) 02d53a0d9f Revert "[maven-release-plugin] prepare release activemq-5.14.1"
This reverts commit 422b231c25.
2016-09-27 11:57:35 -04:00
Christopher L. Shannon (cshannon) 354142adf1 Revert "[maven-release-plugin] prepare for next development iteration"
This reverts commit 47a652ef2a.
2016-09-27 11:57:25 -04:00
Christopher L. Shannon (cshannon) 47a652ef2a [maven-release-plugin] prepare for next development iteration 2016-09-27 08:58:13 -04:00
Christopher L. Shannon (cshannon) 422b231c25 [maven-release-plugin] prepare release activemq-5.14.1 2016-09-27 08:57:19 -04:00
Christopher L. Shannon (cshannon) a35371d880 NO-JIRA : creating 5.14.x branch 2016-08-02 09:30:31 -04:00
Christopher L. Shannon (cshannon) 71cbc65283 [maven-release-plugin] prepare release activemq-5.14.0 2016-08-02 09:02:54 -04:00
Christopher L. Shannon (cshannon) 6c2ce67ffb https://issues.apache.org/jira/browse/AMQ-6301
Updating ActiveMQServiceFactory to avoid using Spring DM directly and
instead use the Camel factory bean if it exists

Reverting back to Camel 2.16.3 until Spring DM is removed and Spring 4
can be used
2016-07-12 12:27:30 -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
gtully bce5e5e9c9 AMQ-5574 - allow import osgi of jms 2.x spec jar 2016-06-08 13:15:15 +01:00
Seth Leger 8b7632cb4f AMQ-6298: Moved Spring Import-Package wildcard below other Spring
imports.
2016-05-20 05:01:51 -04: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
Seth Leger 103efe1d4b Update Import-Package to include Spring 4
Update OSGi metadata to include Spring 4.X in the version range. Removed duplicate org.springframework.osgi* package reference.
2015-09-21 19:56:10 +00:00
Christopher L. Shannon (cshannon) ebf27cb398 https://issues.apache.org/jira/browse/AMQ-5957
Updating to Spring 4.1.7.RELEASE
2015-09-20 15:30:48 +00: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
Christopher L. Shannon (cshannon) f44c3d20ed https://issues.apache.org/jira/browse/AMQ-5356
Upgraded to Jetty 9.2.x to solve JDK 8 compatibility issues.
This required migrating to the new WebSocket API.
2015-09-03 11:54:57 +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
Daniel Kulp cad1a2a8cd Open up the xbean osgi import range to include 4.x 2015-03-04 12:43:44 -05: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
Daniel Kulp 3f82625077 [AMQ-5517] Runtime support for Jetty 9. Build/compile with Jetty8, but tests pass with Jetty 9 for runtime level support. 2015-01-13 12:47:53 -05: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
Daniel Kulp b1ede0559e [AMQ-5353] Use the same version range for the imports and the features.xml 2014-09-09 16:38:53 -04: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
Daniel Kulp 06bb7a2716 Update poms to fully load into M2E 2014-07-10 13:47:55 -04: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
Timothy Bish 3adffc18e1 https://issues.apache.org/jira/browse/AMQ-5131
remove trailing comma.
2014-04-03 10:03:04 -04:00
Timothy Bish a71457856d https://issues.apache.org/jira/browse/AMQ-5131 2014-04-03 09:58:43 -04:00