diff options
author | Dominik Stadler <centic@apache.org> | 2015-01-03 09:35:21 +0000 |
---|---|---|
committer | Dominik Stadler <centic@apache.org> | 2015-01-03 09:35:21 +0000 |
commit | 55275b1e670f8f2439760563905828d500f02dd1 (patch) | |
tree | e6b40c95173df374a91b9317171f527dd07c83a2 /build.xml | |
parent | 64ded75d8767cc68893d627f60db53a7eeef9c73 (diff) | |
download | poi-55275b1e670f8f2439760563905828d500f02dd1.tar.gz poi-55275b1e670f8f2439760563905828d500f02dd1.zip |
Update to junit-4.12, the jar file is downloaded, so not required on classpath anymore. Also adjust version in pom.xml for Sonar.
Conflicts:
.classpath
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1649178 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'build.xml')
-rw-r--r-- | build.xml | 17 |
1 files changed, 7 insertions, 10 deletions
@@ -31,12 +31,7 @@ under the License. Dominik Stadler centic at apache.org This build was tested with ant 1.9.4 although it will probably work with - other versions, however at least 1.8.0 is required. The following jar - files should be available on the classpath when running ant: - - LIBRARY LOCATION - ======= ======== - junit(4.11+) http://www.junit.org + other versions, however at least 1.8.0 is required. To build the documentation you will need to install forrest and set the FORREST_HOME environment variable. Forrest 0.5.1 required. @@ -146,8 +141,8 @@ under the License. value="${repository.m2}/maven2/commons-codec/commons-codec/1.9/commons-codec-1.9.jar"/> <property name="main.log4j.jar" location="${main.lib}/log4j-1.2.17.jar"/> <property name="main.log4j.url" value="${repository.m2}/maven2/log4j/log4j/1.2.17/log4j-1.2.17.jar"/> - <property name="main.junit.jar" location="${main.lib}/junit-4.11.jar"/> - <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.11/junit-4.11.jar"/> + <property name="main.junit.jar" location="${main.lib}/junit-4.12.jar"/> + <property name="main.junit.url" value="${repository.m2}/maven2/junit/junit/4.12/junit-4.12.jar"/> <property name="main.hamcrest.jar" location="${main.lib}/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.ant.jar" location="${main.lib}/ant-1.9.4.jar"/> @@ -419,7 +414,9 @@ under the License. <include name="org.jacoco.*-0.7.1*"/> <include name="dom4j*"/> <include name="apache-rat-0.10*"/> - <include name="xercesImpl-*.jar"/> + <include name="xercesImpl-*.jar"/> + <include name="junit-3*"/> + <include name="junit-4.11*"/> </fileset> </delete> @@ -1701,7 +1698,7 @@ under the License. <auxClasspath path="ooxml-lib/xmlbeans-2.6.0.jar" /> <auxClasspath path="lib/commons-codec-1.9.jar" /> <auxClasspath path="lib/commons-logging-1.1.3.jar" /> - <auxClasspath path="lib/junit-4.11.jar" /> + <auxClasspath path="lib/junit-4.12.jar" /> <sourcePath path="src/java" /> <sourcePath path="src/ooxml/java" /> <sourcePath path="src/scratchpad/src" /> |