You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2013/07/17 15:25:55 UTC
svn commit: r1504125 - in /jmeter/trunk: build.properties eclipse.classpath
res/maven/ApacheJMeter_parent.pom xdocs/changes.xml
Author: sebb
Date: Wed Jul 17 13:25:55 2013
New Revision: 1504125
URL: http://svn.apache.org/r1504125
Log:
Updated to BouncyCastle 1.49 (from 1.48)
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=1504125&r1=1504124&r2=1504125&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Wed Jul 17 13:25:55 2013
@@ -57,20 +57,22 @@ beanshell.loc = ${maven2.r
beanshell.md5 = 02F72336919D06A8491E82346E10B4D5
# Bouncy Castle jars (compile and test only - not distributed)
-bcmail.version = 1.48
+# Currently only needed for SMIMEAssertion
+# N.B. hashes should be obtained from the page: http://www.bouncycastle.org/checksums.html
+bcmail.version = 1.49
bcmail.jar = bcmail-jdk15on-${bcmail.version}.jar
bcmail.loc = ${maven2.repo}/org/bouncycastle/bcmail-jdk15on/${bcmail.version}
-bcmail.md5 = d21564a05cec19caea793f6c63c79b59
+bcmail.md5 = 25686fe5c9fc984ee7c63b8e1a3f6509
-bcprov.version = 1.48
+bcprov.version = 1.49
bcprov.jar = bcprov-jdk15on-${bcprov.version}.jar
bcprov.loc = ${maven2.repo}/org/bouncycastle/bcprov-jdk15on/${bcprov.version}
-bcprov.md5 = c08b58e03da7d469b0e7df6f4dd99712
+bcprov.md5 = 20f367d41a546f2c844314da5d97ea12
-bcpkix.version = 1.48
+bcpkix.version = 1.49
bcpkix.jar = bcpkix-jdk15on-${bcprov.version}.jar
bcpkix.loc = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
-bcpkix.md5 = f8fc0496846f567ec951ac0a0e25ed00
+bcpkix.md5 = cb025ef84fb991e14fdf62f6bef7be53
commons-codec.version = 1.8
commons-codec.jar = commons-codec-${commons-codec.version}.jar
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1504125&r1=1504124&r2=1504125&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Wed Jul 17 13:25:55 2013
@@ -91,8 +91,8 @@
<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.4.jar"/>
<!-- Needed for build and test -->
- <classpathentry kind="lib" path="lib/api/bcmail-jdk15on-1.48.jar"/>
- <classpathentry kind="lib" path="lib/api/bcprov-jdk15on-1.48.jar"/>
- <classpathentry kind="lib" path="lib/api/bcpkix-jdk15on-1.48.jar"/>
+ <classpathentry kind="lib" path="lib/api/bcmail-jdk15on-1.49.jar"/>
+ <classpathentry kind="lib" path="lib/api/bcprov-jdk15on-1.49.jar"/>
+ <classpathentry kind="lib" path="lib/api/bcpkix-jdk15on-1.49.jar"/>
<classpathentry kind="output" path="build"/>
</classpath>
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1504125&r1=1504124&r2=1504125&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Wed Jul 17 13:25:55 2013
@@ -56,9 +56,9 @@ under the License.
<apache-jsr223-api.version>3.1</apache-jsr223-api.version>
<avalon-framework.version>4.1.4</avalon-framework.version>
<beanshell.version>2.0b5</beanshell.version>
- <bcmail.version>1.48</bcmail.version>
- <bcprov.version>1.48</bcprov.version>
- <bcpkix.version>1.48</bcpkix.version>
+ <bcmail.version>1.49</bcmail.version>
+ <bcprov.version>1.49</bcprov.version>
+ <bcpkix.version>1.49</bcpkix.version>
<commons-codec.version>1.8</commons-codec.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1504125&r1=1504124&r2=1504125&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Wed Jul 17 13:25:55 2013
@@ -313,6 +313,7 @@ Transaction Controller now sets Response
<li>Updated to tika 1.4 (from 1.3)</li>
<li>Updated to xmlgraphics-commons 1.5 (from 1.3.1)</li>
<li>Updated to xstream 1.4.4 (from 1.4.2)</li>
+<li>Updated to BouncyCastle 1.49 (from 1.48)</li>
<li><bugzilla>54912</bugzilla> - JMeterTreeListener should use constants</li>
<li><bugzilla>54903</bugzilla> - Remove the dependency on the Activation Framework</li>
<li>Moved commons-lang (2.6) to lib/doc as it's only needed by Velocity</li>