Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated mockito to 2.23.4 to fix java 11 build 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1850590 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vladislav Galas 2019-01-06 18:56:29 +00:00
parent 0849bbc614
commit f3eb4dd393
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -185,7 +185,7 @@ project('main') {
compile 'javax.activation:activation:1.1.1' compile 'javax.activation:activation:1.1.1'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.21.0' testCompile 'org.mockito:mockito-core:2.23.4'
testCompile 'org.reflections:reflections:0.9.11' testCompile 'org.reflections:reflections:0.9.11'
} }
@ -248,7 +248,7 @@ project('ooxml') {
compile files('../../ooxml-lib/ooxml-security-1.1.jar') compile files('../../ooxml-lib/ooxml-security-1.1.jar')
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.mockito:mockito-core:2.21.0' testCompile 'org.mockito:mockito-core:2.23.4'
testCompile 'org.xmlunit:xmlunit-core:2.5.1' testCompile 'org.xmlunit:xmlunit-core:2.5.1'
testCompile 'org.reflections:reflections:0.9.11' testCompile 'org.reflections:reflections:0.9.11'
testCompile project(path: ':main', configuration: 'tests') testCompile project(path: ':main', configuration: 'tests')

17
build.xml
View File

@ -176,12 +176,12 @@ under the License.
<property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/> <property name="main.hamcrest.url" value="${repository.m2}/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
<property name="main.xmlunit.jar" location="${main.lib}/xmlunit-core-2.5.1.jar"/> <property name="main.xmlunit.jar" location="${main.lib}/xmlunit-core-2.5.1.jar"/>
<property name="main.xmlunit.url" value="${repository.m2}/maven2/org/xmlunit/xmlunit-core/2.5.1/xmlunit-core-2.5.1.jar"/> <property name="main.xmlunit.url" value="${repository.m2}/maven2/org/xmlunit/xmlunit-core/2.5.1/xmlunit-core-2.5.1.jar"/>
<property name="main.mockito.jar" location="${main.lib}/mockito-core-2.21.0.jar"/> <property name="main.mockito.jar" location="${main.lib}/mockito-core-2.23.4.jar"/>
<property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/2.21.0/mockito-core-2.21.0.jar"/> <property name="main.mockito.url" value="${repository.m2}/maven2/org/mockito/mockito-core/2.23.4/mockito-core-2.23.4.jar"/>
<property name="main.byte-buddy.jar" location="${main.lib}/byte-buddy-1.7.9.jar"/> <property name="main.byte-buddy.jar" location="${main.lib}/byte-buddy-1.9.3.jar"/>
<property name="main.byte-buddy.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy/1.7.9/byte-buddy-1.7.9.jar"/> <property name="main.byte-buddy.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy/1.9.3/byte-buddy-1.9.3.jar"/>
<property name="main.byte-buddy-agent.jar" location="${main.lib}/byte-buddy-agent-1.7.9.jar"/> <property name="main.byte-buddy-agent.jar" location="${main.lib}/byte-buddy-agent-1.9.3.jar"/>
<property name="main.byte-buddy-agent.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy-agent/1.7.9/byte-buddy-agent-1.7.9.jar"/> <property name="main.byte-buddy-agent.url" value="${repository.m2}/maven2/net/bytebuddy/byte-buddy-agent/1.9.3/byte-buddy-agent-1.9.3.jar"/>
<property name="main.ant.jar" location="${main.lib}/ant-1.10.1.jar"/> <property name="main.ant.jar" location="${main.lib}/ant-1.10.1.jar"/>
<property name="main.objenesis.jar" location="${main.lib}/objenesis-2.6.jar"/> <property name="main.objenesis.jar" location="${main.lib}/objenesis-2.6.jar"/>
<property name="main.objenesis.url" value="${repository.m2}/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.jar"/> <property name="main.objenesis.url" value="${repository.m2}/maven2/org/objenesis/objenesis/2.6/objenesis-2.6.jar"/>
@ -671,7 +671,10 @@ under the License.
<include name="forbiddenapis-2.3.jar"/> <include name="forbiddenapis-2.3.jar"/>
<include name="forbiddenapis-2.5.jar"/> <include name="forbiddenapis-2.5.jar"/>
<include name="apache-rat-0.11.jar"/> <include name="apache-rat-0.11.jar"/>
<include name="mockito-core-2.13.0.jar"/> <include name="mockito-core-2.13.0.jar"/>
<include name="mockito-core-2.21.0.jar"/>
<include name="byte-buddy-1.7.9.jar"/>
<include name="byte-buddy-agent-1.7.9.jar"/>
</fileset> </fileset>
<fileset dir="${ooxml.lib}"> <fileset dir="${ooxml.lib}">
<!-- remove jars from previous versions, but not the current version --> <!-- remove jars from previous versions, but not the current version -->