Commit Graph

138 Commits

Author SHA1 Message Date
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
Christian Schneider c0c9e9c0ab [AMQ-6597] Do not add the camel component decriptors to activemq-osgi 2017-02-15 14:25:55 +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
Christian Schneider 50dae26788 [AMQ-6544] Create spring.schemas with schemas of activemq and spring 2016-12-19 13:51:58 +01:00
gtully e3d698b9d9 [AMQ-6515] add explicit no import for ..thirdparty.publicsuffix which leaks from guava via bnd into the activemq-osgi module 2016-12-06 11:53:07 +00:00
Hadrian Zbarcea a8a650cbee Fix warnings in Eclipse IDE; remove deprecated prerequisites in maven3 2016-10-31 20:37:45 -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
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
Dejan Bosanac 26c41d0362 https://issues.apache.org/jira/browse/AMQ-4909 2013-12-11 16:43:34 +01:00
gtully 864aa6798f [maven-release-plugin] prepare for next development iteration 2013-10-14 23:38:35 +01:00
gtully 87c9bbebac [maven-release-plugin] prepare release activemq-5.9.0 2013-10-14 23:38:22 +01:00
gtully ee0933c71e [maven-release-plugin] prepare for next development iteration 2013-10-11 14:51:36 +01:00
gtully b276006911 [maven-release-plugin] prepare release activemq-5.9.0 2013-10-11 14:51:24 +01:00
Hiram Chirino 74234ed797 Embed the linkedin packages in the osgi-bundle and rollback to previous zookeeper version since newer version suffers from the following regression: https://issues.apache.org/jira/browse/ZOOKEEPER-1334 2013-10-11 09:16:28 -04:00
Hiram Chirino 550393f702 Make sure the hawtjni package is marked optional. 2013-10-09 09:15:48 -04:00
Hiram Chirino 10391092a3 Make sure we keep the resource files embedded in the bundle. 2013-10-08 13:07:07 -04:00
Hiram Chirino d94c7da16b Make snappy lib an optional osgi dependency. 2013-10-08 12:57:53 -04:00
Hiram Chirino 26092f5a82 Tweaking the activemq osgi jar so that it does not re-bundle the leveldbjni lib since the pure java version works fine. 2013-10-08 11:33:29 -04:00
gtully 8cf7f660c2 https://issues.apache.org/jira/browse/AMQ-4702 - make org.jvnet.jaxb2_commons*;resolution:=optional so we don't pull in a jaxb2 dep unless we want it 2013-09-30 23:21:03 +01:00
Gary Tully 30fc80ccc9 https://issues.apache.org/jira/browse/AMQ-4682 - include feature in assembly and osgi uber jar
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1518333 13f79535-47bb-0310-9956-ffa450edef68
2013-08-28 19:18:12 +00:00
Gary Tully 3630a41fc9 https://issues.apache.org/jira/browse/AMQ-4682 - implement runtimeConfigurationPlugin that will track xml config and react to changes. simple verification via test that adds a new network connector on the fly
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1513871 13f79535-47bb-0310-9956-ffa450edef68
2013-08-14 13:23:36 +00:00
Timothy A. Bish ac8e38fb69 update some plugin versions and ensure we use the property value in all child poms.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1504919 13f79535-47bb-0310-9956-ffa450edef68
2013-07-19 15:33:33 +00:00
Hiram R. Chirino 86e2426d1b Improve the replicated leveldb bits: Avoid dependencies on fabric-group stuff. Makes it easier to embed in different versions of a fabric osgi env.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1501877 13f79535-47bb-0310-9956-ffa450edef68
2013-07-10 17:49:03 +00:00
Bosanac Dejan 06dae40d94 https://issues.apache.org/jira/browse/AMQ-4593 - upgrade snappy java
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1495392 13f79535-47bb-0310-9956-ffa450edef68
2013-06-21 11:31:23 +00:00
Bosanac Dejan afe2e3ca08 fix some osgi regressions
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1494934 13f79535-47bb-0310-9956-ffa450edef68
2013-06-20 11:29:43 +00:00
Hiram R. Chirino c161033abb Make the fabric dependencies of the leveldb store needed for replication as provided.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1490271 13f79535-47bb-0310-9956-ffa450edef68
2013-06-06 13:20:28 +00:00
Hiram R. Chirino fd0cf387d6 Fix up osgi bundle build since we don't build the leveldb uber jar anymore.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1489866 13f79535-47bb-0310-9956-ffa450edef68
2013-06-05 13:36:55 +00:00
Hiram R. Chirino 5b0749c4ba Fixes AMQ-4549 : The activemq-all and activemq-osgi modules should have proper uber sources.jar files too.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485809 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 18:33:00 +00:00
Claus Ibsen 629c24ba65 Align osgi version to 4.3.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1485657 13f79535-47bb-0310-9956-ffa450edef68
2013-05-23 12:01:53 +00:00
Gary Tully ef6beb78fe https://issues.apache.org/jira/browse/AMQ-4432 - ensure camel-*.xsd can be found locally
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463923 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 11:33:07 +00:00
Gary Tully b65fd27109 https://issues.apache.org/jira/browse/AMQ-4432 - itest with mods to support, spring.handlers is now aware of camel handler
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463909 13f79535-47bb-0310-9956-ffa450edef68
2013-04-03 10:36:37 +00:00
Gary Tully 670d9d84a7 https://issues.apache.org/jira/browse/AMQ-4426 - fix and tests
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1463528 13f79535-47bb-0310-9956-ffa450edef68
2013-04-02 13:26:08 +00:00
Bosanac Dejan 0507ad380b https://issues.apache.org/jira/browse/AMQ-4418 - refactor web demo to be war that can be ran in karaf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1462479 13f79535-47bb-0310-9956-ffa450edef68
2013-03-29 13:34:34 +00:00
Gary Tully 7e60a2c6ed https://issues.apache.org/jira/browse/AMQ-4411 - make native deps optional in osgi metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1461608 13f79535-47bb-0310-9956-ffa450edef68
2013-03-27 14:31:15 +00:00
Bosanac Dejan e80dc81741 https://issues.apache.org/jira/browse/AMQ-4341 - fix activemq-osgi headers and dependencies; make javax.* non-optional
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1458717 13f79535-47bb-0310-9956-ffa450edef68
2013-03-20 10:13:45 +00:00
Bosanac Dejan ae62b70f30 https://issues.apache.org/jira/browse/AMQ-4034 - change activemq-osgi resource plugin to properly include xsd and other spring resources
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1457730 13f79535-47bb-0310-9956-ffa450edef68
2013-03-18 12:21:06 +00:00
Bosanac Dejan fbe632e968 https://issues.apache.org/jira/browse/AMQ-4341 - making package imports optional, so activemq-osgi can be used without all the deps
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1456415 13f79535-47bb-0310-9956-ffa450edef68
2013-03-14 13:13:00 +00:00
Gary Tully af5f38797d https://issues.apache.org/jira/browse/AMQ-4341 - some more tweaks and tests from the feedback
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450824 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 16:02:28 +00:00
Gary Tully 30b20b3f38 https://issues.apache.org/jira/browse/AMQ-4341 - apply patch from ioannis with thanks
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1450550 13f79535-47bb-0310-9956-ffa450edef68
2013-02-27 00:36:48 +00:00
Hiram R. Chirino b2fca26213 Remove deprecated modules. Converted many AMQ store tests to be LevelDB tests.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445633 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 14:47:40 +00:00
Hiram R. Chirino dc86b87236 Avoid building/packing legacy/deprecated modules.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1445631 13f79535-47bb-0310-9956-ffa450edef68
2013-02-13 14:44:56 +00:00
Gary Tully 56174e770d [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443026 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:45:26 +00:00
Gary Tully 5e257808f3 [maven-release-plugin] prepare release activemq-5.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1443024 13f79535-47bb-0310-9956-ffa450edef68
2013-02-06 15:43:41 +00:00
Hiram R. Chirino 960481c7e8 Improve the osgi module so that the leveldb store can be loaded.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439910 13f79535-47bb-0310-9956-ffa450edef68
2013-01-29 14:36:39 +00:00
Timothy A. Bish a55aae00e7 Scrub the pom files and remove old cruft and leftovers from the recent refactoring
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439680 13f79535-47bb-0310-9956-ffa450edef68
2013-01-28 22:44:25 +00:00
Bosanac Dejan 2e622a4e15 https://issues.apache.org/jira/browse/AMQ-4034 - initial work on leveldb integration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1439086 13f79535-47bb-0310-9956-ffa450edef68
2013-01-27 14:03:41 +00:00
Bosanac Dejan d0823a337c https://issues.apache.org/jira/browse/AMQ-4034 - add activator to support resources in additional custom modules
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437943 13f79535-47bb-0310-9956-ffa450edef68
2013-01-24 10:57:52 +00:00
Bosanac Dejan 77c0cf9206 https://issues.apache.org/jira/browse/AMQ-4034 - copy all neccessary resources to activemq-osgi bundle
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1437368 13f79535-47bb-0310-9956-ffa450edef68
2013-01-23 12:37:13 +00:00
Bosanac Dejan 33c564259c https://issues.apache.org/jira/browse/AMQ-4034 - moving service factory to activemq-osgi module
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436831 13f79535-47bb-0310-9956-ffa450edef68
2013-01-22 10:39:23 +00:00
Bosanac Dejan 503d3c3fd1 https://issues.apache.org/jira/browse/AMQ-4034 - adding dependency resources to the osgi jar
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1436379 13f79535-47bb-0310-9956-ffa450edef68
2013-01-21 14:43:57 +00:00
Bosanac Dejan 94f71ccf40 https://issues.apache.org/jira/browse/AMQ-4034 -first step on fixing features and creating a osgi service factory for the broker
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1435065 13f79535-47bb-0310-9956-ffa450edef68
2013-01-18 10:12:11 +00:00
Hiram R. Chirino 8eb11a3aa7 Added a activemq-osgi module which is an uber OSGi bundle of all the ActiveMQ jars to make integrating into OSGi a little simpler.
Adding karaf-itests module.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1428537 13f79535-47bb-0310-9956-ffa450edef68
2013-01-03 18:37:45 +00:00