Author: milamber
Date: Fri Dec 29 14:29:22 2017
New Revision: 1819494
URL: http://svn.apache.org/viewvc?rev=1819494&view=rev
Log:
Updated to commons-dbcp2-2.2.0
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/licenses/bin/README.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=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Fri Dec 29 14:29:22 2017
@@ -214,7 +214,7 @@ The following software is provided under
* cglib-nodep-3.2.5.jar
* commons-codec-1.10.jar
* commons-collections-3.2.2.jar
-* commons-dbcp2-2.1.1.jar
+* commons-dbcp2-2.2.0.jar
* commons-io-2.5.jar
* commons-jexl2-2.1.1.jar
* commons-jexl3-3.1.jar
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Dec 29 14:29:22 2017
@@ -100,10 +100,10 @@ commons-collections.jar = commons-co
commons-collections.loc =
${maven2.repo}/commons-collections/commons-collections/${commons-collections.version}
commons-collections.md5 = f54a8510f834a1a57166970bfc982e94
-commons-dbcp2.version = 2.1.1
+commons-dbcp2.version = 2.2.0
commons-dbcp2.jar = commons-dbcp2-${commons-dbcp2.version}.jar
commons-dbcp2.loc =
${maven2.repo}/org/apache/commons/commons-dbcp2/${commons-dbcp2.version}
-commons-dbcp2.md5 = 298897b1e785b933b0522351871cf7ae
+commons-dbcp2.md5 = 506aa530ad4816013db02556c03fdfc7
commons-io.version = 2.5
commons-io.jar = commons-io-${commons-io.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Dec 29 14:29:22 2017
@@ -52,7 +52,7 @@
<classpathentry kind="lib" path="lib/caffeine-2.5.5.jar"/>
<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
<classpathentry kind="lib" path="lib/commons-collections-3.2.2.jar"/>
- <classpathentry kind="lib" path="lib/commons-dbcp2-2.1.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-dbcp2-2.2.0.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.5.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl-2.1.1.jar"/>
<classpathentry kind="lib" path="lib/commons-jexl3-3.1.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 29 14:29:22 2017
@@ -10,7 +10,7 @@ caffeine-2.5.5.jar
cglib-nodep-3.2.5.jar
commons-codec-1.10.jar
commons-collections-3.2.2.jar
-commons-dbcp2-2.1.1.jar
+commons-dbcp2-2.2.0.jar
commons-httpclient-3.1.jar
commons-io-2.5.jar
commons-jexl-2.1.1.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Dec 29 14:29:22 2017
@@ -236,7 +236,7 @@ tika-1.17
http://tika.apache.org/
- Regular Expression Extractor
-commons-dbcp2-2.1.1 (org.apache.commons.dbcp2)
+commons-dbcp2-2.2.0 (org.apache.commons.dbcp2)
--------------------------
- DataSourceElement (JDBC)
Modified: jmeter/trunk/licenses/bin/README.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/README.txt?rev=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/licenses/bin/README.txt (original)
+++ jmeter/trunk/licenses/bin/README.txt Fri Dec 29 14:29:22 2017
@@ -7,7 +7,7 @@ bsf-2.4.0.jar
bshclient.jar (part of JMeter)
commons-codec-1.10.jar
commons-collections-3.2.2.jar
-commons-dbcp2-2.1.1.jar
+commons-dbcp2-2.2.0.jar
commons-io-2.5.jar
commons-jexl-2.1.1.jar
commons-jexl3-3.1.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Dec 29 14:29:22 2017
@@ -63,7 +63,7 @@ under the License.
<caffeine.version>2.5.5</caffeine.version>
<commons-codec.version>1.10</commons-codec.version>
<commons-collections.version>3.2.2</commons-collections.version>
- <commons-dbcp2.version>2.1.1</commons-dbcp2.version>
+ <commons-dbcp2.version>2.2.0</commons-dbcp2.version>
<commons-io.version>2.5</commons-io.version>
<commons-jexl2.version>2.1.1</commons-jexl2.version>
<commons-jexl3.version>3.1</commons-jexl3.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1819494&r1=1819493&r2=1819494&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Dec 29 14:29:22 2017
@@ -199,6 +199,7 @@ Summary
<li>Updated to groovy-all-2.4.13 (from groovy-all-2.4.12)</li>
<li>Updated to rhino-1.7.7.2 (from rhino-1.7.7.1)</li>
<li>Updated to tika-core and tika-parsers 1.17 (from 1.16)</li>
+ <li>Updated to commons-dbcp2-2.2.0 (from 2.1.1)</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>
