You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by yu...@apache.org on 2017/03/15 14:09:16 UTC
[38/50] [abbrv] incubator-rocketmq-externals git commit: Remove
commons-lang dependency
Remove commons-lang dependency
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/commit/b77cfdc0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/tree/b77cfdc0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/diff/b77cfdc0
Branch: refs/heads/jms-dev-1.1.0
Commit: b77cfdc06857dd93fc9fa4357040521ddafcc92f
Parents: f28dffe
Author: zhangke <zh...@qq.com>
Authored: Thu Mar 2 19:20:48 2017 +0800
Committer: zhangke <zh...@qq.com>
Committed: Thu Mar 2 19:20:48 2017 +0800
----------------------------------------------------------------------
pom.xml | 6 ------
.../java/org/apache/rocketmq/jms/DeliverMessageService.java | 2 +-
src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java | 6 +++---
src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java | 2 +-
src/main/java/org/apache/rocketmq/jms/RocketMQSession.java | 2 +-
.../java/org/apache/rocketmq/jms/msg/AbstractJMSMessage.java | 2 +-
src/main/java/org/apache/rocketmq/jms/msg/JMSMapMessage.java | 2 +-
.../org/apache/rocketmq/jms/msg/serialize/ObjectSerialize.java | 2 +-
src/main/java/org/apache/rocketmq/jms/support/JMSUtils.java | 4 ++--
.../apache/rocketmq/jms/integration/source/RocketMQAdmin.java | 2 +-
.../jms/integration/source/support/TimeLimitAssert.java | 2 +-
.../jms/integration/test/listener/SimpleTextListenerTest.java | 2 +-
.../java/org/apache/rocketmq/jms/msg/JMSObjectMessageTest.java | 2 +-
13 files changed, 15 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2b5ce14..66ec546 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,12 +61,6 @@
<!--<artifactId>guava</artifactId>-->
<!--<version>18.0</version>-->
<!--</dependency>-->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.6</version>
- </dependency>
-
<!--test-->
<dependency>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java b/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java
index 1043f5d..a534bd3 100644
--- a/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java
+++ b/src/main/java/org/apache/rocketmq/jms/DeliverMessageService.java
@@ -32,7 +32,7 @@ import javax.jms.JMSException;
import javax.jms.JMSRuntimeException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.rocketmq.client.ClientConfig;
import org.apache.rocketmq.client.consumer.DefaultMQPullConsumer;
import org.apache.rocketmq.client.consumer.PullResult;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java b/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java
index e32a382..1d34500 100644
--- a/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java
+++ b/src/main/java/org/apache/rocketmq/jms/RocketMQConnection.java
@@ -30,7 +30,7 @@ import javax.jms.JMSRuntimeException;
import javax.jms.ServerSessionPool;
import javax.jms.Session;
import javax.jms.Topic;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.rocketmq.client.ClientConfig;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.client.impl.MQClientManager;
@@ -41,8 +41,8 @@ import org.slf4j.LoggerFactory;
import static java.lang.String.format;
import static javax.jms.Session.AUTO_ACKNOWLEDGE;
import static javax.jms.Session.SESSION_TRANSACTED;
-import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.apache.commons.lang.exception.ExceptionUtils.getStackTrace;
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace;
public class RocketMQConnection implements Connection {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java b/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java
index f5aa2d4..9c8e1d0 100644
--- a/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java
+++ b/src/main/java/org/apache/rocketmq/jms/RocketMQProducer.java
@@ -38,7 +38,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.lang.String.format;
-import static org.apache.commons.lang.exception.ExceptionUtils.getStackTrace;
+import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace;
import static org.apache.rocketmq.jms.msg.enums.JMSHeaderEnum.JMS_DELIVERY_MODE_DEFAULT_VALUE;
import static org.apache.rocketmq.jms.msg.enums.JMSHeaderEnum.JMS_DELIVERY_TIME_DEFAULT_VALUE;
import static org.apache.rocketmq.jms.msg.enums.JMSHeaderEnum.JMS_PRIORITY_DEFAULT_VALUE;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java b/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java
index 583b151..cbf800a 100644
--- a/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java
+++ b/src/main/java/org/apache/rocketmq/jms/RocketMQSession.java
@@ -41,7 +41,7 @@ import javax.jms.TemporaryTopic;
import javax.jms.TextMessage;
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.rocketmq.client.exception.MQBrokerException;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.protocol.body.GroupList;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/msg/AbstractJMSMessage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/msg/AbstractJMSMessage.java b/src/main/java/org/apache/rocketmq/jms/msg/AbstractJMSMessage.java
index b629024..6f14f5e 100644
--- a/src/main/java/org/apache/rocketmq/jms/msg/AbstractJMSMessage.java
+++ b/src/main/java/org/apache/rocketmq/jms/msg/AbstractJMSMessage.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.MessageNotWriteableException;
-import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.rocketmq.jms.msg.enums.JMSHeaderEnum;
import org.apache.rocketmq.jms.support.JMSUtils;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/msg/JMSMapMessage.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/msg/JMSMapMessage.java b/src/main/java/org/apache/rocketmq/jms/msg/JMSMapMessage.java
index dddfb58..3524d50 100644
--- a/src/main/java/org/apache/rocketmq/jms/msg/JMSMapMessage.java
+++ b/src/main/java/org/apache/rocketmq/jms/msg/JMSMapMessage.java
@@ -25,7 +25,7 @@ import javax.jms.JMSException;
import javax.jms.MapMessage;
import javax.jms.MessageFormatException;
import javax.jms.MessageNotWriteableException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.rocketmq.jms.msg.serialize.MapSerialize;
import static java.lang.String.format;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/msg/serialize/ObjectSerialize.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/msg/serialize/ObjectSerialize.java b/src/main/java/org/apache/rocketmq/jms/msg/serialize/ObjectSerialize.java
index 5e72955..a685808 100644
--- a/src/main/java/org/apache/rocketmq/jms/msg/serialize/ObjectSerialize.java
+++ b/src/main/java/org/apache/rocketmq/jms/msg/serialize/ObjectSerialize.java
@@ -24,7 +24,7 @@ import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import javax.jms.JMSException;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
public class ObjectSerialize implements Serialize<Object> {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/main/java/org/apache/rocketmq/jms/support/JMSUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/rocketmq/jms/support/JMSUtils.java b/src/main/java/org/apache/rocketmq/jms/support/JMSUtils.java
index 3558167..67c54e9 100644
--- a/src/main/java/org/apache/rocketmq/jms/support/JMSUtils.java
+++ b/src/main/java/org/apache/rocketmq/jms/support/JMSUtils.java
@@ -25,8 +25,8 @@ import javax.jms.JMSException;
import javax.jms.JMSRuntimeException;
import javax.jms.Queue;
import javax.jms.Topic;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.rocketmq.jms.RocketMQConsumer;
public class JMSUtils {
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/test/java/org/apache/rocketmq/jms/integration/source/RocketMQAdmin.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/rocketmq/jms/integration/source/RocketMQAdmin.java b/src/test/java/org/apache/rocketmq/jms/integration/source/RocketMQAdmin.java
index 071dd5f..0561dd9 100644
--- a/src/test/java/org/apache/rocketmq/jms/integration/source/RocketMQAdmin.java
+++ b/src/test/java/org/apache/rocketmq/jms/integration/source/RocketMQAdmin.java
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.HashSet;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.common.TopicConfig;
import org.apache.rocketmq.tools.admin.DefaultMQAdminExt;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/test/java/org/apache/rocketmq/jms/integration/source/support/TimeLimitAssert.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/rocketmq/jms/integration/source/support/TimeLimitAssert.java b/src/test/java/org/apache/rocketmq/jms/integration/source/support/TimeLimitAssert.java
index e03c6c9..0417b58 100644
--- a/src/test/java/org/apache/rocketmq/jms/integration/source/support/TimeLimitAssert.java
+++ b/src/test/java/org/apache/rocketmq/jms/integration/source/support/TimeLimitAssert.java
@@ -17,7 +17,7 @@
package org.apache.rocketmq.jms.integration.source.support;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/test/java/org/apache/rocketmq/jms/integration/test/listener/SimpleTextListenerTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/rocketmq/jms/integration/test/listener/SimpleTextListenerTest.java b/src/test/java/org/apache/rocketmq/jms/integration/test/listener/SimpleTextListenerTest.java
index 920a49d..528a42b 100644
--- a/src/test/java/org/apache/rocketmq/jms/integration/test/listener/SimpleTextListenerTest.java
+++ b/src/test/java/org/apache/rocketmq/jms/integration/test/listener/SimpleTextListenerTest.java
@@ -17,7 +17,7 @@
package org.apache.rocketmq.jms.integration.test.listener;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import org.apache.rocketmq.jms.integration.source.AppConfig;
import org.apache.rocketmq.jms.integration.source.SimpleTextListener;
import org.apache.rocketmq.jms.integration.source.support.ConditionMatcher;
http://git-wip-us.apache.org/repos/asf/incubator-rocketmq-externals/blob/b77cfdc0/src/test/java/org/apache/rocketmq/jms/msg/JMSObjectMessageTest.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/rocketmq/jms/msg/JMSObjectMessageTest.java b/src/test/java/org/apache/rocketmq/jms/msg/JMSObjectMessageTest.java
index 63c03ae..82d0165 100644
--- a/src/test/java/org/apache/rocketmq/jms/msg/JMSObjectMessageTest.java
+++ b/src/test/java/org/apache/rocketmq/jms/msg/JMSObjectMessageTest.java
@@ -18,7 +18,7 @@
package org.apache.rocketmq.jms.msg;
import java.io.Serializable;
-import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.EqualsBuilder;
import org.junit.Test;
import static org.hamcrest.MatcherAssert.assertThat;