From 0cdacaf61d44db226ca665d15d039e52c07e2233 Mon Sep 17 00:00:00 2001
From: Philippe Mouawad <pmouawad@apache.org>
Date: Sun, 31 Jul 2016 20:31:31 +0000
Subject: [PATCH] Updated to ph-css 4.1.4 from 4.1.1

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1754685 13f79535-47bb-0310-9956-ffa450edef68
---
 LICENSE                           | 2 +-
 build.properties                  | 4 ++--
 eclipse.classpath                 | 2 +-
 lib/aareadme.txt                  | 2 +-
 res/maven/ApacheJMeter_parent.pom | 2 +-
 xdocs/changes.xml                 | 1 +
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0de794cb7d..0807aac52c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -248,7 +248,7 @@ The following software is provided under the Apache License V 2.0 (as above):
 * json-smart-2.2.1.jar
 * mongo-java-driver-2.11.3.jar
 * ph-commons-6.2.4.jar
-* ph-css-4.1.1.jar
+* ph-css-4.1.4.jar
 
 - Software produced outside the ASF which is available under other licenses (not AL 2.0):
 For details, please see the files under: licenses/bin
diff --git a/build.properties b/build.properties
index d6615c0223..6923b8a030 100644
--- a/build.properties
+++ b/build.properties
@@ -264,10 +264,10 @@ mongo-java-driver.jar       = mongo-java-driver-${mongo-java-driver.version}.jar
 mongo-java-driver.loc       = ${maven2.repo}/org/mongodb/mongo-java-driver/${mongo-java-driver.version}
 mongo-java-driver.md5       = 90647a53231eb75715fda30759ff4ff7
 
-ph-css.version              = 4.1.1
+ph-css.version              = 4.1.4
 ph-css.jar                  = ph-css-${ph-css.version}.jar
 ph-css.loc                  = ${maven2.repo}/com/helger/ph-css/${ph-css.version}
-ph-css.md5                  = 5d64fd5df2fd5790ff3fe1d2bf6603fc
+ph-css.md5                  = efa8de6ffc0f3968fe87adf3ce23ed9b
 
 ph-commons.version          = 6.2.4
 ph-commons.jar              = ph-commons-${ph-commons.version}.jar
diff --git a/eclipse.classpath b/eclipse.classpath
index 69d4996b9e..ef7a0d5c0b 100644
--- a/eclipse.classpath
+++ b/eclipse.classpath
@@ -83,7 +83,7 @@
 	<classpathentry kind="lib" path="lib/logkit-2.0.jar"/>
 	<classpathentry kind="lib" path="lib/mail-1.5.0-b01.jar"/>
 	<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
-	<classpathentry kind="lib" path="lib/ph-css-4.1.1.jar"/>
+	<classpathentry kind="lib" path="lib/ph-css-4.1.4.jar"/>
 	<classpathentry kind="lib" path="lib/ph-commons-6.2.4.jar"/>
 	<classpathentry kind="lib" path="lib/oro-2.0.8.jar"/>
 	<classpathentry kind="lib" path="lib/rhino-1.7.7.1.jar"/>
diff --git a/lib/aareadme.txt b/lib/aareadme.txt
index 92757818bb..ecf9b838db 100644
--- a/lib/aareadme.txt
+++ b/lib/aareadme.txt
@@ -163,7 +163,7 @@ jsoup-1.8.3
 http://www.jsoup.org/
 - CSS/JQuery like extractor
 
-ph-css-4.1.1
+ph-css-4.1.4
 --------
 https://github.com/phax/ph-css
 - CssParser
diff --git a/res/maven/ApacheJMeter_parent.pom b/res/maven/ApacheJMeter_parent.pom
index 2ee9a1dfea..de5281c922 100644
--- a/res/maven/ApacheJMeter_parent.pom
+++ b/res/maven/ApacheJMeter_parent.pom
@@ -93,7 +93,7 @@ under the License.
       <junit.version>4.12</junit.version>
       <logkit.version>2.0</logkit.version>
       <mongo-java-driver.version>2.11.3</mongo-java-driver.version>
-      <ph-css.version>4.1.1</ph-css.version>
+      <ph-css.version>4.1.4</ph-css.version>
       <ph-commons.version>6.2.4</ph-commons.version>
       <rsyntaxtextarea.version>2.5.8</rsyntaxtextarea.version>
       <slf4j-api.version>1.7.13</slf4j-api.version>
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a4276abe7e..145373efd0 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -124,6 +124,7 @@ Summary
 
 <ch_section>Non-functional changes</ch_section>
 <ul>
+    <li>Updated to ph-css 4.1.4 (from 4.1.4)</li>
     <li>Updated to tika-core and tika-parsers 1.13 (from 1.12)</li>
     <li><pr>215</pr>Reduce duplicated code by using the newly added method <code>GuiUtils#cancelEditing</code>.
     Contributed by Benoit Wiart (b.wiart at ubik-ingenierie.com)</li>