Merge pull request #1750 from emeroad/#1749_lib_upgrade

#1749 lib version upgrade
pinpoint-apm · May 10, 2016 · 86672d1 · 86672d1
2 parents 6587d17 + 17a4643
commit 86672d1
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 35 deletions.
diff --git a/collector/pom.xml b/collector/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>12.0.1</version>
+            <version>16.0.1</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>

diff --git a/...tor/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentEventHandlerTest.java b/...tor/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentEventHandlerTest.java
@@ -21,7 +21,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 
 import org.apache.thrift.TBase;
 import org.junit.Before;
@@ -33,7 +33,6 @@
 import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.util.concurrent.MoreExecutors;
 import com.navercorp.pinpoint.collector.cluster.route.ResponseEvent;
 import com.navercorp.pinpoint.collector.dao.AgentEventDao;
 import com.navercorp.pinpoint.collector.receiver.tcp.AgentHandshakePropertyType;
@@ -55,9 +54,9 @@
  */
 @RunWith(MockitoJUnitRunner.class)
 public class AgentEventHandlerTest {
-
+    // FIX guava 19.0.0 update error. MoreExecutors.sameThreadExecutor(); change final class
     @Spy
-    private ExecutorService executor = MoreExecutors.sameThreadExecutor();
+    private Executor executor = new DirectExecutor();
 
     @Mock
     private PinpointServer pinpointServer;

diff --git a/...src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentLifeCycleHandlerTest.java b/...src/test/java/com/navercorp/pinpoint/collector/rpc/handler/AgentLifeCycleHandlerTest.java
@@ -22,7 +22,7 @@
 import java.math.BigInteger;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executor;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -33,7 +33,6 @@
 import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import com.google.common.util.concurrent.MoreExecutors;
 import com.navercorp.pinpoint.collector.dao.AgentLifeCycleDao;
 import com.navercorp.pinpoint.collector.receiver.tcp.AgentHandshakePropertyType;
 import com.navercorp.pinpoint.collector.util.ManagedAgentLifeCycle;
@@ -46,9 +45,9 @@
  */
 @RunWith(MockitoJUnitRunner.class)
 public class AgentLifeCycleHandlerTest {
-
+    // FIX guava 19.0.0 update error. MoreExecutors.sameThreadExecutor(); change final class
     @Spy
-    private ExecutorService executor = MoreExecutors.sameThreadExecutor();
+    private Executor executor = new DirectExecutor();
 
     @Mock
     private PinpointServer pinpointServer;

diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/DirectExecutor.java b/collector/src/test/java/com/navercorp/pinpoint/collector/rpc/handler/DirectExecutor.java
@@ -0,0 +1,13 @@
+package com.navercorp.pinpoint.collector.rpc.handler;
+
+import java.util.concurrent.Executor;
+
+/**
+ * @author Woonduk Kang(emeroad)
+ */
+public class DirectExecutor implements Executor {
+    @Override
+    public void execute(Runnable command) {
+        command.run();
+    }
+}
diff --git a/commons-hbase/pom.xml b/commons-hbase/pom.xml
@@ -137,8 +137,17 @@
                     <artifactId>hsqldb</artifactId>
                     <groupId>hsqldb</groupId>
                 </exclusion>
+                <exclusion>
+                    <artifactId>commons-beanutils-core</artifactId>
+                    <groupId>commons-beanutils</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>16.0.1</version>
+        </dependency>
 
         <dependency>
             <groupId>com.sematext.hbasewd</groupId>

diff --git a/pom.xml b/pom.xml
@@ -64,12 +64,12 @@
         <encoding>UTF-8</encoding>
         <jdk.version>1.6</jdk.version>
         <jdk.home>${env.JAVA_6_HOME}</jdk.home>
-        <slf4j.version>1.7.5</slf4j.version>
+        <slf4j.version>1.7.21</slf4j.version>
         <metrics.version>3.1.2</metrics.version>
-        <spring.version>4.1.8.RELEASE</spring.version>
+        <spring.version>4.1.9.RELEASE</spring.version>
         <jetty.version>8.1.12.v20130726</jetty.version>
         <codehaus.jackson.version>1.9.13</codehaus.jackson.version>
-        <fastxml.jackson.version>2.3.1</fastxml.jackson.version>
+        <fastxml.jackson.version>2.6.6</fastxml.jackson.version>
         <httpcomponents.version>4.3</httpcomponents.version>
         <jedis.version>2.4.2</jedis.version>
         <cloverLicenseLocation>${basedir}/clover.license</cloverLicenseLocation>
@@ -503,7 +503,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.3.2</version>
+                <version>3.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>
@@ -513,7 +513,8 @@
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.1.3</version>
+                <version>1.2</version>
+                <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -556,15 +557,10 @@
                 <version>2.2</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjrt</artifactId>
-                <version>1.6.12</version>
-            </dependency>
             <dependency>
                 <groupId>org.aspectj</groupId>
                 <artifactId>aspectjweaver</artifactId>
-                <version>1.6.12</version>
+                <version>1.8.9</version>
             </dependency>
 
 
@@ -611,7 +607,7 @@
             <dependency>
                 <groupId>org.mockito</groupId>
                 <artifactId>mockito-all</artifactId>
-                <version>1.8.4</version>
+                <version>1.10.19</version>
             </dependency>
             <dependency>
                 <groupId>org.dbunit</groupId>
@@ -662,7 +658,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>17.0</version>
+                <version>19.0</version>
             </dependency>
 
             <dependency>
@@ -705,7 +701,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.6</version>
                     <configuration>
                         <attachClasses>true</attachClasses>
                         <classesClassifier>classes</classesClassifier>
@@ -715,23 +711,23 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.6</version>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
                 <configuration>
                     <encoding>${encoding}</encoding>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>
@@ -747,7 +743,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.17</version>
+                <version>2.19.1</version>
                 <configuration>
                     <excludes>
                         <exclude>**/Mock*</exclude>
@@ -887,7 +883,7 @@
                     <windowTitle>Pinpoint ${project.version} Cross Reference</windowTitle>
                     <docTitle>Pinpoint ${project.version} Cross Reference</docTitle>
                 </configuration>
-                <version>2.3</version>
+                <version>2.5</version>
             </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>

diff --git a/quickstart/testapp/pom.xml b/quickstart/testapp/pom.xml
@@ -149,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <source>${jdk.version}</source>
                     <target>${jdk.version}</target>

diff --git a/test/pom.xml b/test/pom.xml
@@ -79,7 +79,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>18.0</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/web/pom.xml b/web/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>12.0.1</version>
+            <version>16.0.1</version>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
@@ -283,10 +283,6 @@
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjweaver</artifactId>
@@ -303,6 +299,13 @@
             <version>${spring-batch-version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <!-- spring-batch-test dependency -->
+            <groupId>commons-dbcp</groupId>
+            <artifactId>commons-dbcp</artifactId>
+            <version>1.4</version>
+            <scope>test</scope>
+        </dependency>
 
         <!-- for zookeeper test -->
         <dependency>