From a01d6077ffa148f89149f5a6573edb0260e53a0f Mon Sep 17 00:00:00 2001
From: Nguyen Van Nghi <nguyen.van.nghi.private@exoplatform.com>
Date: Fri, 27 Feb 2015 10:01:39 +0700
Subject: [PATCH 1/5] format the xml

---
 pom.xml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/pom.xml b/pom.xml
index 82df624..2e9a853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,31 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
+  <modelVersion>4.0.0</modelVersion>
   <groupId>co.uk.bugtrap</groupId>
   <artifactId>JMeterWebSocketSampler</artifactId>
   <version>1.0.2-SNAPSHOT</version>
   <packaging>jar</packaging>
-
   <name>JMeterWebSocketSampler</name>
   <url>http://maven.apache.org</url>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.3.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <properties>
+    <project.build.sourceEncoding>
+    UTF-8</project.build.sourceEncoding>
   </properties>
-
   <dependencies>
     <dependency>
       <groupId>junit</groupId>

From 1d4adf2de8fc1efc1822f12966e04f19a9d3f2c9 Mon Sep 17 00:00:00 2001
From: Nguyen Van Nghi <nguyen.van.nghi.private@exoplatform.com>
Date: Fri, 27 Feb 2015 10:03:14 +0700
Subject: [PATCH 2/5] use maven-shade-plugin to embed depedencies

---
 pom.xml | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2e9a853..dd34d83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,43 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           <target>1.7</target>
         </configuration>
       </plugin>
+      <!--plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+            <outputFile>target/${project.name}-dist-${project.version}.jar</outputFile>
+          
+          <descriptorRefs>
+            <descriptorRef>jar-with-dependencies</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+
+            </plugin-->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.0</version>
+        <configuration>
+          <outputFile>
+          target/${project.name}-dist-${project.version}.jar</outputFile>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   <properties>

From b72332094dc414e0480d8d259f556c418b60bd9b Mon Sep 17 00:00:00 2001
From: Nguyen Van Nghi <nguyen.van.nghi.private@exoplatform.com>
Date: Fri, 27 Feb 2015 10:05:05 +0700
Subject: [PATCH 3/5] use maven-shade-plugin to embed depedencies, add
 <scope>provided</scope> to ignore the dependecies

---
 pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dd34d83..95782a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
-      <scope>test</scope>
+      <!--scope>test</scope-->
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
@@ -80,16 +81,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter</artifactId>
       <version>2.10</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter_core</artifactId>
       <version>2.10</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter_http</artifactId>
       <version>2.10</version>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

From 6c05967dcca833a465e30085b4b801226d0da7b5 Mon Sep 17 00:00:00 2001
From: Nguyen Van Nghi <nguyen.van.nghi.private@exoplatform.com>
Date: Fri, 27 Feb 2015 10:06:29 +0700
Subject: [PATCH 4/5] use org.eclipse.jetty.websocket 9.2.7.v20150116 to avoid
 memory leak

---
 pom.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 95782a8..206ae32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,25 +74,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-client</artifactId>
-      <version>9.1.1.v20140108</version>
+      <version>9.2.7.v20150116</version>
       <classifier>hybrid</classifier>
+      <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter</artifactId>
-      <version>2.10</version>
+      <version>2.12</version>
+      <type>jar</type>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter_core</artifactId>
-      <version>2.10</version>
+      <version>2.12</version>
+      <type>jar</type>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.jmeter</groupId>
       <artifactId>ApacheJMeter_http</artifactId>
-      <version>2.10</version>
+      <version>2.12</version>
+      <type>jar</type>
       <scope>provided</scope>
     </dependency>
   </dependencies>

From 3b8de2a489e2811827eec053ef1fb8715c234012 Mon Sep 17 00:00:00 2001
From: Nguyen Van Nghi <nguyen.van.nghi.private@exoplatform.com>
Date: Fri, 27 Feb 2015 10:23:42 +0700
Subject: [PATCH 5/5] how to build

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 9ea4d13..2a83ffa 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,7 @@ JMeter - WebSocket Sampler
 Compiled binary can be downloaded from the Releases.
 
 Please have a look at the Wiki pages for instructions on how to install the plug-in.
+
+How to build
+======
+mvn clean install
\ No newline at end of file