activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [1/5] activemq-6 git commit: A few changes around logging-processor
Date Thu, 12 Mar 2015 11:11:52 GMT
Repository: activemq-6
Updated Branches:
  refs/heads/master 670f5841b -> 87520f760


A few changes around logging-processor

- Bumped up version to 2.0.0.Alpha
- Client bundle changes to be copmatible with 2.0.0
- Fixing bundle / Logging classes for missing format (it was an issue with the previous one already)
- Fixed up dependencies to avoid transient downloads


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

Branch: refs/heads/master
Commit: e065d25b6fb4cdfa7f5b72afd52d6f4771b50634
Parents: d36a1d7
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Wed Mar 11 18:49:10 2015 -0400
Committer: Martyn Taylor <mtaylor@redhat.com>
Committed: Thu Mar 12 10:49:17 2015 +0000

----------------------------------------------------------------------
 activemq-bootstrap/pom.xml                      |   2 +
 activemq-commons/pom.xml                        |   2 +
 activemq-core-client/pom.xml                    |   2 +
 .../client/ActiveMQClientMessageBundle.java     | 105 ++++++++-----------
 activemq-jms-client/pom.xml                     |   2 +
 .../jms/client/ActiveMQJMSClientBundle.java     |  23 ++--
 activemq-jms-server/pom.xml                     |   2 +
 .../jms/server/ActiveMQJMSServerBundle.java     |  10 +-
 activemq-journal/pom.xml                        |   2 +
 .../activemq/journal/ActiveMQJournalBundle.java |   7 +-
 .../activemq-amqp-protocol/pom.xml              |   2 +
 .../activemq-openwire-protocol/pom.xml          |   2 +
 activemq-protocols/activemq-proton-plug/pom.xml |   2 +
 .../ActiveMQAMQPProtocolMessageBundle.java      |  16 +--
 .../activemq-stomp-protocol/pom.xml             |   2 +
 .../ActiveMQStompProtocolMessageBundle.java     |  40 +++----
 activemq-ra/pom.xml                             |   2 +
 .../apache/activemq/ra/ActiveMQRABundle.java    |  19 ++--
 activemq-rest/pom.xml                           |   3 +
 activemq-server/pom.xml                         |   2 +
 .../core/server/ActiveMQMessageBundle.java      |  80 ++++++--------
 activemq-service-extensions/pom.xml             |   2 +
 activemq-tools/pom.xml                          |   2 +
 .../activemq-aerogear-integration/pom.xml       |   2 +
 .../aerogear/ActiveMQAeroGearBundle.java        |   6 +-
 integration/activemq-spring-integration/pom.xml |   2 +
 integration/activemq-vertx-integration/pom.xml  |  10 +-
 pom.xml                                         |  14 ++-
 tests/extra-tests/pom.xml                       |   2 +
 tests/integration-tests/pom.xml                 |   2 +
 tests/jms-tests/pom.xml                         |   3 +
 tests/unit-tests/pom.xml                        |  10 +-
 32 files changed, 191 insertions(+), 191 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-bootstrap/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml
