activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [1/2] activemq git commit: Upgrade to Camel 2.15.1
Date Fri, 03 Apr 2015 07:26:56 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 299410820 -> 94f1e98ad


Upgrade to Camel 2.15.1


Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/9f040144
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/9f040144
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/9f040144

Branch: refs/heads/master
Commit: 9f040144f2bdd0075eb0766325bdf81bb51080a4
Parents: 2994108
Author: Claus Ibsen <claus.ibsen@gmail.com>
Authored: Fri Apr 3 09:07:31 2015 +0200
Committer: Claus Ibsen <claus.ibsen@gmail.com>
Committed: Fri Apr 3 09:17:56 2015 +0200

----------------------------------------------------------------------
 .../org/apache/activemq/camel/component/broker/BrokerEndpoint.java | 2 +-
 pom.xml                                                            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/9f040144/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
----------------------------------------------------------------------
diff --git a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
index 7a10c95..5479022 100644
--- a/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
+++ b/activemq-camel/src/main/java/org/apache/activemq/camel/component/broker/BrokerEndpoint.java
@@ -38,7 +38,7 @@ import org.apache.camel.spi.UriPath;
 import org.apache.camel.util.UnsafeUriCharactersEncoder;
 
 @ManagedResource(description = "Managed Camel Broker Endpoint")
-@UriEndpoint(scheme = "broker", consumerClass = BrokerConsumer.class, syntax = "broker:destination",
label = "messaging")
+@UriEndpoint(scheme = "broker", syntax = "broker:destination", consumerClass = BrokerConsumer.class,
title = "Broker", label = "messaging")
 public class BrokerEndpoint extends DefaultEndpoint implements MultipleConsumersSupport,
Service {
 
     static final String PRODUCER_BROKER_EXCHANGE = "producerBrokerExchange";

http://git-wip-us.apache.org/repos/asf/activemq/blob/9f040144/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a26b242..c5ebd5d 100755
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
     <aries-version>1.1.0</aries-version>
     <aries-transaction-version>1.1.1</aries-transaction-version>
     <axion-version>1.0-M3-dev</axion-version>
-    <camel-version>2.15.0</camel-version>
+    <camel-version>2.15.1</camel-version>
     <camel-version-range>[2.15,3)</camel-version-range>
     <cglib-version>2.2</cglib-version>
     <commons-beanutils-version>1.8.3</commons-beanutils-version>


Mime
View raw message