Author: pmouawad
Date: Sun Mar 31 22:06:03 2013
New Revision: 1463065
URL: http://svn.apache.org/r1463065
Log:
Bug 54776 - Update the dependency on Bouncy Castle to 1.48
Bugzilla Id: 54776
Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/api/ (props changed)
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/build.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1463065&r1=1463064&r2=1463065&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sun Mar 31 22:06:03 2013
@@ -57,15 +57,20 @@ beanshell.loc = ${maven2.r
beanshell.md5 = 02F72336919D06A8491E82346E10B4D5
# Bouncy Castle jars (compile and test only - not distributed)
-bcmail.version = 1.45
-bcmail.jar = bcmail-jdk15-${bcmail.version}.jar
-bcmail.loc = ${maven2.repo}/org/bouncycastle/bcmail-jdk15/${bcmail.version}
-bcmail.md5 = 13321fc7eff7bcada7b4fedfb592025c
-
-bcprov.version = 1.45
-bcprov.jar = bcprov-jdk15-${bcprov.version}.jar
-bcprov.loc = ${maven2.repo}/org/bouncycastle/bcprov-jdk15/${bcprov.version}
-bcprov.md5 = 2062f8e3d15748443ea60a94b266371c
+bcmail.version = 1.48
+bcmail.jar = bcmail-jdk15on-${bcmail.version}.jar
+bcmail.loc = ${maven2.repo}/org/bouncycastle/bcmail-jdk15on/${bcmail.version}
+bcmail.md5 = d21564a05cec19caea793f6c63c79b59
+
+bcprov.version = 1.48
+bcprov.jar = bcprov-jdk15on-${bcprov.version}.jar
+bcprov.loc = ${maven2.repo}/org/bouncycastle/bcprov-jdk15on/${bcprov.version}
+bcprov.md5 = c08b58e03da7d469b0e7df6f4dd99712
+
+bcpkix.version = 1.48
+bcpkix.jar = bcpkix-jdk15on-${bcprov.version}.jar
+bcpkix.loc = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcprov.version}
+bcpkix.md5 = f8fc0496846f567ec951ac0a0e25ed00
commons-codec.version = 1.6
commons-codec.jar = commons-codec-${commons-codec.version}.jar
Modified: jmeter/trunk/build.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1463065&r1=1463064&r2=1463065&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sun Mar 31 22:06:03 2013
@@ -42,10 +42,10 @@
To build all and package up the files for distribution
ant distribution -Djmeter.version=vvvv [-Dsvn.revision=nnnnn]
-
+
Add -Ddisable-svnCheck=true to disable svn check, if you build from src archive or offline
- Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
- if you want build your own custom JMeter package.
+ Add -Ddisable-check-versions=true to disable matching current svn revision and JMeterVersion.java,
+ if you want build your own custom JMeter package.
To create a nightly build (separate bin/src/lib jars):
ant nightly [-Dsvn.revision=nnnnn]
@@ -151,7 +151,7 @@
<sourcePath path="${src.native}" />
<sourcePath path="${src.mongodb}" />
<sourcePath path="${src.report}" />
-
+
<auxClasspath>
<fileset dir="${lib.dir}">
<include name="*.jar"/>
@@ -342,7 +342,7 @@
<property file="build.properties"/> <!-- defines the library version numbers -->
<property name="resources.meta-inf" value="${build.res}/META-INF"/>
-
+
<patternset id="external.jars.notices">
<include name="LICENSE"/>
<include name="NOTICE"/>
@@ -380,8 +380,8 @@
<include name="${lib.dir}/${jdom.jar}"/>
<include name="${lib.dir}/${jms.jar}"/>
<include name="${lib.dir}/${js_rhino.jar}"/>
- <include name="${lib.dir}/${jodd-core.jar}"/>
- <include name="${lib.dir}/${jodd-lagarto.jar}"/>
+ <include name="${lib.dir}/${jodd-core.jar}"/>
+ <include name="${lib.dir}/${jodd-lagarto.jar}"/>
<include name="${lib.dir}/${jsoup.jar}"/>
<include name="${lib.dir}/${junit.jar}"/>
<include name="${lib.dir}/${logkit.jar}"/>
@@ -448,7 +448,7 @@
<pathelement location="${lib.dir}/${jdom.jar}"/>
<pathelement location="${lib.dir}/${jms.jar}"/>
<pathelement location="${lib.dir}/${js_rhino.jar}"/>
- <pathelement location="${lib.dir}/${jodd-core.jar}"/>
+ <pathelement location="${lib.dir}/${jodd-core.jar}"/>
<pathelement location="${lib.dir}/${jodd-lagarto.jar}"/>
<pathelement location="${lib.dir}/${jsoup.jar}"/>
<pathelement location="${lib.dir}/${junit.jar}"/>
@@ -492,7 +492,7 @@
<filterset id="version.filters">
<filter token="YEAR" value="${year}"/>
</filterset>
-
+
<target name="init-version">
<tstamp/>
<!--
@@ -831,7 +831,7 @@
</classpath>
</javac>
</target>
-
+
<target name="compile-native" depends="compile-jorphan,compile-core,compile-components"
description="Compile components specific to Native sampling.">
<mkdir dir="${build.native}"/>
@@ -845,7 +845,7 @@
</classpath>
</javac>
</target>
-
+
<target name="compile-mongodb" depends="compile-jorphan,compile-core,compile-components"
description="Compile components specific to MongoDB sampling.">
<mkdir dir="${build.mongodb}"/>
@@ -880,7 +880,7 @@
<target name="prepare-resources"
description="Prepare some resources files, update date">
<mkdir dir="${build.res}" />
- <mkdir dir="${resources.meta-inf}" />
+ <mkdir dir="${resources.meta-inf}" />
<copy todir="${resources.meta-inf}" overwrite="yes" filtering="yes"
encoding="${encoding}">
<filterset refid="version.filters"/>
@@ -1148,7 +1148,7 @@ run JMeter unless all the JMeter jars ar
<fileset dir="${build.mongodb}" includes="**/*.class" />
<fileset dir="${src.mongodb}" includes="**/*.properties" />
</jar>
-
+
<jar jarfile="${lib.dir}/jorphan.jar" manifest="${build.dir}/MANIFEST_BIN.MF">
<zipfileset file="${resources.meta-inf}/default.notice"
fullpath="META-INF/NOTICE" />
@@ -1302,8 +1302,8 @@ run JMeter unless all the JMeter jars ar
<exclude name="**/*.jpg"/>
<exclude name="**/*.png"/>
<include name="${src.docs}/**"/>
- <!-- Include some resources -->
- <include name="${res.dir}/**"/>
+ <!-- Include some resources -->
+ <include name="${res.dir}/**"/>
<!-- Exclude binary types (and JMX/JTL, which are not OS-dependent) -->
<exclude name="${src.docs}/images/**"/>
<exclude name="${src.docs}/**/*.jmx"/>
@@ -1417,7 +1417,7 @@ run JMeter unless all the JMeter jars ar
<local name="version.match"/>
<condition property="version.match">
<resourcecontains resource="${src.core}/org/apache/jmeter/util/JMeterVersion.java"
- substring='VERSION = "${jmeter.version}";'/>
+ substring='VERSION = "${jmeter.version}";'/>
</condition>
<fail message="jmeter.version must be same as JMeterVersion.VERSION" unless="version.match"/>
</target>
@@ -2493,9 +2493,9 @@ run JMeter unless all the JMeter jars ar
</antcall>
<antcall target="batchtest">
<!-- Option Start Next Loop in Thread Group does not mark parent Transaction
Sampler in error when an error occurs -->
- <param name="batchtest.name" value="Bug52968"/>
- </antcall>
-
+ <param name="batchtest.name" value="Bug52968"/>
+ </antcall>
+
<antcall target="batchtest">
<!-- IncludeController : NullPointerException loading script in non-GUI mode
if Includers use same element name -->
<param name="batchtest.name" value="Bug50898"/>
@@ -2756,6 +2756,7 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="avalon-framework"/>
<process_jarfile jarname="bcmail" dest.dir="${lib.api}"/>
<process_jarfile jarname="bcprov" dest.dir="${lib.api}"/>
+ <process_jarfile jarname="bcpkix" dest.dir="${lib.api}"/>
<process_jarfile jarname="beanshell"/>
<process_jarfile jarname="commons-codec"/>
<process_jarfile jarname="commons-collections"/>
@@ -2782,14 +2783,14 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="jdom"/>
<process_jarfile jarname="jms"/>
<process_jarfile jarname="js_rhino"/>
- <process_jarfile jarname="jodd-core"/>
+ <process_jarfile jarname="jodd-core"/>
<process_jarfile jarname="jodd-lagarto"/>
<process_jarfile jarname="jsoup"/>
<process_jarfile jarname="junit"/>
<process_jarfile jarname="logkit"/>
<process_jarfile jarname="mongo-java-driver"/>
<process_jarfile jarname="serializer"/>
- <process_jarfile jarname="slf4j-api"/>
+ <process_jarfile jarname="slf4j-api"/>
<process_jarfile jarname="soap"/>
<process_jarfile jarname="tidy"/>
<process_jarfile jarname="tika-core"/>
Modified: jmeter/trunk/eclipse.classpath
URL: http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1463065&r1=1463064&r2=1463065&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sun Mar 31 22:06:03 2013
@@ -89,7 +89,8 @@
<classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.2.jar"/>
<!-- Needed for build and test -->
- <classpathentry kind="lib" path="lib/api/bcmail-jdk15-1.45.jar"/>
- <classpathentry kind="lib" path="lib/api/bcprov-jdk15-1.45.jar"/>
+ <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="output" path="build"/>
</classpath>
Propchange: jmeter/trunk/lib/api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Mar 31 22:06:03 2013
@@ -1,6 +1,3 @@
-geronimo-activation_*_spec-*.jar
-geronimo-jms_*_spec-*.jar
-geronimo-javamail_*_spec-*.jar
-bsf-api-*.jar
-bcmail-*.jar
-bcprov-*.jar
+bcmail-jdk15on-*.jar
+bcprov-jdk15on-*.jar
+bcpkix-jdk15on-*.jar
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL: http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1463065&r1=1463064&r2=1463065&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sun Mar 31 22:06:03 2013
@@ -56,8 +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.45</bcmail.version>
- <bcprov.version>1.45</bcprov.version>
+ <bcmail.version>1.48</bcmail.version>
+ <bcprov.version>1.48</bcprov.version>
+ <bcpkix.version>1.48</bcpkix.version>
<commons-codec.version>1.6</commons-codec.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-httpclient.version>3.1</commons-httpclient.version>
@@ -120,15 +121,20 @@ under the License.
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk15</artifactId>
+ <artifactId>bcmail-jdk15on</artifactId>
<version>${bcmail.version}</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk15</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
<version>${bcprov.version}</version>
</dependency>
<dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ <version>${bcpkix.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java?rev=1463065&r1=1463064&r2=1463065&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java Sun Mar 31
22:06:03 2013
@@ -52,6 +52,7 @@ import org.bouncycastle.asn1.x509.X509Na
import org.bouncycastle.cms.CMSException;
import org.bouncycastle.cms.SignerInformation;
import org.bouncycastle.cms.SignerInformationStore;
+import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
import org.bouncycastle.jce.PrincipalUtil;
import org.bouncycastle.jce.X509Principal;
import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -152,7 +153,8 @@ class SMIMEAssertion {
if (signerIt.hasNext()) {
SignerInformation signer = (SignerInformation) signerIt.next();
- Iterator<?> certIt = certs.getCertificates(signer.getSID()).iterator();
+ Iterator<?> certIt = certs.getCertificates(
+ (new JcaX509CertSelectorConverter()).getCertSelector(signer.getSID())).iterator();
if (certIt.hasNext()) {
// the signer certificate
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1463065&r1=1463064&r2=1463065&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sun Mar 31 22:06:03 2013
@@ -176,6 +176,7 @@ This does not affect JMeter operation.
<h2>Non-functional changes</h2>
<ul>
<li>Updated to jsoup-1.7.2</li>
+<li><bugzilla>54776</bugzilla> - Update the dependency on Bouncy Castle
to 1.48</li>
</ul>
</section>
|