moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

bouncycastle 1.59

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1822285 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2018-01-26 12:38:49 +00:00
parent 7e434aa155
commit aca52d2a51
5 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -28,8 +28,8 @@
<classpathentry kind="lib" path="lib/jmh-generator-annprocess-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 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.25.jar"/> <classpathentry exported="true" kind="lib" path="compile-lib/slf4j-api-1.7.25.jar"/>
<classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.58.jar"/> <classpathentry kind="lib" path="compile-lib/bcpkix-jdk15on-1.59.jar"/>
<classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.58.jar"/> <classpathentry kind="lib" path="compile-lib/bcprov-ext-jdk15on-1.59.jar"/>
<classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.1.0.jar"/> <classpathentry exported="true" kind="lib" path="compile-lib/xmlsec-2.1.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.11.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-codec-1.11.jar"/>
<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/> <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.2.jar"/>

4
build.gradle
View File

@ -199,7 +199,7 @@ project('ooxml') {
compile 'org.apache.commons:commons-collections4:4.1' compile 'org.apache.commons:commons-collections4:4.1'
compile 'org.apache.commons:commons-math3:3.6.1' compile 'org.apache.commons:commons-math3:3.6.1'
compile 'org.apache.santuario:xmlsec:2.1.0' compile 'org.apache.santuario:xmlsec:2.1.0'
compile 'org.bouncycastle:bcpkix-jdk15on:1.58' compile 'org.bouncycastle:bcpkix-jdk15on:1.59'
compile 'com.github.virtuald:curvesapi:1.05' compile 'com.github.virtuald:curvesapi:1.05'
// for ooxml-lite, should we move this somewhere else? // for ooxml-lite, should we move this somewhere else?
@ -216,7 +216,7 @@ project('ooxml') {
testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.19' testCompile 'org.openjdk.jmh:jmh-generator-annprocess:1.19'
} }
// TOOD: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project // TODO: we should not duplicate this task in each project, but I did not figure out how to inject the artifactId for each project
task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) { task japicmp(type: me.champeau.gradle.ArtifactJapicmpTask, dependsOn: jar) {
baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar' baseline = 'org.apache.poi:poi-ooxml:' + japicmpversion + '@jar'
to = jar.archivePath to = jar.archivePath

26
build.xml
View File

@ -178,10 +178,10 @@ under the License.
<!-- xml signature libs --> <!-- xml signature libs -->
<property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.0.jar"/> <property name="dsig.xmlsec.jar" location="${compile.lib}/xmlsec-2.1.0.jar"/>
<property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.0/xmlsec-2.1.0.jar"/> <property name="dsig.xmlsec.url" value="${repository.m2}/maven2/org/apache/santuario/xmlsec/2.1.0/xmlsec-2.1.0.jar"/>
<property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.58.jar"/> <property name="dsig.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.59.jar"/>
<property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.58/bcprov-ext-jdk15on-1.58.jar"/> <property name="dsig.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.59/bcprov-ext-jdk15on-1.59.jar"/>
<property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.58.jar"/> <property name="dsig.bouncycastle-pkix.jar" location="${compile.lib}/bcpkix-jdk15on-1.59.jar"/>
<property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.58/bcpkix-jdk15on-1.58.jar"/> <property name="dsig.bouncycastle-pkix.url" value="${repository.m2}/maven2/org/bouncycastle/bcpkix-jdk15on/1.59/bcpkix-jdk15on-1.59.jar"/>
<property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.25.jar"/> <property name="dsig.sl4j-api.jar" location="${compile.lib}/slf4j-api-1.7.25.jar"/>
<property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"/> <property name="dsig.sl4j-api.url" value="${repository.m2}/maven2/org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar"/>
@ -253,10 +253,10 @@ under the License.
<property name="halt.on.test.failure" value="true"/> <property name="halt.on.test.failure" value="true"/>
<!-- helper jars for pgp signing, building and nexus staging --> <!-- helper jars for pgp signing, building and nexus staging -->
<property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.58.jar"/> <property name="dist.bouncycastle-prov.jar" location="${compile.lib}/bcprov-ext-jdk15on-1.59.jar"/>
<property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.58/bcprov-ext-jdk15on-1.58.jar"/> <property name="dist.bouncycastle-prov.url" value="${repository.m2}/maven2/org/bouncycastle/bcprov-ext-jdk15on/1.59/bcprov-ext-jdk15on-1.59.jar"/>
<property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.58.jar"/> <property name="dist.bouncycastle-bcpg.jar" location="${compile.lib}/bcpg-jdk15on-1.59.jar"/>
<property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.58/bcpg-jdk15on-1.58.jar"/> <property name="dist.bouncycastle-bcpg.url" value="${repository.m2}/maven2/org/bouncycastle/bcpg-jdk15on/1.59/bcpg-jdk15on-1.59.jar"/>
<property name="dist.commons-openpgp.jar" location="${compile.lib}/commons-openpgp-1.0-SNAPSHOT.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/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20140717.171036-11.jar"/> <property name="dist.commons-openpgp.url" value="https://repository.apache.org/snapshots/org/apache/commons/commons-openpgp/1.0-SNAPSHOT/commons-openpgp-1.0-20140717.171036-11.jar"/>
<property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/> <property name="dist.nexus-staging.jar" location="${compile.lib}/nexus-staging-ant-tasks-1.6.3-uber.jar"/>
@ -600,12 +600,10 @@ under the License.
<include name="xmlsec-2.0.1.jar"/> <include name="xmlsec-2.0.1.jar"/>
<include name="xmlsec-2.0.5.jar"/> <include name="xmlsec-2.0.5.jar"/>
<include name="xmlsec-2.0.6.jar"/> <include name="xmlsec-2.0.6.jar"/>
<include name="bcprov-ext-jdk15on-1.51.jar"/> <include name="bc*jdk15on-1.51.jar"/>
<include name="bcprov-ext-jdk15on-1.53.jar"/> <include name="bc*jdk15on-1.53.jar"/>
<include name="bcprov-ext-jdk15on-1.54.jar"/> <include name="bc*jdk15on-1.54.jar"/>
<include name="bcpkix-jdk15on-1.51.jar"/> <include name="bc*jdk15on-1.58.jar"/>
<include name="bcpkix-jdk15on-1.53.jar"/>
<include name="bcpkix-jdk15on-1.54.jar"/>
<include name="slf4j-api-1.7.7.jar"/> <include name="slf4j-api-1.7.7.jar"/>
<include name="slf4j-api-1.7.12.jar"/> <include name="slf4j-api-1.7.12.jar"/>
</fileset> </fileset>

4
sonar/ooxml/pom.xml
View File

@ -137,12 +137,12 @@
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15on</artifactId> <artifactId>bcpkix-jdk15on</artifactId>
<version>1.54</version> <version>1.59</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.bouncycastle</groupId> <groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId> <artifactId>bcprov-jdk15on</artifactId>
<version>1.58</version> <version>1.59</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.santuario</groupId> <groupId>org.apache.santuario</groupId>

2
src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java
View File

@ -163,7 +163,7 @@ import org.xml.sax.SAXException;
* <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs * <p>To use SignatureInfo and its sibling classes, you'll need to have the following libs
* in the classpath:</p> * in the classpath:</p>
* <ul> * <ul>
* <li>BouncyCastle bcpkix and bcprov (tested against 1.58)</li> * <li>BouncyCastle bcpkix and bcprov (tested against 1.59)</li>
* <li>Apache Santuario "xmlsec" (tested against 2.1.0)</li> * <li>Apache Santuario "xmlsec" (tested against 2.1.0)</li>
* <li>and slf4j-api (tested against 1.7.25)</li> * <li>and slf4j-api (tested against 1.7.25)</li>
* </ul> * </ul>