jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1620189 - in /jmeter/trunk: ./ licenses/bin/ res/maven/ xdocs/
Date Sun, 24 Aug 2014 21:18:31 GMT
Author: pmouawad
Date: Sun Aug 24 21:18:30 2014
New Revision: 1620189

URL: http://svn.apache.org/r1620189
Log:
Bug 56772 - Handle IE Conditional comments when parsing embedded resources
Upgrade to Jodd 3.6.0-BETA2 as conditional comments have been introduced in BETA1 (some useful
extra classes like HtmlCCommentExpressionMatcher)
Bugzilla Id: 56772

Added:
    jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt   (contents, props changed)
      - copied, changed from r1613729, jmeter/trunk/licenses/bin/jodd-core-3.5.2.txt
    jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt   (contents, props changed)
      - copied, changed from r1613729, jmeter/trunk/licenses/bin/jodd-lagarto-3.5.2.txt
    jmeter/trunk/licenses/bin/jodd-log-3.6.0-BETA2.txt   (props changed)
      - copied unchanged from r1613729, jmeter/trunk/licenses/bin/jodd-log-3.5.2.txt
Removed:
    jmeter/trunk/licenses/bin/jodd-core-3.5.2.txt
    jmeter/trunk/licenses/bin/jodd-lagarto-3.5.2.txt
    jmeter/trunk/licenses/bin/jodd-log-3.5.2.txt
Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/eclipse.classpath
    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=1620189&r1=1620188&r2=1620189&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Aug 24 21:18:30 2014
@@ -209,20 +209,20 @@ rhino.jar                   = rhino-${rh
 rhino.loc                   = ${maven2.repo}/org/mozilla/rhino/${rhino.version}
 rhino.md5                   = 3850097fb5c9aa1065cc198f1b82dcf1
 
-jodd-core.version           = 3.5.2
+jodd-core.version           = 3.6.0-BETA2
 jodd-core.jar               = jodd-core-${jodd-core.version}.jar
 jodd-core.loc               = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5               = 22c37c2de6e254dff68b787da51e160e
+jodd-core.md5               = 75655ff05f3c60c9b6bd4dce0752a28b
 
-jodd-lagarto.version        = 3.5.2
+jodd-lagarto.version        = 3.6.0-BETA2
 jodd-lagarto.jar            = jodd-lagarto-${jodd-lagarto.version}.jar
 jodd-lagarto.loc            = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5            = 034d5dfe29e9554c84587c3d074a44db
+jodd-lagarto.md5            = 2d8b9bfd61d10d504f8628829d47207c
 
-jodd-log.version           = 3.5.2
+jodd-log.version           = 3.6.0-BETA2
 jodd-log.jar               = jodd-log-${jodd-log.version}.jar
 jodd-log.loc               = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
-jodd-log.md5               = 081f5c9cf3be0f765ea2d1cf035b46c5
+jodd-log.md5               = 58a73fa5bca4795ebcdfe6542e965584
 
 jsoup.version               = 1.7.3
 jsoup.jar                   = jsoup-${jsoup.version}.jar

Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1620189&r1=1620188&r2=1620189&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Aug 24 21:18:30 2014
@@ -71,9 +71,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.5.2.jar"/>
-	<classpathentry kind="lib" path="lib/jodd-lagarto-3.5.2.jar"/>
-    <classpathentry kind="lib" path="lib/jodd-log-3.5.2.jar"/>
+	<classpathentry kind="lib" path="lib/jodd-core-3.6.0-BETA2.jar"/>
+	<classpathentry kind="lib" path="lib/jodd-lagarto-3.6.0-BETA2.jar"/>
+    <classpathentry kind="lib" path="lib/jodd-log-3.6.0-BETA2.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.7.3.jar"/>
 	<classpathentry kind="lib" path="lib/jtidy-r938.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.11.jar"/>

Copied: jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt (from r1613729, jmeter/trunk/licenses/bin/jodd-core-3.5.2.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt?p2=jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt&p1=jmeter/trunk/licenses/bin/jodd-core-3.5.2.txt&r1=1613729&r2=1620189&rev=1620189&view=diff
==============================================================================
    (empty)

Propchange: jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt (from r1613729, jmeter/trunk/licenses/bin/jodd-lagarto-3.5.2.txt)
URL: http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt?p2=jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt&p1=jmeter/trunk/licenses/bin/jodd-lagarto-3.5.2.txt&r1=1613729&r2=1620189&rev=1620189&view=diff
==============================================================================
    (empty)

Propchange: jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jmeter/trunk/licenses/bin/jodd-log-3.6.0-BETA2.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=1620189&r1=1620188&r2=1620189&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Aug 24 21:18:30 2014
@@ -81,9 +81,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.5.2</jodd-core.version>
-      <jodd-lagarto.version>3.5.2</jodd-lagarto.version>
-      <jodd-log.version>3.5.2</jodd-log.version>
+      <jodd-core.version>3.6.0-BETA2</jodd-core.version>
+      <jodd-lagarto.version>3.6.0-BETA2</jodd-lagarto.version>
+      <jodd-log.version>3.6.0-BETA2</jodd-log.version>
       <jsoup.version>1.7.3</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=1620189&r1=1620188&r2=1620189&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Aug 24 21:18:30 2014
@@ -261,7 +261,7 @@ jmeter.gui.action.LookAndFeelCommand: Us
 <li>Updated to xercesImpl 2.11.0 (from 2.9.1)</li>
 <li>Updated to xml-apis 1.4.01 (from 1.3.04)</li>
 <li>Updated to xstream 1.4.7 (from 1.4.4)</li>
-<li>Updated to jodd 3.5.2 (from 3.4.10)</li>
+<li>Updated to jodd 3.6.0-BETA2 (from 3.4.10)</li>
 <li>Updated to rsyntaxtextarea 2.5.3 (from 2.5.1)</li>
 </ul>
 



Mime
View raw message