From b15ea001d180ef46731c7ffc71e3b4bddbf60d3c Mon Sep 17 00:00:00 2001
From: arhimondr <andriyrosa@gmail.com>
Date: Mon, 22 Dec 2014 11:44:12 +0200
Subject: [PATCH 1/2] optimize libraries

---
 nevado-jms/pom.xml                            | 50 ++++++++++---------
 .../nevado/jms/NevadoConnectionFactory.java   |  2 +-
 .../nevado/jms/NevadoConnectionMetaData.java  |  2 +-
 .../AmazonAwsSQSConnectorFactory.java         |  2 +-
 .../jms/message/NevadoBytesMessage.java       |  2 +-
 .../nevado/jms/message/NevadoMapMessage.java  |  2 +-
 .../jms/message/NevadoObjectMessage.java      |  2 +-
 .../jms/message/NevadoStreamMessage.java      |  2 +-
 .../nevado/jms/message/NevadoTextMessage.java |  2 +-
 .../jms/performance/PerformanceService.java   |  2 +-
 .../facilities/ConnectionMultiThreadTest.java |  2 +-
 pom.xml                                       | 12 ++---
 12 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/nevado-jms/pom.xml b/nevado-jms/pom.xml
index a80333b..10df569 100644
--- a/nevado-jms/pom.xml
+++ b/nevado-jms/pom.xml
@@ -28,20 +28,15 @@
             <artifactId>commons-codec</artifactId>
             <version>1.8</version>
         </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-        </dependency>
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.1.1</version>
         </dependency>
         <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.5</version>
+          <groupId>org.apache.commons</groupId>
+          <artifactId>commons-lang3</artifactId>
+          <version>3.3</version>
         </dependency>
         <dependency>
             <groupId>com.caucho</groupId>
@@ -53,28 +48,34 @@
             <artifactId>json</artifactId>
             <version>20090211</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.12</version>
-        </dependency>
         <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
             <version>2.2</version>
         </dependency>
 
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-java-sdk-sns</artifactId>
+          <version>${aws.sdk.version}</version>
+        </dependency>
+
+        <dependency>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>aws-java-sdk-sqs</artifactId>
+          <version>${aws.sdk.version}</version>
+        </dependency>
+
+
+
+
+      <!--Test dependencies-->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.amazonaws</groupId>
-            <artifactId>aws-java-sdk</artifactId>
-            <version>1.6.12</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -123,6 +124,7 @@
 
     <properties>
         <spring.version>3.0.5.RELEASE</spring.version>
+        <aws.sdk.version>1.9.13</aws.sdk.version>
     </properties>
 
     <build>
@@ -176,12 +178,12 @@
     <profiles>
         <profile>
             <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
