mirrors
/
poi
mirror of https://github.com/apache/poi.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 100 Wiki Activity
Browse Source

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
tags/REL_3_12_BETA1
Dominik Stadler 9 years ago
parent
64ded75d87
commit
55275b1e67
11 changed files with 21 additions and 24 deletions
Split View Show Diff Stats
  1. 2
    2
      .classpath
  2. 7
    10
      build.xml
  3. 1
    1
      maven/poi.pom
  4. 2
    2
      sonar/examples/pom.xml
  5. 1
    1
      sonar/excelant/pom.xml
  6. 1
    1
      sonar/main/pom.xml
  7. 1
    1
      sonar/ooxml-schema-encryption/pom.xml
  8. 1
    1
      sonar/ooxml-schema/pom.xml
  9. 2
    2
      sonar/ooxml/pom.xml
  10. 2
    2
      sonar/pom.xml
  11. 1
    1
      sonar/scratchpad/pom.xml

+ 2
- 2
.classpath View File

@@ -22,8 +22,8 @@
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="ooxml-lib/xmlbeans-2.6.0.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/junit-4.11.jar"/>
<classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-src-1.1.jar"/>
<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
<classpathentry kind="lib" path="ooxml-lib/ooxml-schemas-1.1.jar" sourcepath="ooxml-lib/ooxml-schemas-1.1-sources.jar"/>
<classpathentry kind="lib" path="ooxml-lib/ooxml-security-1.0.jar" sourcepath="ooxml-lib/ooxml-security-src-1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="compile-lib/slf4j-api-1.7.7.jar"/>

+ 7
- 10
build.xml View File

@@ -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" />

+ 1
- 1
maven/poi.pom View File

@@ -89,7 +89,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
<version>4.11</version>
<version>4.12</version>
</dependency>
</dependencies>


+ 2
- 2
sonar/examples/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-examples</artifactId>
<packaging>jar</packaging>
@@ -70,7 +70,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
</dependency>
</dependencies>
</project>

+ 1
- 1
sonar/excelant/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-excelant</artifactId>
<packaging>jar</packaging>

+ 1
- 1
sonar/main/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-main</artifactId>
<packaging>jar</packaging>

+ 1
- 1
sonar/ooxml-schema-encryption/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-ooxml-schema-encryption</artifactId>
<packaging>jar</packaging>

+ 1
- 1
sonar/ooxml-schema/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-ooxml-schema</artifactId>
<packaging>jar</packaging>

+ 2
- 2
sonar/ooxml/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-ooxml</artifactId>
<packaging>jar</packaging>
@@ -120,7 +120,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
</dependency>
</dependencies>
</project>

+ 2
- 2
sonar/pom.xml View File

@@ -7,7 +7,7 @@
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<packaging>pom</packaging>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>

<name>Apache POI - the Java API for Microsoft Documents</name>

@@ -123,7 +123,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>

+ 1
- 1
sonar/scratchpad/pom.xml View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.poi</groupId>
<artifactId>poi-parent</artifactId>
<version>3.11-SNAPSHOT</version>
<version>3.12-SNAPSHOT</version>
</parent>
<artifactId>poi-scratchpad</artifactId>
<packaging>jar</packaging>

Write Preview
Loading…
Cancel
Save