Author: pmouawad
Date: Sun Feb 4 20:36:18 2018
New Revision: 1823108
URL: http://svn.apache.org/viewvc?rev=1823108&view=rev
Log:
Update to jodd 4.1.4
Added:
jmeter/trunk/licenses/bin/jodd-core-4.1.4.txt
- copied unchanged from r1823105,
jmeter/trunk/licenses/bin/jodd-core-4.1.1.txt
jmeter/trunk/licenses/bin/jodd-lagarto-4.1.4.txt
- copied unchanged from r1823105,
jmeter/trunk/licenses/bin/jodd-lagarto-4.1.1.txt
jmeter/trunk/licenses/bin/jodd-log-4.1.4.txt
- copied unchanged from r1823105,
jmeter/trunk/licenses/bin/jodd-log-4.1.1.txt
jmeter/trunk/licenses/bin/jodd-props-4.1.4.txt
- copied unchanged from r1823105,
jmeter/trunk/licenses/bin/jodd-props-4.1.1.txt
Removed:
jmeter/trunk/licenses/bin/jodd-core-4.1.1.txt
jmeter/trunk/licenses/bin/jodd-lagarto-4.1.1.txt
jmeter/trunk/licenses/bin/jodd-log-4.1.1.txt
jmeter/trunk/licenses/bin/jodd-props-4.1.1.txt
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1823108&r1=1823107&r2=1823108&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Sun Feb 4 20:36:18 2018
@@ -268,10 +268,10 @@ For details, please see the files under:
* jcharts-0.7.5.jar (?)
* jcl-over-slf4j-1.7.25.jar (MIT)
* jsoup-1.11.2.jar (MIT)
-* jodd-core-4.1.1.jar (Simplified BSD)
-* jodd-lagarto-4.1.1.jar (Simplified BSD)
-* jodd-log-4.1.1.jar (Simplified BSD)
-* jodd-props-4.1.1.jar (Simplified BSD)
+* jodd-core-4.1.4.jar (Simplified BSD)
+* jodd-lagarto-4.1.4.jar (Simplified BSD)
+* jodd-log-4.1.4.jar (Simplified BSD)
+* jodd-props-4.1.4.jar (Simplified BSD)
* jtidy-r938.jar (?)
* junit-4.12.jar (BSD)
* rhino-1.7.7.2.jar (MPL 2.0)
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1823108&r1=1823107&r2=1823108&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Feb 4 20:36:18 2018
@@ -220,25 +220,25 @@ rhino.jar = rhino-${rh
rhino.loc = ${maven2.repo}/org/mozilla/rhino/${rhino.version}
rhino.md5 = e0e47c1fe053f70fa6feca20d8c3cb2c
-jodd-core.version = 4.1.1
+jodd-core.version = 4.1.4
jodd-core.jar = jodd-core-${jodd-core.version}.jar
jodd-core.loc =
${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5 = a349b19461e5abac1c97fb05e28d7522
+jodd-core.md5 = 1ab42839ca15f9df2e569f48cc1ce8bf
-jodd-lagarto.version = 4.1.1
+jodd-lagarto.version = 4.1.4
jodd-lagarto.jar = jodd-lagarto-${jodd-lagarto.version}.jar
jodd-lagarto.loc =
${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5 = ca4dc6623f9999075549277e1357212e
+jodd-lagarto.md5 = 93a2318f25da86e997f56e687a61f38d
-jodd-log.version = 4.1.1
+jodd-log.version = 4.1.4
jodd-log.jar = jodd-log-${jodd-log.version}.jar
jodd-log.loc =
${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
-jodd-log.md5 = 35df6c57b38cff0baf2ffe17588ee0e5
+jodd-log.md5 = 436605704ffa02f9aabbcd3a779e8995
-jodd-props.version = 4.1.1
+jodd-props.version = 4.1.4
jodd-props.jar = jodd-props-${jodd-props.version}.jar
jodd-props.loc =
${maven2.repo}/org/jodd/jodd-props/${jodd-props.version}
-jodd-props.md5 = 858cc727751a04be90331da721f8ad1b
+jodd-props.md5 = e7a5017de253a20ce924ff4ce245d33d
json-path.version = 2.4.0
json-path.jar = json-path-${json-path.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1823108&r1=1823107&r2=1823108&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Feb 4 20:36:18 2018
@@ -75,10 +75,10 @@
<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jcl-over-slf4j-1.7.25.jar"/>
- <classpathentry kind="lib" path="lib/jodd-core-4.1.1.jar"/>
- <classpathentry kind="lib" path="lib/jodd-lagarto-4.1.1.jar"/>
- <classpathentry kind="lib" path="lib/jodd-log-4.1.1.jar"/>
- <classpathentry kind="lib" path="lib/jodd-props-4.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-core-4.1.4.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-lagarto-4.1.4.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-log-4.1.4.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-props-4.1.4.jar"/>
<classpathentry kind="lib" path="lib/json-path-2.4.0.jar"/>
<classpathentry kind="lib" path="lib/json-smart-2.3.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.11.2.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Feb 4 20:36:18 2018
@@ -36,10 +36,10 @@ httpmime-4.5.5.jar
jcharts-0.7.5.jar
jcl-over-slf4j-1.7.25.jar
jms*.jar
-jodd-core-4.1.1.jar
-jodd-lagarto-4.1.1.jar
-jodd-log-4.1.1.jar
-jodd-props-4.1.1.jar
+jodd-core-4.1.4.jar
+jodd-lagarto-4.1.4.jar
+jodd-log-4.1.4.jar
+jodd-props-4.1.4.jar
jorphan.jar
json-path-2.4.0.jar
json-smart-2.3.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1823108&r1=1823107&r2=1823108&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Feb 4 20:36:18 2018
@@ -125,22 +125,22 @@ jdom-1.1.3
http://www.jdom.org/downloads/index.html
- Anakia
-jodd-core-4.1.1
+jodd-core-4.1.4
--------
http://www.jodd.org/
- CSS/JQuery like extractor dependency
-jodd-lagarto-4.1.1
+jodd-lagarto-4.1.4
--------
http://jodd.org/doc/csselly/
- CSS/JQuery like extractor
-jodd-log-4.1.1
+jodd-log-4.1.4
--------
http://www.jodd.org/
- CSS/JQuery like extractor dependency
-jodd-props-4.1.1
+jodd-props-4.1.4
--------
http://www.jodd.org/
- used by Report/Dashboard feature properties management
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1823108&r1=1823107&r2=1823108&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Feb 4 20:36:18 2018
@@ -84,10 +84,10 @@ under the License.
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
<jcl-over-slf4j.version>1.7.25</jcl-over-slf4j.version>
- <jodd-core.version>4.1.1</jodd-core.version>
- <jodd-lagarto.version>4.1.1</jodd-lagarto.version>
- <jodd-log.version>4.1.1</jodd-log.version>
- <jodd-props.version>4.1.1</jodd-props.version>
+ <jodd-core.version>4.1.4</jodd-core.version>
+ <jodd-lagarto.version>4.1.4</jodd-lagarto.version>
+ <jodd-log.version>4.1.4</jodd-log.version>
+ <jodd-props.version>4.1.4</jodd-props.version>
<json-path.version>2.4.0</json-path.version>
<json-smart.version>2.3</json-smart.version>
<jsoup.version>1.11.2</jsoup.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1823108&r1=1823107&r2=1823108&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Feb 4 20:36:18 2018
@@ -299,7 +299,7 @@ itself does not have to be edited anymor
<li>Updated to log4j2 2.10.0 (from 2.8.2)</li>
<li>Updated to httpcore 4.4.9 (from 4.4.7)</li>
<li>Updated to httpclient 4.5.5 (from 4.5.3)</li>
- <li>Updated to jodd 4.1.1 (from 3.8.6)</li>
+ <li>Updated to jodd 4.1.4 (from 3.8.6)</li>
<li><bug>61642</bug>Improve FTP test coverage</li>
<li><bug>61641</bug>Improve JMS test coverage</li>
<li><bug>61651</bug>Improve TCP test coverage</li>
