From 5691bee10e823af49781150c4923f52dfd7d7151 Mon Sep 17 00:00:00 2001
From: Chaein Jung <cj329@cornell.edu>
Date: Wed, 29 Jul 2015 15:15:01 +0900
Subject: [PATCH] Update pom.xml to add jetty

---
 plugins/pom.xml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/pom.xml b/plugins/pom.xml
index 271505c3e4948..a6737dde6fd70 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -25,11 +25,8 @@
         <module>thrift</module>
         <module>user</module>
         <module>arcus</module>
-<<<<<<< HEAD
-        <module>jetty</module>
-=======
         <module>google-httpclient</module>
->>>>>>> upstream/master
+        <module>jetty</module>
     </modules>
 
     <dependencies>
@@ -100,11 +97,12 @@
         </dependency>
         <dependency>
             <groupId>com.navercorp.pinpoint</groupId>
-<<<<<<< HEAD
-            <artifactId>pinpoint-jetty-plugin</artifactId>
-=======
             <artifactId>pinpoint-google-httpclient-plugin</artifactId>
->>>>>>> upstream/master
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.navercorp.pinpoint</groupId>
+            <artifactId>pinpoint-jetty-plugin</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>