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 2015/02/27 22:09:29 UTC

svn commit: r1662815 - in /jmeter/trunk: build.properties build.xml lib/ lib/aareadme.txt res/maven/ApacheJMeter_parent.pom xdocs/changes.xml

Author: pmouawad
Date: Fri Feb 27 21:09:28 2015
New Revision: 1662815

URL: http://svn.apache.org/r1662815
Log:
Update commons-codec-1.10 from 1.9

Modified:
    jmeter/trunk/build.properties
    jmeter/trunk/build.xml
    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=1662815&r1=1662814&r2=1662815&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Feb 27 21:09:28 2015
@@ -75,10 +75,10 @@ bcpkix.jar                  = bcpkix-jdk
 bcpkix.loc                  = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
 bcpkix.md5                  = cb025ef84fb991e14fdf62f6bef7be53
 
-commons-codec.version       = 1.9
+commons-codec.version       = 1.10
 commons-codec.jar           = commons-codec-${commons-codec.version}.jar
 commons-codec.loc           = ${maven2.repo}/commons-codec/commons-codec/${commons-codec.version}
-commons-codec.md5           = 75615356605c8128013da9e3ac62a249
+commons-codec.md5           = 353cf6a2bdba09595ccfa073b78c7fcb
 
 commons-collections.version = 3.2.1
 commons-collections.jar     = commons-collections-${commons-collections.version}.jar

Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1662815&r1=1662814&r2=1662815&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Fri Feb 27 21:09:28 2015
@@ -370,6 +370,7 @@
     <include name="${lib.dir}/${excalibur-pool-api.jar}"/>
     <include name="${lib.dir}/${excalibur-pool-impl.jar}"/>
     <include name="${lib.dir}/${excalibur-pool-instrumented.jar}"/>
+    <include name="${lib.dir}/${freemarker.jar}"/>
     <include name="${lib.dir}/${htmllexer.jar}"/>
     <include name="${lib.dir}/${htmlparser.jar}"/>
     <include name="${lib.dir}/${httpclient.jar}"/>
@@ -445,6 +446,7 @@
     <pathelement location="${lib.dir}/${excalibur-pool-api.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-pool-impl.jar}"/>
     <pathelement location="${lib.dir}/${excalibur-pool-instrumented.jar}"/>
+  	<pathelement location="${lib.dir}/${freemarker.jar}"/>
     <pathelement location="${lib.dir}/${htmllexer.jar}"/>
     <pathelement location="${lib.dir}/${htmlparser.jar}"/>
     <pathelement location="${lib.dir}/${httpclient.jar}"/>
@@ -2869,6 +2871,7 @@ run JMeter unless all the JMeter jars ar
         <process_jarfile jarname="excalibur-pool-api"/>
         <process_jarfile jarname="excalibur-pool-impl"/>
         <process_jarfile jarname="excalibur-pool-instrumented"/>
+    	<process_jarfile jarname="freemarker"/>
         <process_jarfile jarname="htmllexer"/>
         <process_jarfile jarname="htmlparser"/>
         <process_jarfile jarname="httpclient"/>

Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Feb 27 21:09:28 2015
@@ -4,7 +4,7 @@ avalon-framework-4.1.4.jar
 bsf-2.4.0.jar
 bsh-2.0b5.jar
 bshclient.jar
-commons-codec-1.9.jar
+commons-codec-1.10.jar
 commons-collections-3.2.1.jar
 commons-httpclient-3.1.jar
 commons-io-2.4.jar

Modified: jmeter/trunk/lib/aareadme.txt
URL: http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1662815&r1=1662814&r2=1662815&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Feb 27 21:09:28 2015
@@ -28,7 +28,7 @@ bsh-2.0b5.jar (org.bsh)
 -------------
 - BeanShell test elements
 
-commons-codec-1.9
+commons-codec-1.10
 -----------------
 http://commons.apache.org/downloads/download_codec.cgi
 - used by commons-httpclient-3.1

Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1662815&r1=1662814&r2=1662815&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Feb 27 21:09:28 2015
@@ -58,7 +58,7 @@ under the License.
       <bcmail.version>1.49</bcmail.version>
       <bcprov.version>1.49</bcprov.version>
       <bcpkix.version>1.49</bcpkix.version>
-      <commons-codec.version>1.9</commons-codec.version>
+      <commons-codec.version>1.10</commons-codec.version>
       <commons-collections.version>3.2.1</commons-collections.version>
       <commons-httpclient.version>3.1</commons-httpclient.version>
       <commons-io.version>2.4</commons-io.version>

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1662815&r1=1662814&r2=1662815&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 27 21:09:28 2015
@@ -129,6 +129,7 @@ Summary
 <ul>
 <li>Updated to jsoup-1.8.1.jar (from 1.7.3)</li>
 <li>Updated to tika-core and tika-parsers 1.7 (from 1.6)</li>
+<li>Updated to commons-codec-1.10.jar (from 1.9)</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>