root
/
jmeter
mirror of https://github.com/apache/jmeter.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Upgrade ph-css to 4.1.1 as it contains fixes we reported: 

https://github.com/phax/ph-css/issues/17
https://github.com/phax/ph-css/issues/18
https://github.com/phax/ph-css/issues/19

git-svn-id: https://svn.apache.org/repos/asf/jmeter/trunk@1740187 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Philippe Mouawad 2016-04-20 20:01:41 +00:00
parent 69116e3145
commit 4ecbb593b7
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE
View File

@ -240,7 +240,7 @@ The following software is provided under the Apache License V 2.0 (as above):
* json-smart-2.2.1.jar * json-smart-2.2.1.jar
* mongo-java-driver-2.11.3.jar * mongo-java-driver-2.11.3.jar
* ph-commons-6.2.4.jar * ph-commons-6.2.4.jar
* ph-css-4.1.0.jar * ph-css-4.1.1.jar
- Software produced outside the ASF which is available under other licenses (not AL 2.0): - Software produced outside the ASF which is available under other licenses (not AL 2.0):
For details, please see the files under: licenses/bin For details, please see the files under: licenses/bin

4
build.properties
View File

@ -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.loc = ${maven2.repo}/org/mongodb/mongo-java-driver/${mongo-java-driver.version}
mongo-java-driver.md5 = 90647a53231eb75715fda30759ff4ff7 mongo-java-driver.md5 = 90647a53231eb75715fda30759ff4ff7
ph-css.version = 4.1.0 ph-css.version = 4.1.1
ph-css.jar = ph-css-${ph-css.version}.jar ph-css.jar = ph-css-${ph-css.version}.jar
ph-css.loc = ${maven2.repo}/com/helger/ph-css/${ph-css.version} ph-css.loc = ${maven2.repo}/com/helger/ph-css/${ph-css.version}
ph-css.md5 = c8913e7877b389c08e85269587217914 ph-css.md5 = 5d64fd5df2fd5790ff3fe1d2bf6603fc
ph-commons.version = 6.2.4 ph-commons.version = 6.2.4
ph-commons.jar = ph-commons-${ph-commons.version}.jar ph-commons.jar = ph-commons-${ph-commons.version}.jar

2
eclipse.classpath
View File

@ -83,7 +83,7 @@
<classpathentry kind="lib" path="lib/logkit-2.0.jar"/> <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/mail-1.5.0-b01.jar"/>
<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/> <classpathentry kind="lib" path="lib/mongo-java-driver-2.11.3.jar"/>
<classpathentry kind="lib" path="lib/ph-css-4.1.0.jar"/> <classpathentry kind="lib" path="lib/ph-css-4.1.1.jar"/>
<classpathentry kind="lib" path="lib/ph-commons-6.2.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/oro-2.0.8.jar"/>
<classpathentry kind="lib" path="lib/rhino-1.7.7.1.jar"/> <classpathentry kind="lib" path="lib/rhino-1.7.7.1.jar"/>

2
lib/aareadme.txt
View File

@ -163,7 +163,7 @@ jsoup-1.8.3
http://www.jsoup.org/ http://www.jsoup.org/
- CSS/JQuery like extractor - CSS/JQuery like extractor
ph-css-4.1.0 ph-css-4.1.1
-------- --------
https://github.com/phax/ph-css https://github.com/phax/ph-css
- CssParser - CssParser

2
res/maven/ApacheJMeter_parent.pom
View File

@ -93,7 +93,7 @@ under the License.
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<logkit.version>2.0</logkit.version> <logkit.version>2.0</logkit.version>
<mongo-java-driver.version>2.11.3</mongo-java-driver.version> <mongo-java-driver.version>2.11.3</mongo-java-driver.version>
<ph-css.version>4.1.0</ph-css.version> <ph-css.version>4.1.1</ph-css.version>
<ph-commons.version>6.2.4</ph-commons.version> <ph-commons.version>6.2.4</ph-commons.version>
<rsyntaxtextarea.version>2.5.8</rsyntaxtextarea.version> <rsyntaxtextarea.version>2.5.8</rsyntaxtextarea.version>
<slf4j-api.version>1.7.13</slf4j-api.version> <slf4j-api.version>1.7.13</slf4j-api.version>