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/09/06 12:04:24 UTC

svn commit: r1622839 - in /jmeter/trunk: ./ lib/ licenses/bin/ res/maven/

Author: pmouawad
Date: Sat Sep  6 10:04:23 2014
New Revision: 1622839

URL: http://svn.apache.org/r1622839
Log:
Upgrade to jodd-3.6

Added:
    jmeter/trunk/licenses/bin/jodd-core-3.6.txt   (contents, props changed)
      - copied, changed from r1622832, jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt
    jmeter/trunk/licenses/bin/jodd-lagarto-3.6.txt   (contents, props changed)
      - copied, changed from r1622832, jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt
    jmeter/trunk/licenses/bin/jodd-log-3.6.txt   (props changed)
      - copied unchanged from r1622832, jmeter/trunk/licenses/bin/jodd-log-3.6.0-BETA2.txt
Removed:
    jmeter/trunk/licenses/bin/jodd-core-3.6.0-BETA2.txt
    jmeter/trunk/licenses/bin/jodd-lagarto-3.6.0-BETA2.txt
    jmeter/trunk/licenses/bin/jodd-log-3.6.0-BETA2.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

Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1622839&r1=1622838&r2=1622839&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Sep  6 10:04:23 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.6.0-BETA2
+jodd-core.version           = 3.6
 jodd-core.jar               = jodd-core-${jodd-core.version}.jar
 jodd-core.loc               = ${maven2.repo}/org/jodd/jodd-core/${jodd-core.version}
-jodd-core.md5               = 75655ff05f3c60c9b6bd4dce0752a28b
+jodd-core.md5               = f63b789531957d2cebbc77b36b0b368b
 
-jodd-lagarto.version        = 3.6.0-BETA2
+jodd-lagarto.version        = 3.6
 jodd-lagarto.jar            = jodd-lagarto-${jodd-lagarto.version}.jar
 jodd-lagarto.loc            = ${maven2.repo}/org/jodd/jodd-lagarto/${jodd-lagarto.version}
-jodd-lagarto.md5            = 2d8b9bfd61d10d504f8628829d47207c
+jodd-lagarto.md5            = e3a9fd7347c5c2c4f295ce2b95f91153
 
-jodd-log.version           = 3.6.0-BETA2
+jodd-log.version           = 3.6
 jodd-log.jar               = jodd-log-${jodd-log.version}.jar
 jodd-log.loc               = ${maven2.repo}/org/jodd/jodd-log/${jodd-log.version}
-jodd-log.md5               = 58a73fa5bca4795ebcdfe6542e965584
+jodd-log.md5               = 34a1f40a92fb1232ce6230f414e12fcf
 
 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=1622839&r1=1622838&r2=1622839&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Sep  6 10:04:23 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.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/jodd-core-3.6.jar"/>
+	<classpathentry kind="lib" path="lib/jodd-lagarto-3.6.jar"/>
+    <classpathentry kind="lib" path="lib/jodd-log-3.6.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"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Sep  6 10:04:23 2014
@@ -29,9 +29,9 @@ httpmime-4.2.6.jar
 jcharts-0.7.5.jar
 jdom-1.1.3.jar
 jms*.jar
-jodd-core-3.6.0-BETA2.jar
-jodd-lagarto-3.6.0-BETA2.jar
-jodd-log-3.6.0-BETA2.jar
+jodd-core-3.6.jar
+jodd-lagarto-3.6.jar
+jodd-log-3.6.jar
 jorphan.jar
 jsoup-1.7.3.jar
 jtidy-r*.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1622839&r1=1622838&r2=1622839&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sat Sep  6 10:04:23 2014
@@ -109,17 +109,17 @@ http://www.jdom.org/downloads/index.html
 - XMLAssertion, JMeterTest ONLY
 - Anakia
 
-jodd-core-3.6.0-BETA2
+jodd-core-3.6
 --------
 http://www.jodd.org/
 - CSS/JQuery like extractor dependency
 
-jodd-lagarto-3.6.0-BETA2
+jodd-lagarto-3.6
 --------
 http://jodd.org/doc/csselly/
 - CSS/JQuery like extractor
 
-jodd-log-3.6.0-BETA2
+jodd-log-3.6
 --------
 http://www.jodd.org/
 - CSS/JQuery like extractor dependency

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

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

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

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

Propchange: jmeter/trunk/licenses/bin/jodd-log-3.6.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=1622839&r1=1622838&r2=1622839&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Sep  6 10:04:23 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.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>
+      <jodd-core.version>3.6</jodd-core.version>
+      <jodd-lagarto.version>3.6</jodd-lagarto.version>
+      <jodd-log.version>3.6</jodd-log.version>
       <jsoup.version>1.7.3</jsoup.version>
       <rhino.version>1.7R4</rhino.version>
       <junit.version>4.11</junit.version>