+            <!--<activation>-->
+                <!--<property>-->
+                    <!--<name>performRelease</name>-->
+                    <!--<value>true</value>-->
+                <!--</property>-->
+            <!--</activation>-->
             <build>
                 <plugins>
                     <plugin>
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionFactory.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionFactory.java
index 7ed51cb..e146389 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionFactory.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionFactory.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.skyscreamer.nevado.jms.connector.SQSConnectorFactory;
 import org.skyscreamer.nevado.jms.resource.NevadoReferencableFactory;
 
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionMetaData.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionMetaData.java
index be215ea..6f72f09 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionMetaData.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/NevadoConnectionMetaData.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.skyscreamer.nevado.jms.message.JMSXProperty;
 
 import javax.jms.ConnectionMetaData;
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/connector/amazonaws/AmazonAwsSQSConnectorFactory.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/connector/amazonaws/AmazonAwsSQSConnectorFactory.java
index 26b7df4..333faa4 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/connector/amazonaws/AmazonAwsSQSConnectorFactory.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/connector/amazonaws/AmazonAwsSQSConnectorFactory.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.connector.amazonaws;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.skyscreamer.nevado.jms.connector.AbstractSQSConnectorFactory;
 
 /**
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoBytesMessage.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoBytesMessage.java
index 5f59f29..4f170bc 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoBytesMessage.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoBytesMessage.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.message;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoMapMessage.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoMapMessage.java
index cf0f4f2..e6ce413 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoMapMessage.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoMapMessage.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.message;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.skyscreamer.nevado.jms.util.CharWrapper;
 
 import javax.jms.JMSException;
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoObjectMessage.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoObjectMessage.java
index 369ac0c..141e002 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoObjectMessage.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoObjectMessage.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.message;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.skyscreamer.nevado.jms.util.SerializeUtil;
 
 import javax.jms.JMSException;
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoStreamMessage.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoStreamMessage.java
index 081e540..ebadb9a 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoStreamMessage.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoStreamMessage.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.message;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.skyscreamer.nevado.jms.util.MarshallingSupport;
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoTextMessage.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoTextMessage.java
index 3a9a070..2a19ace 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoTextMessage.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/message/NevadoTextMessage.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.message;
 
-import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
 
 import javax.jms.JMSException;
 import javax.jms.TextMessage;
diff --git a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/performance/PerformanceService.java b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/performance/PerformanceService.java
index 86646cc..0b90081 100644
--- a/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/performance/PerformanceService.java
+++ b/nevado-jms/src/main/java/org/skyscreamer/nevado/jms/performance/PerformanceService.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.performance;
 
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/nevado-jms/src/test/java/org/skyscreamer/nevado/jms/facilities/ConnectionMultiThreadTest.java b/nevado-jms/src/test/java/org/skyscreamer/nevado/jms/facilities/ConnectionMultiThreadTest.java
index 517f8df..597f3bf 100644
--- a/nevado-jms/src/test/java/org/skyscreamer/nevado/jms/facilities/ConnectionMultiThreadTest.java
+++ b/nevado-jms/src/test/java/org/skyscreamer/nevado/jms/facilities/ConnectionMultiThreadTest.java
@@ -1,6 +1,6 @@
 package org.skyscreamer.nevado.jms.facilities;
 
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
 import org.junit.Test;
 import org.skyscreamer.nevado.jms.AbstractJMSTest;
 import org.skyscreamer.nevado.jms.NevadoConnection;
diff --git a/pom.xml b/pom.xml
index 08a2ace..1ac0b86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,12 +119,12 @@
     <profiles>
         <profile>
             <id>release-sign-artifacts</id>
-            <activation>
-                <property>
-                    <name>performRelease</name>
-                    <value>true</value>
-                </property>
-            </activation>
+            <!--<activation>-->
+                <!--<property>-->
+                    <!--<name>performRelease</name>-->
+                    <!--<value>true</value>-->
+                <!--</property>-->
+            <!--</activation>-->
             <build>
                 <plugins>
                     <plugin>

From a0dca1bce6773166eacfb7d636ab67c7e7003fb3 Mon Sep 17 00:00:00 2001
From: arhimondr <andriyrosa@gmail.com>
Date: Mon, 22 Dec 2014 12:13:58 +0200
Subject: [PATCH 2/2] update libraries

---
 nevado-jms/pom.xml | 12 ++++++------
 pom.xml            | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nevado-jms/pom.xml b/nevado-jms/pom.xml
index 10df569..77c65ca 100644
--- a/nevado-jms/pom.xml
+++ b/nevado-jms/pom.xml
@@ -178,12 +178,12 @@
     <profiles>
         <profile>
             <id>release-sign-artifacts</id>
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>performRelease</name>-->
-                    <!--<value>true</value>-->
-                <!--</property>-->
-            <!--</activation>-->
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
diff --git a/pom.xml b/pom.xml
index 1ac0b86..08a2ace 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,12 +119,12 @@
     <profiles>
         <profile>
             <id>release-sign-artifacts</id>
-            <!--<activation>-->
-                <!--<property>-->
-                    <!--<name>performRelease</name>-->
-                    <!--<value>true</value>-->
-                <!--</property>-->
-            <!--</activation>-->
+            <activation>
+                <property>
+                    <name>performRelease</name>
+                    <value>true</value>
+                </property>
+            </activation>
             <build>
                 <plugins>
                     <plugin>