index 21ceb88..00005c6 100644
--- a/activemq-bootstrap/pom.xml
+++ b/activemq-bootstrap/pom.xml
@@ -50,6 +50,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-commons/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml
index 1296b07..5b62f98 100644
--- a/activemq-commons/pom.xml
+++ b/activemq-commons/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.jboss.logmanager</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index 640d625..e3d5ed5 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.jgroups</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
index cfa9cf0..d06a114 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/ActiveMQClientMessageBundle.java
@@ -50,45 +50,40 @@ public interface ActiveMQClientMessageBundle
 {
    ActiveMQClientMessageBundle BUNDLE = Messages.getBundle(ActiveMQClientMessageBundle.class);
 
-   @Message(id = 119000, value = "ClientSession closed while creating session", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119000, value = "ClientSession closed while creating session")
    ActiveMQInternalErrorException clientSessionClosed();
 
-   @Message(id = 119001, value = "Failed to create session", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119001, value = "Failed to create session")
    ActiveMQInternalErrorException failedToCreateSession(@Cause Throwable t);
 
-   @Message(id = 119002, value = "Internal Error! ClientSessionFactoryImpl::createSessionInternal "
-                                          + "just reached a condition that was not supposed to happen. "
-                                      + "Please inform this condition to the ActiveMQ team", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQInternalErrorException clietSessionInternal();
-
-   @Message(id = 119003, value = "Queue can not be both durable and temporary", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119003, value = "Queue can not be both durable and temporary")
    ActiveMQInternalErrorException queueMisConfigured();
 
-   @Message(id = 119004, value = "Failed to initialise session factory", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119004, value = "Failed to initialise session factory")
    ActiveMQInternalErrorException failedToInitialiseSessionFactory(@Cause Exception e);
 
-   @Message(id = 119005, value = "Exception in Netty transport", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119005, value = "Exception in Netty transport")
    ActiveMQInternalErrorException nettyError();
 
-   @Message(id = 119006, value =  "Channel disconnected", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119006, value =  "Channel disconnected")
    ActiveMQNotConnectedException channelDisconnected();
 
-   @Message(id = 119007, value =  "Cannot connect to server(s). Tried with all available servers.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119007, value =  "Cannot connect to server(s). Tried with all available servers.")
    ActiveMQNotConnectedException cannotConnectToServers();
 
-   @Message(id = 119008, value =  "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119008, value =  "Failed to connect to any static connectors")
    ActiveMQNotConnectedException cannotConnectToStaticConnectors(@Cause Exception e);
 
-   @Message(id = 119009, value =  "Failed to connect to any static connectors", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119009, value =  "Failed to connect to any static connectors")
    ActiveMQNotConnectedException cannotConnectToStaticConnectors2();
 
-   @Message(id = 119010, value =  "Connection is destroyed", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119010, value =  "Connection is destroyed")
    ActiveMQNotConnectedException connectionDestroyed();
 
    @Message(id = 119011, value =  "Did not receive data from server for {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQConnectionTimedOutException connectionTimedOut(Connection transportConnection);
 
-   @Message(id = 119012, value =  "Timed out waiting to receive initial broadcast from cluster", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119012, value =  "Timed out waiting to receive initial broadcast from cluster")
    ActiveMQConnectionTimedOutException connectionTimedOutInInitialBroadcast();
 
    @Message(id = 119013, value =  "Timed out waiting to receive cluster topology. Group:{0}", format = Message.Format.MESSAGE_FORMAT)
@@ -97,58 +92,56 @@ public interface ActiveMQClientMessageBundle
    @Message(id = 119014, value =  "Timed out after waiting {0} ms for response when sending packet {1}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQConnectionTimedOutException timedOutSendingPacket(long timeout, Byte type);
 
-   @Message(id = 119015, value =  "The connection was disconnected because of server shutdown", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119015, value =  "The connection was disconnected because of server shutdown")
    ActiveMQDisconnectedException disconnected();
 
-   @Message(id = 119016, value =  "Connection failure detected. Unblocking a blocking call that will never get a resp" +
-         "onse", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119016, value =  "Connection failure detected. Unblocking a blocking call that will never get a response")
    ActiveMQUnBlockedException unblockingACall(@Cause Throwable t);
 
-   @Message(id = 119017, value =  "Consumer is closed", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119017, value =  "Consumer is closed")
    ActiveMQObjectClosedException consumerClosed();
 
-   @Message(id = 119018, value =  "Producer is closed", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119018, value =  "Producer is closed")
    ActiveMQObjectClosedException producerClosed();
 
-   @Message(id = 119019, value =  "Session is closed", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119019, value =  "Session is closed")
    ActiveMQObjectClosedException sessionClosed();
 
-   @Message(id = 119020, value =  "Cannot call receive(...) - a MessageHandler is set", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119020, value =  "Cannot call receive(...) - a MessageHandler is set")
    ActiveMQIllegalStateException messageHandlerSet();
 
-   @Message(id = 119021, value =  "Cannot set MessageHandler - consumer is in receive(...)", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119021, value =  "Cannot set MessageHandler - consumer is in receive(...)")
    ActiveMQIllegalStateException inReceive();
 
    @Message(id = 119022, value =  "Header size ({0}) is too big, use the messageBody for large data, or increase minLargeMessageSize",
          format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIllegalStateException headerSizeTooBig(Integer headerSize);
 
-   @Message(id = 119023, value =  "The large message lost connection with its session, either because of a rollback or a closed session", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119023, value =  "The large message lost connection with its session, either because of a rollback or a closed session")
    ActiveMQIllegalStateException largeMessageLostSession();
 
-   @Message(id = 119024, value =  "Could not select a TransportConfiguration to create SessionFactory", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119024, value =  "Could not select a TransportConfiguration to create SessionFactory")
    ActiveMQIllegalStateException noTCForSessionFactory();
 
-   @Message(id = 119025, value = "Error saving the message body", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119025, value = "Error saving the message body")
    ActiveMQLargeMessageException errorSavingBody(@Cause Exception e);
 
-   @Message(id = 119026, value =  "Error reading the LargeMessageBody", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119026, value =  "Error reading the LargeMessageBody")
    ActiveMQLargeMessageException errorReadingBody(@Cause Exception e);
 
-   @Message(id = 119027, value =  "Error closing stream from LargeMessageBody", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119027, value =  "Error closing stream from LargeMessageBody")
    ActiveMQLargeMessageException errorClosingLargeMessage(@Cause Exception e);
 
-   @Message(id = 119028, value =  "Timeout waiting for LargeMessage Body", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119028, value =  "Timeout waiting for LargeMessage Body")
    ActiveMQLargeMessageException timeoutOnLargeMessage();
 
-   @Message(id = 119029, value =  "Error writing body of message", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119029, value =  "Error writing body of message")
    ActiveMQLargeMessageException errorWritingLargeMessage(@Cause Exception e);
 
-   @Message(id = 119030, value =  "The transaction was rolled back on failover to a backup server", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119030, value =  "The transaction was rolled back on failover to a backup server")
    ActiveMQTransactionRolledBackException txRolledBack();
 
-   @Message(id = 119031, value =  "The transaction was rolled back on failover however commit may have been successful" +
-         "", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119031, value =  "The transaction was rolled back on failover however commit may have been successful")
    ActiveMQTransactionOutcomeUnknownException txOutcomeUnknown();
 
    @Message(id = 119032, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -164,70 +157,67 @@ public interface ActiveMQClientMessageBundle
    @Message(id = 119035, value = "Invalid window size {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException invalidWindowSize(Integer size);
 
-   @Message(id = 119036, value = "No operation mapped to int {0}", format = Message.Format.MESSAGE_FORMAT)
-   IllegalArgumentException noOperationMapped(Integer operation);
-
    @Message(id = 119037, value = "Invalid last Received Command ID: {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException invalidCommandID(Integer lastReceivedCommandID);
 
    @Message(id = 119038, value = "Cannot find channel with id {0} to close", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException noChannelToClose(Long id);
 
-   @Message(id = 119039, value = "Close Listener cannot be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119039, value = "Close Listener cannot be null")
    IllegalArgumentException closeListenerCannotBeNull();
 
-   @Message(id = 119040, value = "Fail Listener cannot be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119040, value = "Fail Listener cannot be null")
    IllegalArgumentException failListenerCannotBeNull();
 
    @Message(id = 119041, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException connectionExists(Object id);
 
-   @Message(id = 119042, value = "Invalid argument null listener", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119042, value = "Invalid argument null listener")
    IllegalArgumentException nullListener();
 
-   @Message(id = 119043, value = "Invalid argument null handler", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119043, value = "Invalid argument null handler")
    IllegalArgumentException nullHandler();
 
-   @Message(id = 119044, value = "No available codec to decode password!", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119044, value = "No available codec to decode password!")
    IllegalArgumentException noCodec();
 
-   @Message(id = 119045, value = "the first node to be compared is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119045, value = "the first node to be compared is null")
    IllegalArgumentException firstNodeNull();
 
-   @Message(id = 119046, value = "the second node to be compared is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119046, value = "the second node to be compared is null")
    IllegalArgumentException secondNodeNull();
 
-   @Message(id = 119047, value = "nodes have different node names", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119047, value = "nodes have different node names")
    IllegalArgumentException nodeHaveDifferentNames();
 
-   @Message(id = 119048, value = "nodes hava a different number of attributes", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119048, value = "nodes hava a different number of attributes")
    IllegalArgumentException nodeHaveDifferentAttNumber();
 
    @Message(id = 119049, value = "attribute {0}={1} does not match", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException attsDontMatch(String name, String value);
 
-   @Message(id = 119050, value = "one node has children and the other does not" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119050, value = "one node has children and the other does not")
    IllegalArgumentException oneNodeHasChildren();
 
-   @Message(id = 119051, value = "nodes hava a different number of children" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119051, value = "nodes hava a different number of children")
    IllegalArgumentException nodeHasDifferentChildNumber();
 
-   @Message(id = 119052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119052, value = "Element {0} requires a valid Boolean value, but ''{1}'' cannot be parsed as a Boolean", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException mustBeBoolean(Node elem, String value);
 
-   @Message(id = 119053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119053, value = "Element {0} requires a valid Double value, but ''{1}'' cannot be parsed as a Double", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException mustBeDouble(Node elem, String value);
 
-   @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as a Integer" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119054, value = "Element {0} requires a valid Integer value, but ''{1}'' cannot be parsed as a Integer", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException mustBeInteger(Node elem, String value);
 
-   @Message(id = 119055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119055, value = "Element {0} requires a valid Long value, but ''{1}'' cannot be parsed as a Long", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException mustBeLong(Node elem, String value);
 
-   @Message(id = 119056, value = "Failed to get decoder" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119056, value = "Failed to get decoder")
    IllegalArgumentException failedToGetDecoder(@Cause Exception e);
 
-   @Message(id = 119057, value = "Error decoding password" , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119057, value = "Error decoding password")
    IllegalArgumentException errordecodingPassword(@Cause Exception e);
 
    @Message(id = 119058, value = "Address \"{0}\" is full. Message encode size = {1}B", format = Message.Format.MESSAGE_FORMAT)
@@ -237,11 +227,6 @@ public interface ActiveMQClientMessageBundle
          , format = Message.Format.MESSAGE_FORMAT)
    ActiveMQInterceptorRejectedPacketException interceptorRejectedPacket(String interceptionResult);
 
-   @Message(id = 119060, value = "Large Message Transmission interrupted on consumer shutdown."
-         , format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119060, value = "Large Message Transmission interrupted on consumer shutdown.")
    ActiveMQLargeMessageInterruptedException largeMessageInterrupted();
-
-   @Message(id = 119061, value =  "error decoding AMQP frame", format = Message.Format.MESSAGE_FORMAT)
-   String decodeError();
-
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml
index 67e2251..6168ef8 100644
--- a/activemq-jms-client/pom.xml
+++ b/activemq-jms-client/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
index f396c9c..eb6802b 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/jms/client/ActiveMQJMSClientBundle.java
@@ -49,48 +49,47 @@ public interface ActiveMQJMSClientBundle
    @Message(id = 129000, value =  "Invalid filter: {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter);
 
-   @Message(id = 129001, value =  "Invalid Subscription Name. It is required to set the subscription name", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129001, value =  "Invalid Subscription Name. It is required to set the subscription name")
    ActiveMQIllegalStateException invalidSubscriptionName();
 
    @Message(id = 129002, value =  "Destination {0} does not exist", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQNonExistentQueueException destinationDoesNotExist(SimpleString destination);
 
-   @Message(id = 129003, value =  "name cannot be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129003, value =  "name cannot be null")
    IllegalArgumentException nameCannotBeNull();
 
-   @Message(id = 129004, value =  "name cannot be empty", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129004, value =  "name cannot be empty")
    IllegalArgumentException nameCannotBeEmpty();
 
-   @Message(id = 129005, value =  "It is illegal to call this method from within a Message Listener", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129005, value =  "It is illegal to call this method from within a Message Listener")
    IllegalStateRuntimeException callingMethodFromListenerRuntime();
 
-   @Message(id = 129006, value =  "It is illegal to call this method from within a Message Listener", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129006, value =  "It is illegal to call this method from within a Message Listener")
    IllegalStateException callingMethodFromListener();
 
-   @Message(id = 129007, value =  "It is illegal to call this method from within a Completion Listener", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129007, value =  "It is illegal to call this method from within a Completion Listener")
    IllegalStateRuntimeException callingMethodFromCompletionListenerRuntime();
 
-   @Message(id = 129008, value =  "It is illegal to call this method from within a Completion Listener", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129008, value =  "It is illegal to call this method from within a Completion Listener")
    IllegalStateException callingMethodFromCompletionListener();
 
    @Message(id = 129009, value = "Null {0} is not allowed", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException nullArgumentNotAllowed(String type);
 
-   @Message(id = 129010, value = "Topic (Destination) cannot be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129010, value = "Topic (Destination) cannot be null")
    InvalidDestinationException nullTopic();
 
-   @Message(id = 129011, value = "LargeMessage streaming is only possible on ByteMessage or StreamMessage",
-            format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129011, value = "LargeMessage streaming is only possible on ByteMessage or StreamMessage")
    IllegalStateException onlyValidForByteOrStreamMessages();
 
    @Message(id = 129012, value = "The property name ''{0}'' is not a valid java identifier.",
             format = Message.Format.MESSAGE_FORMAT)
    JMSRuntimeException invalidJavaIdentifier(String propertyName);
 
-   @Message(id = 129013, value = "Message is read-only", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129013, value = "Message is read-only")
    MessageNotWriteableException messageNotWritable();
 
-   @Message(id = 129014, value = "Message is write-only", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129014, value = "Message is write-only")
    MessageNotReadableException messageNotReadable();
 
    @Message(id = 129015, value = "Illegal deliveryMode value: {0}", format = Message.Format.MESSAGE_FORMAT)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml
index 475e9ce..783afcb 100644
--- a/activemq-jms-server/pom.xml
+++ b/activemq-jms-server/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
index b2747a8..535534b 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
@@ -40,16 +40,10 @@ public interface ActiveMQJMSServerBundle
    @Message(id = 129000, value =  "Connection Factory {0} does not exist" , format = Message.Format.MESSAGE_FORMAT)
    ActiveMQInternalErrorException cfDoesntExist(String name);
 
-   @Message(id = 129001, value =  "Invalid signature {0} parsing Connection Factory" , format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQInternalErrorException invalidSignatureParsingCF(String sig);
-
-   @Message(id = 129002, value = "Invalid node {0} parsing Connection Factory", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQInternalErrorException invalidNodeParsingCF(String name);
-
    @Message(id = 129003, value = "Discovery Group ''{0}'' does not exist on main config", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIllegalStateException discoveryGroupDoesntExist(String name);
 
-   @Message(id = 129004, value = "No Connector name configured on create ConnectionFactory", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129004, value = "No Connector name configured on create ConnectionFactory")
    ActiveMQIllegalStateException noConnectorNameOnCF();
 
    @Message(id = 129005, value = "Connector ''{0}'' not found on the main configuration file" , format = Message.Format.MESSAGE_FORMAT)
@@ -58,6 +52,6 @@ public interface ActiveMQJMSServerBundle
    @Message(id = 129006, value =  "Binding {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAddressExistsException cfBindingsExists(String name);
 
-   @Message(id = 129007, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 129007, value = "Error decoding password using codec instance")
    ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-journal/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml
index 3a48c9f..f94fd54 100644
--- a/activemq-journal/pom.xml
+++ b/activemq-journal/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
----------------------------------------------------------------------
diff --git a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
index 0754142..053f440 100644
--- a/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
+++ b/activemq-journal/src/main/java/org/apache/activemq/journal/ActiveMQJournalBundle.java
@@ -37,13 +37,12 @@ public interface ActiveMQJournalBundle
    @Message(id = 149000, value =  "failed to rename file {0} to {1}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIOErrorException ioRenameFileError(String name, String newFileName);
 
-   @Message(id = 149001, value =  "Journal data belong to a different version", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 149001, value =  "Journal data belong to a different version")
    ActiveMQIOErrorException journalDifferentVersion();
 
-   @Message(id = 149002, value =  "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual",
-         format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 149002, value =  "Journal files version mismatch. You should export the data from the previous version and import it as explained on the user''s manual")
    ActiveMQIOErrorException journalFileMisMatch();
 
-   @Message(id = 149003, value =   "File not opened", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 149003, value =   "File not opened")
    ActiveMQIOErrorException fileNotOpened();
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-amqp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml
index 11993b8..74e7ac1 100644
--- a/activemq-protocols/activemq-amqp-protocol/pom.xml
+++ b/activemq-protocols/activemq-amqp-protocol/pom.xml
@@ -43,6 +43,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-openwire-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml
index f51a7b7..6458866 100644
--- a/activemq-protocols/activemq-openwire-protocol/pom.xml
+++ b/activemq-protocols/activemq-openwire-protocol/pom.xml
@@ -32,6 +32,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-proton-plug/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml
index cc545b2..db125c4 100644
--- a/activemq-protocols/activemq-proton-plug/pom.xml
+++ b/activemq-protocols/activemq-proton-plug/pom.xml
@@ -43,6 +43,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
index c2aa7fc..b3d2258 100644
--- a/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
+++ b/activemq-protocols/activemq-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java
@@ -38,21 +38,18 @@ public interface ActiveMQAMQPProtocolMessageBundle
    ActiveMQAMQPProtocolMessageBundle BUNDLE = Messages.getBundle(ActiveMQAMQPProtocolMessageBundle.class);
 
 
-   @Message(id = 219000, value = "target address not set", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219000, value = "target address not set")
    ActiveMQAMQPInvalidFieldException targetAddressNotSet();
 
    @Message(id = 219001, value = "error creating temporary queue, {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAMQPInternalErrorException errorCreatingTemporaryQueue(String message);
 
-   @Message(id = 219002, value = "target address does not exist", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219002, value = "target address does not exist")
    ActiveMQAMQPIllegalStateException addressDoesntExist();
 
    @Message(id = 219003, value = "error finding temporary queue, {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAMQPInternalErrorException errorFindingTemporaryQueue(String message);
 
-   @Message(id = 219004, value = "error creating ActiveMQ Session, {0}", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQAMQPInternalErrorException errorCreatingActiveMQSession(String message);
-
    @Message(id = 219005, value = "error creating ActiveMQ Consumer, {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAMQPInternalErrorException errorCreatingActiveMQConsumer(String message);
 
@@ -65,13 +62,10 @@ public interface ActiveMQAMQPProtocolMessageBundle
    @Message(id = 219008, value = "error cancelling message {0}, {1}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAMQPIllegalStateException errorCancellingMessage(String messageID, String message);
 
-   @Message(id = 219009, value = "error closing consumer {0}, {1}", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQAMQPIllegalStateException errorClosingConsumer(long consumerID, String message);
-
-   @Message(id = 219010, value = "source address does not exist", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219010, value = "source address does not exist")
    ActiveMQAMQPInvalidFieldException sourceAddressDoesntExist();
 
-   @Message(id = 219011, value = "source address not set", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 219011, value = "source address not set")
    ActiveMQAMQPInvalidFieldException sourceAddressNotSet();
 
    @Message(id = 219012, value = "error rolling back coordinator: {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -80,6 +74,4 @@ public interface ActiveMQAMQPProtocolMessageBundle
    @Message(id = 219013, value = "error committing coordinator: {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAMQPIllegalStateException errorCommittingCoordinator(String message);
 
-   @Message(id = 219015, value = "error decoding AMQP frame", format = Message.Format.MESSAGE_FORMAT)
-   String decodeError();
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-stomp-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml
index 2ee12a4..b47320a 100644
--- a/activemq-protocols/activemq-stomp-protocol/pom.xml
+++ b/activemq-protocols/activemq-stomp-protocol/pom.xml
@@ -32,6 +32,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
index 8cf2a90..6879f7d 100644
--- a/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
+++ b/activemq-protocols/activemq-stomp-protocol/src/main/java/org/apache/activemq/core/protocol/stomp/ActiveMQStompProtocolMessageBundle.java
@@ -46,28 +46,28 @@ public interface ActiveMQStompProtocolMessageBundle
    @Message(id = 339002, value = "Stomp versions not supported: {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQStompException versionNotSupported(String acceptVersion);
 
-   @Message(id = 339003, value = "Header host is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339003, value = "Header host is null")
    ActiveMQStompException nullHostHeader();
 
-   @Message(id = 339004, value = "Cannot accept null as host", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339004, value = "Cannot accept null as host")
    String hostCannotBeNull();
 
-   @Message(id = 339005, value = "Header host does not match server host", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339005, value = "Header host does not match server host")
    ActiveMQStompException hostNotMatch();
 
    @Message(id = 339006, value = "host {0} does not match server host name", format = Message.Format.MESSAGE_FORMAT)
    String hostNotMatchDetails(String host);
 
-   @Message(id = 339007, value = "Connection was destroyed.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339007, value = "Connection was destroyed.")
    ActiveMQStompException connectionDestroyed();
 
-   @Message(id = 339008, value = "Connection has not been established.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339008, value = "Connection has not been established.")
    ActiveMQStompException connectionNotEstablished();
 
-   @Message(id = 339009, value = "Exception getting session", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339009, value = "Exception getting session")
    ActiveMQStompException errorGetSession(@Cause Exception e);
 
-   @Message(id = 339010, value = "Connection is not valid.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339010, value = "Connection is not valid.")
    ActiveMQStompException invalidConnection();
 
    @Message(id = 339011, value = "Error sending message {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -82,7 +82,7 @@ public interface ActiveMQStompProtocolMessageBundle
    @Message(id = 339014, value = "Error aborting {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQStompException errorAbortTx(String txID, @Cause Exception e);
 
-   @Message(id = 339015, value = "Client must set destination or id header to a SUBSCRIBE command", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339015, value = "Client must set destination or id header to a SUBSCRIBE command")
    ActiveMQStompException noDestination();
 
    @Message(id = 339016, value = "Error creating subscription {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -94,10 +94,10 @@ public interface ActiveMQStompProtocolMessageBundle
    @Message(id = 339018, value = "Error acknowledging message {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQStompException errorAck(String messageID, @Cause Exception e);
 
-   @Message(id = 339019, value = "Invalid char sequence: two consecutive CRs.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339019, value = "Invalid char sequence: two consecutive CRs.")
    ActiveMQStompException invalidTwoCRs();
 
-   @Message(id = 339020, value = "Invalid char sequence: There is a CR not followed by an LF", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339020, value = "Invalid char sequence: There is a CR not followed by an LF")
    ActiveMQStompException badCRs();
 
    @Message(id = 339021, value = "Expect new line char but is {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -118,36 +118,36 @@ public interface ActiveMQStompProtocolMessageBundle
    @Message(id = 339026, value = "subscription id {0} does not match {1}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQStompException subscriptionIDMismatch(String subscriptionID, String actualID);
 
-   @Message(id = 339027, value = "Cannot create a subscriber on the durable subscription if the client-id of the connection is not set", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339027, value = "Cannot create a subscriber on the durable subscription if the client-id of the connection is not set")
    IllegalStateException missingClientID();
 
-   @Message(id = 339028, value = "Message header too big, increase minLargeMessageSize please.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339028, value = "Message header too big, increase minLargeMessageSize please.")
    Exception headerTooBig();
 
    @Message(id = 339029, value = "Unsupported command: {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQStompException unknownCommand(String command);
 
-   @Message(id = 339030, value = "transaction header is mandatory to COMMIT a transaction", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339030, value = "transaction header is mandatory to COMMIT a transaction")
    ActiveMQStompException needTxIDHeader();
 
-   @Message(id = 339031, value = "Error handling send", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339031, value = "Error handling send")
    ActiveMQStompException errorHandleSend(@Cause Exception e);
 
-   @Message(id = 339032, value = "Need a transaction id to begin", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339032, value = "Need a transaction id to begin")
    ActiveMQStompException beginTxNoID();
 
-   @Message(id = 339033, value = "transaction header is mandatory to ABORT a transaction", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339033, value = "transaction header is mandatory to ABORT a transaction")
    ActiveMQStompException abortTxNoID();
 
-   @Message(id = 339034, value = "This method should not be called", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339034, value = "This method should not be called")
    IllegalStateException invalidCall();
 
-   @Message(id = 339035, value = "Must specify the subscription''s id or the destination you are unsubscribing from", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339035, value = "Must specify the subscription''s id or the destination you are unsubscribing from")
    ActiveMQStompException needIDorDestination();
 
-   @Message(id = 339037, value = "Must specify the subscription''s id", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339037, value = "Must specify the subscription''s id")
    ActiveMQStompException needSubscriptionID();
 
-   @Message(id = 339039, value = "No id header in ACK/NACK frame.", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 339039, value = "No id header in ACK/NACK frame.")
    ActiveMQStompException noIDInAck();
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-ra/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index b3ac13b..676effa 100644
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
----------------------------------------------------------------------
diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
index dfc3556..7b06c72 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQRABundle.java
@@ -23,7 +23,6 @@ import org.jboss.logging.annotations.Message;
 import org.jboss.logging.annotations.MessageBundle;
 import org.jboss.logging.Messages;
 
-import javax.jms.JMSException;
 import javax.jms.JMSRuntimeException;
 import javax.resource.NotSupportedException;
 
@@ -42,30 +41,24 @@ public interface ActiveMQRABundle
 
    ActiveMQRABundle BUNDLE = Messages.getBundle(ActiveMQRABundle.class);
 
-   @Message(id = 159000, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 159000, value = "Error decoding password using codec instance")
    ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);
 
-   @Message(id = 159001, value = "MDB cannot be deployed as it has no Activation Spec. Please provide an Activation!", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 159001, value = "MDB cannot be deployed as it has no Activation Spec. Please provide an Activation!")
    NotSupportedException noActivationSpec();
 
-   @Message(id = 159002, value = "Please provide a destination for the MDB", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 159002, value = "Please provide a destination for the MDB")
    IllegalArgumentException noDestinationName();
 
-   @Message(id = 159003, value = ISE, format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 159003, value = ISE)
    JMSRuntimeException illegalJEEMethod();
 
-   @Message(id = 159004, value = "Invalid Session Mode SESSION_TRANSACTED", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 159004, value = "Invalid Session Mode SESSION_TRANSACTED")
    JMSRuntimeException invalidSessionTransactedModeRuntime();
 
-   @Message(id = 159005, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 159005, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE")
    JMSRuntimeException invalidClientAcknowledgeModeRuntime();
 
    @Message(id = 159006, value = "Invalid Session Mode {0}", format = Message.Format.MESSAGE_FORMAT)
    JMSRuntimeException invalidAcknowledgeMode(int sessionMode);
-
-   @Message(id = 159007, value = "Invalid Session Mode SESSION_TRANSACTED", format = Message.Format.MESSAGE_FORMAT)
-   JMSException invalidSessionTransactedMode();
-
-   @Message(id = 159008, value = "Invalid Session Mode CLIENT_ACKNOWLEDGE", format = Message.Format.MESSAGE_FORMAT)
-   JMSException invalidClientAcknowledgeMode();
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-rest/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml
index e567267..4e2772d 100644
--- a/activemq-rest/pom.xml
+++ b/activemq-rest/pom.xml
@@ -38,6 +38,9 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-server/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml
index 06909b0..18bbf8a 100644
--- a/activemq-server/pom.xml
+++ b/activemq-server/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
index ef2e810..48e51a7 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/server/ActiveMQMessageBundle.java
@@ -22,7 +22,6 @@ import org.apache.activemq.api.core.ActiveMQConnectionTimedOutException;
 import org.apache.activemq.api.core.ActiveMQDisconnectedException;
 import org.apache.activemq.api.core.ActiveMQDuplicateMetaDataException;
 import org.apache.activemq.api.core.ActiveMQException;
-import org.apache.activemq.api.core.ActiveMQIOErrorException;
 import org.apache.activemq.api.core.ActiveMQIllegalStateException;
 import org.apache.activemq.api.core.ActiveMQIncompatibleClientServerException;
 import org.apache.activemq.api.core.ActiveMQInternalErrorException;
@@ -67,7 +66,7 @@ public interface ActiveMQMessageBundle
    @Message(id = 119002, value = "Thread {0} name = {1} id = {2} group = {3}", format = Message.Format.MESSAGE_FORMAT)
    String threadDump(Thread key, String name, Long id, ThreadGroup threadGroup);
 
-   @Message(id = 119003, value = "End Thread dump", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119003, value = "End Thread dump")
    String endThreadDump();
 
    @Message(id = 119004, value = "Information about server {0}\nCluster Connection:{1}", format = Message.Format.MESSAGE_FORMAT)
@@ -76,22 +75,22 @@ public interface ActiveMQMessageBundle
    @Message(id = 119005, value = "connections for {0} closed by management", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQInternalErrorException connectionsClosedByManagement(String ipAddress);
 
-   @Message(id = 119006, value = "journals are not JournalImpl. You can''t set a replicator!", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119006, value = "journals are not JournalImpl. You can''t set a replicator!")
    ActiveMQInternalErrorException notJournalImpl();
 
-   @Message(id = 119007, value = "unhandled error during replication", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119007, value = "unhandled error during replication")
    ActiveMQInternalErrorException replicationUnhandledError(@Cause Exception e);
 
-   @Message(id = 119008, value = "Live Node contains more journals than the backup node. Probably a version match error", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119008, value = "Live Node contains more journals than the backup node. Probably a version match error")
    ActiveMQInternalErrorException replicationTooManyJournals();
 
    @Message(id = 119009, value = "Unhandled file type {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQInternalErrorException replicationUnhandledFileType(ReplicationSyncFileMessage.FileType fileType);
 
-   @Message(id = 119010, value = "Remote Backup can not be up-to-date!", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119010, value = "Remote Backup can not be up-to-date!")
    ActiveMQInternalErrorException replicationBackupUpToDate();
 
-   @Message(id = 119011, value = "unhandled data type!", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119011, value = "unhandled data type!")
    ActiveMQInternalErrorException replicationUnhandledDataType();
 
    @Message(id = 119012, value = "No binding for divert {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -109,12 +108,6 @@ public interface ActiveMQMessageBundle
                " The connection will now be closed.", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQConnectionTimedOutException clientExited(String remoteAddress);
 
-   @Message(id = 119015, value = "Timeout on waiting I/O completion", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQIOErrorException ioTimeout();
-
-   @Message(id = 119016, value = "queue {0} has been removed cannot deliver message, queues should not be removed when grouping is used", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQNonExistentQueueException groupingQueueRemoved(SimpleString chosenClusterName);
-
    @Message(id = 119017, value = "Queue {0} does not exist", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQNonExistentQueueException noSuchQueue(SimpleString queueName);
 
@@ -127,22 +120,22 @@ public interface ActiveMQMessageBundle
    @Message(id = 119020, value = "Invalid filter: {0}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQInvalidFilterExpressionException invalidFilter(@Cause Throwable e, SimpleString filter);
 
-   @Message(id = 119021, value = "MessageId was not assigned to Message", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119021, value = "MessageId was not assigned to Message")
    ActiveMQIllegalStateException messageIdNotAssigned();
 
-   @Message(id = 119022, value = "Cannot compare journals if not in sync!", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119022, value = "Cannot compare journals if not in sync!")
    ActiveMQIllegalStateException journalsNotInSync();
 
-   @Message(id = 119023, value = "Connected server is not a backup server", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119023, value = "Connected server is not a backup server")
    ActiveMQIllegalStateException serverNotBackupServer();
 
-   @Message(id = 119024, value = "Backup replication server is already connected to another server", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119024, value = "Backup replication server is already connected to another server")
    ActiveMQIllegalStateException alreadyHaveReplicationServer();
 
    @Message(id = 119025, value = "Cannot delete queue {0} on binding {1} - it has consumers = {2}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIllegalStateException cannotDeleteQueue(SimpleString name, SimpleString queueName, String s);
 
-   @Message(id = 119026, value = "Backup Server was not yet in sync with live", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119026, value = "Backup Server was not yet in sync with live")
    ActiveMQIllegalStateException backupServerNotInSync();
 
    @Message(id = 119027, value = "Could not find reference on consumer ID={0}, messageId = {1} queue = {2}", format = Message.Format.MESSAGE_FORMAT)
@@ -151,10 +144,10 @@ public interface ActiveMQMessageBundle
    @Message(id = 119028, value = "Consumer {0} doesn''t exist on the server", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIllegalStateException consumerDoesntExist(long consumerID);
 
-   @Message(id = 119029, value = "No address configured on the Server''s Session", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119029, value = "No address configured on the Server''s Session")
    ActiveMQIllegalStateException noAddress();
 
-   @Message(id = 119030, value = "large-message not initialized on server", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119030, value = "large-message not initialized on server")
    ActiveMQIllegalStateException largeMessageNotInitialised();
 
    @Message(id = 119031, value = "Unable to validate user: {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -163,10 +156,10 @@ public interface ActiveMQMessageBundle
    @Message(id = 119032, value = "User: {0} does not have permission=''{1}'' on address {2}", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQSecurityException userNoPermissions(String username, CheckType checkType, String saddress);
 
-   @Message(id = 119033, value = "Server and client versions incompatible", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119033, value = "Server and client versions incompatible")
    ActiveMQIncompatibleClientServerException incompatibleClientServer();
 
-   @Message(id = 119034, value = "Server not started", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119034, value = "Server not started")
    ActiveMQSessionCreationException serverNotStarted();
 
    @Message(id = 119035, value = "Metadata {0}={1} had been set already", format = Message.Format.MESSAGE_FORMAT)
@@ -175,9 +168,6 @@ public interface ActiveMQMessageBundle
    @Message(id = 119036, value = "Invalid type: {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException invalidType(Object type);
 
-   @Message(id = 119037, value = "retry interval must be positive, was {0}", format = Message.Format.MESSAGE_FORMAT)
-   IllegalArgumentException invalidRetryInterval(Long size);
-
    @Message(id = 119038, value = "{0} must neither be null nor empty", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException emptyOrNull(String name);
 
@@ -214,7 +204,7 @@ public interface ActiveMQMessageBundle
    @Message(id = 119049, value = "No queue found for {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException noQueueFound(String otherQueueName);
 
-   @Message(id = 119050, value = "Only NIO and AsyncIO are supported journals", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119050, value = "Only NIO and AsyncIO are supported journals")
    IllegalArgumentException invalidJournal();
 
    @Message(id = 119051, value = "Invalid journal type {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -223,28 +213,25 @@ public interface ActiveMQMessageBundle
    @Message(id = 119052, value = "Directory {0} does not exist and cannot be created", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException cannotCreateDir(String dir);
 
-   @Message(id = 119053, value = "Invalid index {0}", format = Message.Format.MESSAGE_FORMAT)
-   IllegalArgumentException invalidIndex(Integer index);
-
-   @Message(id = 119054, value = "Cannot convert to int", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119054, value = "Cannot convert to int")
    IllegalArgumentException cannotConvertToInt();
 
-   @Message(id = 119055, value = "Routing name is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119055, value = "Routing name is null")
    IllegalArgumentException routeNameIsNull();
 
-   @Message(id = 119056, value = "Cluster name is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119056, value = "Cluster name is null")
    IllegalArgumentException clusterNameIsNull();
 
-   @Message(id = 119057, value = "Address is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119057, value = "Address is null")
    IllegalArgumentException addressIsNull();
 
-   @Message(id = 119058, value = "Binding type not specified", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119058, value = "Binding type not specified")
    IllegalArgumentException bindingTypeNotSpecified();
 
-   @Message(id = 119059, value = "Binding ID is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119059, value = "Binding ID is null")
    IllegalArgumentException bindingIdNotSpecified();
 
-   @Message(id = 119060, value = "Distance is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119060, value = "Distance is null")
    IllegalArgumentException distancenotSpecified();
 
    @Message(id = 119061, value = "Connection already exists with id {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -259,10 +246,10 @@ public interface ActiveMQMessageBundle
    @Message(id = 119064, value = "Unknown protocol {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException unknownProtocol(String protocol);
 
-   @Message(id = 119065, value = "node id is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119065, value = "node id is null")
    IllegalArgumentException nodeIdNull();
 
-   @Message(id = 119066, value = "Queue name is null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119066, value = "Queue name is null")
    IllegalArgumentException queueNameIsNull();
 
    @Message(id = 119067, value = "Cannot find resource with name {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -274,16 +261,16 @@ public interface ActiveMQMessageBundle
    @Message(id = 119069, value = "no operation {0}/{1}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException noOperation(String operation, Integer length);
 
-   @Message(id = 119070, value = "match can not be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119070, value = "match can not be null")
    IllegalArgumentException nullMatch();
 
-   @Message(id = 119071, value = "# can only be at end of match", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119071, value = "# can only be at end of match")
    IllegalArgumentException invalidMatch();
 
-   @Message(id = 119072, value = "User cannot be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119072, value = "User cannot be null")
    IllegalArgumentException nullUser();
 
-   @Message(id = 119073, value = "Password cannot be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119073, value = "Password cannot be null")
    IllegalArgumentException nullPassword();
 
    @Message(id = 119074, value = "Error instantiating transformer class {0}", format = Message.Format.MESSAGE_FORMAT)
@@ -316,7 +303,7 @@ public interface ActiveMQMessageBundle
    @Message(id = 119079, value = "No session found with {0}={1}", format = Message.Format.MESSAGE_FORMAT)
    String destroyConnectionWithSessionMetadataNoSessionFound(String key, String value);
 
-   @Message(id = 119080, value = "Invalid Page IO, PagingManager was stopped or closed", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119080, value = "Invalid Page IO, PagingManager was stopped or closed")
    ActiveMQIllegalStateException invalidPageIO();
 
    @Message(id = 119081, value = "No Discovery Group configuration named {0} found", format = Message.Format.MESSAGE_FORMAT)
@@ -349,15 +336,12 @@ public interface ActiveMQMessageBundle
    @Message(id = 119102, value = "Address \"{0}\" is full.", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQAddressFullException addressIsFull(String addressName);
 
-   @Message(id = 119103, value = "No Connectors or Discovery Groups configured for Scale Down", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119103, value = "No Connectors or Discovery Groups configured for Scale Down")
    ActiveMQException noConfigurationFoundForScaleDown();
 
-   @Message(id = 119104, value = "Server is stopping. Message grouping not allowed", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 119104, value = "Server is stopping. Message grouping not allowed")
    ActiveMQException groupWhileStopping();
 
-   @Message(id = 119105, value = "Server will not accept create session request since scale down has not occurred", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQSessionCreationException sessionNotFailedOver();
-
    @Message(id = 119106, value = "Invalid slow consumer policy type {0}", format = Message.Format.MESSAGE_FORMAT)
    IllegalArgumentException invalidSlowConsumerPolicyType(String val);
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-service-extensions/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-service-extensions/pom.xml b/activemq-service-extensions/pom.xml
index da50e32..e305dca 100644
--- a/activemq-service-extensions/pom.xml
+++ b/activemq-service-extensions/pom.xml
@@ -45,6 +45,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.apache.geronimo.specs</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/activemq-tools/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml
index 11bfd13..99c083a 100644
--- a/activemq-tools/pom.xml
+++ b/activemq-tools/pom.xml
@@ -35,6 +35,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-aerogear-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index 8f6a20a..d109a9d 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -36,6 +36,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
----------------------------------------------------------------------
diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
index c5b7877..945e484 100644
--- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
+++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/integration/aerogear/ActiveMQAeroGearBundle.java
@@ -33,13 +33,13 @@ public interface ActiveMQAeroGearBundle
 {
    ActiveMQAeroGearBundle BUNDLE = Messages.getBundle(ActiveMQAeroGearBundle.class);
 
-   @Message(id = 239000, value = "endpoint can not be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 239000, value = "endpoint can not be null")
    ActiveMQIllegalStateException endpointNull();
 
-   @Message(id = 239001, value = "application-id can not be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 239001, value = "application-id can not be null")
    ActiveMQIllegalStateException applicationIdNull();
 
-   @Message(id = 239002, value = "master-secret can not be null", format = Message.Format.MESSAGE_FORMAT)
+   @Message(id = 239002, value = "master-secret can not be null")
    ActiveMQIllegalStateException masterSecretNull();
 
    @Message(id = 239003, value = "{0}: queue {1} not found", format = Message.Format.MESSAGE_FORMAT)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-spring-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index 576e477..4f03b08 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -37,6 +37,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
 
       <!--

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/integration/activemq-vertx-integration/pom.xml
----------------------------------------------------------------------
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index 2d64717..ae81e1e 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -76,10 +76,12 @@
   </repositories>
 
   <dependencies>
-          <dependency>
-         <groupId>org.jboss.logging</groupId>
-         <artifactId>jboss-logging-processor</artifactId>
-      </dependency>
+     <dependency>
+        <groupId>org.jboss.logging</groupId>
+        <artifactId>jboss-logging-processor</artifactId>
+        <scope>provided</scope>
+        <optional>true</optional>
+     </dependency>
 
       <!--
           JBoss Logging

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc8d53b..4352960 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,10 +200,18 @@
          <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging-processor</artifactId>
-            <version>1.2.1.Final</version>
-            <scope>compile</scope>
+            <version>2.0.0.Alpha1</version>
+            <optional>true</optional>
             <!-- License: LGPL-->
          </dependency>
+         <dependency>
+            <groupId>org.jboss.logging</groupId>
+            <artifactId>jboss-logging-annotations</artifactId>
+            <version>2.0.0.Alpha1</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+            <!-- License: Apache 2.0-->
+         </dependency>
          <!--needed to compile the logging jar-->
          <dependency>
             <groupId>log4j</groupId>
@@ -594,7 +602,7 @@
          <plugins>
             <plugin>
                <groupId>org.codehaus.mojo</groupId>
-               <artifactId>javacc-maven-plugin</artifactId>
+                  <artifactId>javacc-maven-plugin</artifactId>
                <version>2.6</version>
                <executions>
                   <execution>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index b439ae8..c6c5bf0 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -155,6 +155,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/integration-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index d1d6b36..6eec0ff 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -137,6 +137,8 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/jms-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 3771e8c..48b8507 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -105,6 +105,9 @@
       <dependency>
          <groupId>org.jboss.logging</groupId>
          <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+
       </dependency>
       <dependency>
          <groupId>org.jboss.logging</groupId>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/e065d25b/tests/unit-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 7b87b1a..9b2bd95 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -78,10 +78,12 @@
          <groupId>junit</groupId>
          <artifactId>junit</artifactId>
       </dependency>
-       <dependency>
-           <groupId>org.jboss.logging</groupId>
-           <artifactId>jboss-logging-processor</artifactId>
-       </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
        <!--
            JBoss Logging
        -->


Mime
View raw message