Commit Graph

383 Commits

Author SHA1 Message Date
Willem Ning Jiang e8074fdc0f Upgrade xbean spring to 3.9
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1224693 13f79535-47bb-0310-9956-ffa450edef68
2011-12-26 08:20:16 +00:00
Timothy A. Bish 5396b2bca1 Update XStream and slf4j to latest releases
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1201067 13f79535-47bb-0310-9956-ffa450edef68
2011-11-11 22:03:11 +00:00
Timothy A. Bish 48bf681246 https://issues.apache.org/jira/browse/AMQ-3235
Bumping Camel to 2.8.2

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189949 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 19:21:33 +00:00
Hiram R. Chirino 0d01b16e25 Fixes AMQ-3570: Improve ActiveMQ's XSD to allow elements to appear in any order
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1189740 13f79535-47bb-0310-9956-ffa450edef68
2011-10-27 13:19:49 +00:00
Gary Tully 07eef8e293 https://issues.apache.org/jira/browse/AMQ-3563 - Update javadoc links to point to JDK 1.6 and JEE 1.5. Patch applied with thanks.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1188788 13f79535-47bb-0310-9956-ffa450edef68
2011-10-25 16:57:39 +00:00
Timothy A. Bish e7784672ac https://issues.apache.org/jira/browse/AMQ-3504
Move to the latest Jetty version that still allows the Web Console to work.  This version has the latest websocket updates that jetty has to offer.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1187817 13f79535-47bb-0310-9956-ffa450edef68
2011-10-22 22:22:51 +00:00
Gary Tully 39ca3de50e https://issues.apache.org/jira/browse/AMQ-3491 - Investigate and resolve LGPL dependency via camel-web. Removing camel-web dependency due to its downstream lgpl dep. We can bring it back in if/when it is cleaned up
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1181860 13f79535-47bb-0310-9956-ffa450edef68
2011-10-11 15:59:20 +00:00
Timothy A. Bish 617c436d24 https://issues.apache.org/jira/browse/AMQ-3521
Update the javadocs link in the parent pom

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1180033 13f79535-47bb-0310-9956-ffa450edef68
2011-10-07 13:23:17 +00:00
Timothy A. Bish c3a0de54b7 Move to the latest Apache parent pom and fix some permission issues in the assembly generation.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179837 13f79535-47bb-0310-9956-ffa450edef68
2011-10-06 20:35:51 +00:00
Timothy A. Bish 082fdc5627 Fix for https://issues.apache.org/jira/browse/AMQ-3521
Moves the HTTP client up to the newest v4.1.2 release. Update some additional dependencies as well.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1179226 13f79535-47bb-0310-9956-ffa450edef68
2011-10-05 13:49:50 +00:00
Bosanac Dejan 06c00c1db8 https://issues.apache.org/jira/browse/AMQ-2961 - revert osgi-core to 4.1.0 as the 4.3.0 requires osgi.framework > 1.6, limiting number of container which can run it
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170694 13f79535-47bb-0310-9956-ffa450edef68
2011-09-14 15:46:37 +00:00
Gary Tully ede4964539 remove duplicate declaration of mvn-jar-plugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170243 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 17:07:25 +00:00
Claus Ibsen e97044d7ee AMQ-3494: Upgrade to Camel 2.8.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1170054 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13 06:02:47 +00:00
Bosanac Dejan bb2f0db7b8 https://issues.apache.org/jira/browse/AMQ-3427 - maven jar and archiver plugin updates
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1163987 13f79535-47bb-0310-9956-ffa450edef68
2011-09-01 10:26:33 +00:00
Timothy A. Bish c54967d4fe apply changes for https://issues.apache.org/jira/browse/AMQ-2961 updates some versions of dependencies and clean up the versions in the pom files so its easier to change in the future.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1161672 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 18:05:45 +00:00
Bosanac Dejan ff9f2fe167 https://issues.apache.org/jira/browse/AMQ-3463 - upgrade maven-bundle-plugin
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1161619 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25 16:03:09 +00:00
Timothy A. Bish 8acbf4ceb5 Fix for AMQ-3468. Updated to XStream v1.4.1
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160923 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 23:10:41 +00:00
Bosanac Dejan 4b6648eba1 https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160656 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23 12:25:22 +00:00
Bosanac Dejan 4682d399ba https://issues.apache.org/jira/browse/AMQ-3463 - osgi and maven metadata
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1160316 13f79535-47bb-0310-9956-ffa450edef68
2011-08-22 15:58:44 +00:00
Timothy A. Bish 5700d3004b Update to latest slf4j on log4j now that pax logging supports it in its latest releases.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1159917 13f79535-47bb-0310-9956-ffa450edef68
2011-08-20 21:36:34 +00:00
Bosanac Dejan 4798cea181 https://issues.apache.org/jira/browse/AMQ-3427 - compile on jdk7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1153425 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03 10:53:12 +00:00
Bosanac Dejan 70997eeaf9 https://issues.apache.org/jira/browse/AMQ-3427 - compile with jdk7
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1152720 13f79535-47bb-0310-9956-ffa450edef68
2011-08-01 09:53:47 +00:00
Willem Ning Jiang 5e6f8a1ee8 AMQ-3417 upgrade Camel version to 2.8.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1151406 13f79535-47bb-0310-9956-ffa450edef68
2011-07-27 09:51:07 +00:00
Timothy A. Bish f352e1e447 revert changes from https://issues.apache.org/jira/browse/AMQ-3329
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1129946 13f79535-47bb-0310-9956-ffa450edef68
2011-05-31 22:34:00 +00:00
Timothy A. Bish e560055b70 fix for: https://issues.apache.org/jira/browse/AMQ-3329
Update pom to include the same webconsole version as the other camel components.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1125371 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20 13:10:48 +00:00
Gary Tully 101e7110bc https://issues.apache.org/jira/browse/AMQ-3305 - Implement "exactly once" delivery with kahaDB and XA in the event of a failure post prepare.
Fixed up transaction broker recovery processing and kahadb store such that pending recovered
messages and acks wait for and respect the eventual xa transction outcome. Essentially
implementing exactly once delivery semantics on failure. Updated the camel jms to jdbc
test route to validate correct failure recovery processing with geronimo, test pulls in
xa wrappers from jencks and openejb such that NamedXAResources are registered with geronimo.
Additional unit tests added.

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1100208 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06 13:27:49 +00:00
Bosanac Dejan 26cf6a7f26 https://issues.apache.org/jira/browse/AMQ-826 - ldap based authorization - making tests work again, upgrading to apache ds 1.5.7, fixing ldif
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1091401 13f79535-47bb-0310-9956-ffa450edef68
2011-04-12 13:25:34 +00:00
Bosanac Dejan d8c142f1f4 https://issues.apache.org/jira/browse/AMQ-3249 - removing jaxb and stax from dependencies and distro
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086566 13f79535-47bb-0310-9956-ffa450edef68
2011-03-29 12:32:34 +00:00
Gary Tully 442232514c [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086321 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 18:02:03 +00:00
Gary Tully c94de4230a [maven-release-plugin] prepare release activemq-5.5.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1086315 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 17:52:07 +00:00
Bosanac Dejan 8e3e5839e9 change camel to version 2.7.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1085377 13f79535-47bb-0310-9956-ffa450edef68
2011-03-25 14:02:45 +00:00
Bosanac Dejan a065bb1fb3 https://issues.apache.org/jira/browse/AMQ-3105 - removing icu4j as we're now requiring JDK 6
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084237 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 16:20:51 +00:00
Bosanac Dejan 536755170c https://issues.apache.org/jira/browse/AMQ-3235 - use old web console
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084208 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 15:00:56 +00:00
Bosanac Dejan 8ba02a395f https://issues.apache.org/jira/browse/AMQ-3235 - upgrade to camel 2.8-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1084132 13f79535-47bb-0310-9956-ffa450edef68
2011-03-22 11:09:52 +00:00
Bruce Snyder da66c46847 AMQ-2968 - Add Apache commons daemon (jsvc/procrun) start/stop support.
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1079638 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09 01:42:36 +00:00
Bosanac Dejan 2f47288da2 https://issues.apache.org/jira/browse/AMQ-3142 - upgrade to karaf 2.2.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1077868 13f79535-47bb-0310-9956-ffa450edef68
2011-03-04 11:00:24 +00:00
Hiram R. Chirino c1f4dc94bb Fixes AMQ-3184 : Upgrade to Camel 2.6.0
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1071848 13f79535-47bb-0310-9956-ffa450edef68
2011-02-18 00:50:35 +00:00
Bosanac Dejan a806882adb https://issues.apache.org/jira/browse/AMQ-3177 - slf4j final touch
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069754 13f79535-47bb-0310-9956-ffa450edef68
2011-02-11 11:25:24 +00:00
Bosanac Dejan 8bf987b134 https://issues.apache.org/jira/browse/AMQ-3177 - use slf4j instead of jcl
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1069405 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10 14:24:01 +00:00
Bosanac Dejan a71c1e354e https://issues.apache.org/jira/browse/AMQ-3105 - require JDK 6 and fix an bug for osx
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1052512 13f79535-47bb-0310-9956-ffa450edef68
2010-12-24 14:18:15 +00:00
Gary Tully dbaf2b1c8c fix version post release - back to snap
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039325 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 12:15:12 +00:00
Bosanac Dejan 81c5b9d6d3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039294 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:01:45 +00:00
Bosanac Dejan 2781601db1 [maven-release-plugin] prepare release activemq-5.4.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039292 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 10:01:35 +00:00
Bosanac Dejan e8a32d56f8 updating activemq-version
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039281 13f79535-47bb-0310-9956-ffa450edef68
2010-11-26 09:37:39 +00:00
Bosanac Dejan 7fd8cc03d3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039020 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 12:32:08 +00:00
Bosanac Dejan 97a2838007 [maven-release-plugin] prepare release activemq-5.4.2
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1039018 13f79535-47bb-0310-9956-ffa450edef68
2010-11-25 12:32:01 +00:00
Bosanac Dejan 52aaa0a7f3 fixing licenses
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1033853 13f79535-47bb-0310-9956-ffa450edef68
2010-11-11 09:26:35 +00:00
Bosanac Dejan 90fb6e6e0f https://issues.apache.org/activemq/browse/AMQ-2989 - xmpp3
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1024215 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 12:18:20 +00:00
Bosanac Dejan e3f784df2a https://issues.apache.org/activemq/browse/AMQ-2972 - stomp over web socket - upgrade Jetty
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1022029 13f79535-47bb-0310-9956-ffa450edef68
2010-10-13 08:49:46 +00:00
Bosanac Dejan d28be4dfb4 https://issues.apache.org/activemq/browse/AMQ-2885 - upgrading aries and karaf
git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1001699 13f79535-47bb-0310-9956-ffa450edef68
2010-09-27 12:14:59 +00:00