You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2014/12/28 15:26:14 UTC
svn commit: r1648208 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/
xdocs/
Author: pmouawad
Date: Sun Dec 28 14:26:13 2014
New Revision: 1648208
URL: http://svn.apache.org/r1648208
Log:
Upgrade jodd to 3.6.3
Added:
jmeter/trunk/licenses/bin/jodd-core-3.6.3.txt (contents, props changed)
- copied, changed from r1648200, jmeter/trunk/licenses/bin/jodd-core-3.6.1.txt
jmeter/trunk/licenses/bin/jodd-lagarto-3.6.3.txt (contents, props changed)
- copied, changed from r1648200, jmeter/trunk/licenses/bin/jodd-lagarto-3.6.1.txt
jmeter/trunk/licenses/bin/jodd-log-3.6.3.txt (props changed)
- copied unchanged from r1648200, jmeter/trunk/licenses/bin/jodd-log-3.6.1.txt
Removed:
jmeter/trunk/licenses/bin/jodd-core-3.6.1.txt
jmeter/trunk/licenses/bin/jodd-lagarto-3.6.1.txt
jmeter/trunk/licenses/bin/jodd-log-3.6.1.txt
Modified:
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/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1648208&r1=1648207&r2=1648208&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Dec 28 14:26:13 2014
@@ -219,20 +219,20 @@ rhino.jar = rhino-${rh
rhino.loc = ${maven2.repo}/org/mozilla/rhino/${rhino.version}
rhino.md5 = 3850097fb5c9aa1065cc198f1b82dcf1
-jodd-core.version = 3.6.1
+jodd-core.version = 3.6.3
jodd-core.jar = jodd-core-${jodd-core.version}.jar
jodd-core.loc = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5 = eea63be4290733ad1ff82facf9a743bb
+jodd-core.md5 = 3997100b80c169c378ca759d707d7c04
-jodd-lagarto.version = 3.6.1
+jodd-lagarto.version = 3.6.3
jodd-lagarto.jar = jodd-lagarto-${jodd-lagarto.version}.jar
jodd-lagarto.loc = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5 = d18136b0f0fa04a54514dbdf25841ef2
+jodd-lagarto.md5 = 8fb728b1ed093cd718455157bf1de6fc
-jodd-log.version = 3.6.1
+jodd-log.version = 3.6.3
jodd-log.jar = jodd-log-${jodd-log.version}.jar
jodd-log.loc = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
-jodd-log.md5 = 298a224112c24a565d6f6d93f8f58d8e
+jodd-log.md5 = 104fedf4d751b96c99e2d45ed0f79fd4
jsoup.version = 1.8.1
jsoup.jar = jsoup-${jsoup.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1648208&r1=1648207&r2=1648208&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Dec 28 14:26:13 2014
@@ -73,9 +73,9 @@
<classpathentry kind="lib" path="lib/httpmime-4.2.6.jar"/>
<classpathentry kind="lib" path="lib/jcharts-0.7.5.jar"/>
<classpathentry kind="lib" path="lib/jdom-1.1.3.jar"/>
- <classpathentry kind="lib" path="lib/jodd-core-3.6.1.jar"/>
- <classpathentry kind="lib" path="lib/jodd-lagarto-3.6.1.jar"/>
- <classpathentry kind="lib" path="lib/jodd-log-3.6.1.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-core-3.6.3.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-lagarto-3.6.3.jar"/>
+ <classpathentry kind="lib" path="lib/jodd-log-3.6.3.jar"/>
<classpathentry kind="lib" path="lib/jsoup-1.8.1.jar"/>
<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Dec 28 14:26:13 2014
@@ -31,9 +31,9 @@ httpmime-4.2.6.jar
jcharts-0.7.5.jar
jdom-1.1.3.jar
jms*.jar
-jodd-core-3.6.1.jar
-jodd-lagarto-3.6.1.jar
-jodd-log-3.6.1.jar
+jodd-core-3.6.3.jar
+jodd-lagarto-3.6.3.jar
+jodd-log-3.6.3.jar
jorphan.jar
jsoup-1.8.1.jar
jtidy-r*.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1648208&r1=1648207&r2=1648208&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sun Dec 28 14:26:13 2014
@@ -109,17 +109,17 @@ http://www.jdom.org/downloads/index.html
- XMLAssertion, JMeterTest ONLY
- Anakia
-jodd-core-3.6.1
+jodd-core-3.6.3
--------
http://www.jodd.org/
- CSS/JQuery like extractor dependency
-jodd-lagarto-3.6.1
+jodd-lagarto-3.6.3
--------
http://jodd.org/doc/csselly/
- CSS/JQuery like extractor
-jodd-log-3.6.1
+jodd-log-3.6.3
--------
http://www.jodd.org/
- CSS/JQuery like extractor dependency
Copied: jmeter/trunk/licenses/bin/jodd-core-3.6.3.txt (from r1648200, jmeter/trunk/licenses/bin/jodd-core-3.6.1.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jodd-core-3.6.3.txt?p2=jmeter/trunk/licenses/bin/jodd-core-3.6.3.txt&p1=jmeter/trunk/licenses/bin/jodd-core-3.6.1.txt&r1=1648200&r2=1648208&rev=1648208&view=diff
==============================================================================
(empty)
Propchange: jmeter/trunk/licenses/bin/jodd-core-3.6.3.txt
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jmeter/trunk/licenses/bin/jodd-lagarto-3.6.3.txt (from r1648200, jmeter/trunk/licenses/bin/jodd-lagarto-3.6.1.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jodd-lagarto-3.6.3.txt?p2=jmeter/trunk/licenses/bin/jodd-lagarto-3.6.3.txt&p1=jmeter/trunk/licenses/bin/jodd-lagarto-3.6.1.txt&r1=1648200&r2=1648208&rev=1648208&view=diff
==============================================================================
(empty)
Propchange: jmeter/trunk/licenses/bin/jodd-lagarto-3.6.3.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/licenses/bin/jodd-log-3.6.3.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1648208&r1=1648207&r2=1648208&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Dec 28 14:26:13 2014
@@ -83,9 +83,9 @@ under the License.
<jakarta-oro.version>2.0.8</jakarta-oro.version>
<jcharts.version>0.7.5</jcharts.version>
<jdom.version>1.1.3</jdom.version>
- <jodd-core.version>3.6.1</jodd-core.version>
- <jodd-lagarto.version>3.6.1</jodd-lagarto.version>
- <jodd-log.version>3.6.1</jodd-log.version>
+ <jodd-core.version>3.6.3</jodd-core.version>
+ <jodd-lagarto.version>3.6.3</jodd-lagarto.version>
+ <jodd-log.version>3.6.3</jodd-log.version>
<jsoup.version>1.8.1</jsoup.version>
<rhino.version>1.7R4</rhino.version>
<junit.version>4.11</junit.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1648208&r1=1648207&r2=1648208&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Dec 28 14:26:13 2014
@@ -220,7 +220,7 @@ See <bugzilla>56357</bugzilla> for deta
</ul>
<ch_section>Non-functional changes</ch_section>
<ul>
-<li>Updated to jsoup-1.8.1.jar (from 1.7.3)</li>
+<li>Updated to jsoup-1.8.3.jar (from 1.7.3)</li>
<li><bug>57276</bug>RMIC no longer needed since Java 5</li>
<li><bug>57310</bug>Replace System.getProperty("file.separator") with File.separator throughout (Also "path.separator" with File.pathSeparator)</li>
<li><bug>57389</bug>Fix potential NPE in converters</li>