Author: fanningpj
Date: Fri Feb 14 23:18:44 2020
New Revision: 1874039
URL: http://svn.apache.org/viewvc?rev=1874039&view=rev
Log:
bouncycastle 1.64
Modified:
poi/trunk/.classpath
poi/trunk/build.gradle
poi/trunk/build.xml
poi/trunk/sonar/ooxml/pom.xml
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
Modified: poi/trunk/.classpath
URL:
http://svn.apache.org/viewvc/poi/trunk/.classpath?rev=1874039&r1=1874038&r2=1874039&view=diff
==============================================================================
--- poi/trunk/.classpath (original)
+++ poi/trunk/.classpath Fri Feb 14 23:18:44 2020
@@ -27,9 +27,9 @@
<classpathentry kind="lib" path="lib/jmh-core-1.19.jar"/>
<classpathentry kind="lib"
path="lib/jmh-generator-annprocess-1.19.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry exported="true" kind="lib"
path="compile-lib/slf4j-api-1.7.26.jar"/>
- <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.62.jar"/>
- <classpathentry kind="lib"
path="compile-lib/bcprov-ext-jdk15on-1.62.jar"/>
+ <classpathentry exported="true" kind="lib"
path="compile-lib/slf4j-api-1.7.30.jar"/>
+ <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.64.jar"/>
+ <classpathentry kind="lib"
path="compile-lib/bcprov-ext-jdk15on-1.64.jar"/>
<classpathentry kind="lib" path="ooxml-testlib/reflections.jar"/>
<classpathentry kind="lib" path="ooxml-testlib/guava.jar"/>
<classpathentry kind="lib" path="ooxml-testlib/javassist.jar"/>
Modified: poi/trunk/build.gradle
URL:
http://svn.apache.org/viewvc/poi/trunk/build.gradle?rev=1874039&r1=1874038&r2=1874039&view=diff
==============================================================================
--- poi/trunk/build.gradle (original)
+++ poi/trunk/build.gradle Fri Feb 14 23:18:44 2020
@@ -92,6 +92,7 @@ subprojects {
version = '4.1.3-SNAPSHOT'
ext {
+ bouncyCastleVersion = '1.64'
commonsCodecVersion = '1.14'
commonsCompressVersion = '1.20'
commonsMathVersion = '3.6.1'
@@ -241,7 +242,7 @@ project('ooxml') {
implementation "org.apache.commons:commons-math3:${commonsMathVersion}"
implementation
"org.apache.commons:commons-compress:${commonsCompressVersion}"
implementation 'org.apache.santuario:xmlsec:2.1.2'
- implementation 'org.bouncycastle:bcpkix-jdk15on:1.62'
+ implementation "org.bouncycastle:bcpkix-jdk15on:${bouncyCastleVersion}"
implementation 'com.github.virtuald:curvesapi:1.06'
implementation 'com.zaxxer:SparseBitSet:1.2'
Modified: poi/trunk/build.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/build.xml?rev=1874039&r1=1874038&r2=1874039&view=diff
==============================================================================
--- poi/trunk/build.xml (original)
+++ poi/trunk/build.xml Fri Feb 14 23:18:44 2020
@@ -225,12 +225,12 @@ under the License.
<!-- xml signature libs -->
<property name="dsig.xmlsec.jar"
location="${compile.lib}/xmlsec-2.1.2.jar"/>
<property name="dsig.xmlsec.url"
value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.2/xmlsec-2.1.2.jar"/>
- <property name="dsig.bouncycastle-prov.jar"
location="${compile.lib}/bcprov-ext-jdk15on-1.62.jar"/>
- <property name="dsig.bouncycastle-prov.url"
value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.62/bcprov-ext-jdk15on-1.62.jar"/>
- <property name="dsig.bouncycastle-pkix.jar"
location="${compile.lib}/bcpkix-jdk15on-1.62.jar"/>
- <property name="dsig.bouncycastle-pkix.url"
value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.62/bcpkix-jdk15on-1.62.jar"/>
- <property name="dsig.sl4j-api.jar"
location="${compile.lib}/slf4j-api-1.7.26.jar"/>
- <property name="dsig.sl4j-api.url"
value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"/>
+ <property name="dsig.bouncycastle-prov.jar"
location="${compile.lib}/bcprov-ext-jdk15on-1.64.jar"/>
+ <property name="dsig.bouncycastle-prov.url"
value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.64/bcprov-ext-jdk15on-1.64.jar"/>
+ <property name="dsig.bouncycastle-pkix.jar"
location="${compile.lib}/bcpkix-jdk15on-1.64.jar"/>
+ <property name="dsig.bouncycastle-pkix.url"
value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.64/bcpkix-jdk15on-1.64.jar"/>
+ <property name="dsig.sl4j-api.jar"
location="${compile.lib}/slf4j-api-1.7.30.jar"/>
+ <property name="dsig.sl4j-api.url"
value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"/>
<!-- svg/batik libs - not part of the distribution -->
<property name="svg.batik-all.url"
value="${repository.m2}/maven2/org/apache/xmlgraphics/batik-all/1.11/batik-all-1.11.jar"/>
@@ -325,10 +325,10 @@ under the License.
<property name="halt.on.test.failure" value="true"/>
<!-- helper jars for pgp signing, building and nexus staging -->
- <property name="dist.bouncycastle-prov.jar"
location="${compile.lib}/bcprov-ext-jdk15on-1.62.jar"/>
- <property name="dist.bouncycastle-prov.url"
value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.62/bcprov-ext-jdk15on-1.62.jar"/>
- <property name="dist.bouncycastle-bcpg.jar"
location="${compile.lib}/bcpg-jdk15on-1.62.jar"/>
- <property name="dist.bouncycastle-bcpg.url"
value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.62/bcpg-jdk15on-1.62.jar"/>
+ <property name="dist.bouncycastle-prov.jar"
location="${compile.lib}/bcprov-ext-jdk15on-1.64.jar"/>
+ <property name="dist.bouncycastle-prov.url"
value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.64/bcprov-ext-jdk15on-1.64.jar"/>
+ <property name="dist.bouncycastle-bcpg.jar"
location="${compile.lib}/bcpg-jdk15on-1.64.jar"/>
+ <property name="dist.bouncycastle-bcpg.url"
value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.64/bcpg-jdk15on-1.64.jar"/>
<property name="dist.commons-openpgp.jar"
location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.jar"/>
<property name="dist.commons-openpgp.url"
value="https://repository.apache.org/content/groups/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20190121.221905-12.jar"/>
<property name="dist.nexus-staging.jar"
location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
@@ -718,10 +718,11 @@ under the License.
<include name="bc*jdk15on-1.5*.jar"/>
<include name="bc*jdk15on-1.60*.jar"/>
<include name="bc*jdk15on-1.61*.jar"/>
+ <include name="bc*jdk15on-1.62*.jar"/>
<include name="batik-all-1.10.jar"/>
<include name="slf4j-api-1.7.7.jar"/>
- <include name="slf4j-api-1.7.12.jar"/>
- <include name="slf4j-api-1.7.25.jar"/>
+ <include name="slf4j-api-1.7.1*.jar"/>
+ <include name="slf4j-api-1.7.2*.jar"/>
</fileset>
</delete>
Modified: poi/trunk/sonar/ooxml/pom.xml
URL:
http://svn.apache.org/viewvc/poi/trunk/sonar/ooxml/pom.xml?rev=1874039&r1=1874038&r2=1874039&view=diff
==============================================================================
--- poi/trunk/sonar/ooxml/pom.xml (original)
+++ poi/trunk/sonar/ooxml/pom.xml Fri Feb 14 23:18:44 2020
@@ -137,12 +137,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId>
- <version>1.62</version>
+ <version>1.64</version>
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
- <version>1.62</version>
+ <version>1.64</version>
</dependency>
<dependency>
<groupId>org.apache.santuario</groupId>
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java?rev=1874039&r1=1874038&r2=1874039&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
Fri Feb 14 23:18:44 2020
@@ -148,9 +148,9 @@ import org.w3c.dom.events.EventTarget;
* <p>To use SignatureInfo and its sibling classes, you'll need to have the
following libs
* in the classpath:</p>
* <ul>
- * <li>BouncyCastle bcpkix and bcprov (tested against 1.62)</li>
+ * <li>BouncyCastle bcpkix and bcprov (tested against 1.64)</li>
* <li>Apache Santuario "xmlsec" (tested against 2.1.2)</li>
- * <li>and slf4j-api (tested against 1.7.26)</li>
+ * <li>and slf4j-api (tested against 1.7.30)</li>
* </ul>
*/
public class SignatureInfo implements SignatureConfigurable {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
