Update to junit-4.12, the jar file is downloaded, so not required on classpath anymor...

Conflicts:
	.classpath

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1649178 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/.classpath b/.classpath
index bc01351d8d7114df3fc3dd75d11f8dbd77d9a9c5..899c7591b8dfe2232492b272a307cba91d39ba6a 100644 (file)
--- a/.classpath
+++ b/.classpath
@@ -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"/>

diff --git a/build.xml b/build.xml
index 689f88424adbab6c70b192edfb53962462ab5d72..c51bb73506abb33cb8ae2a3f04055a1ef4eb5cea 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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" />

diff --git a/maven/poi.pom b/maven/poi.pom
index d987c882c10e763ed224732dc98128d2af2a7dbb..6f2c4243ab296605e6b0d20ef4f392407324ae36 100644 (file)
--- a/maven/poi.pom
+++ b/maven/poi.pom
@@ -89,7 +89,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>
-      <version>4.11</version>
+      <version>4.12</version>
     </dependency>
   </dependencies>
 

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 5064a51afcb22162b105cc5e246bf97b88374942..dd980884a9f8719e64cfe8a06653047d8bbfc227 100644 (file)
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -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>

diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 8cc86ec07e6d2ed5fd912a3c8bf47d67c0a29f2d..756a97901b1f9c8581cd5cd952ca05209bd5c94e 100644 (file)
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -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>

diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 6527e75b01d23e63125cd88ed71df41392d7365e..9a5f0bd542e9cde80c17950ab7d5854f74b929dc 100644 (file)
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -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>

diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index 20f281134f9cf668b762f386ed46ec4b940fc0f5..8791d6b9de4faea53c839c86f72ab112cfdf1691 100644 (file)
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -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>

diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index 5b083327362b6065e2d8c8ab8618d63e665cfb82..fa6348e137787243dddd60815fdbdb0e3a904073 100644 (file)
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -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>

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 36aeeada8d5a8a3967581ae30263222f8e97366d..a4dfa42c43fc121b420c3572a440ae78d1380173 100644 (file)
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -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>

diff --git a/sonar/pom.xml b/sonar/pom.xml
index 387ff8181acf196d867f89eac4824892baa7006c..61f63c33140c5895bbc891e705bc99e51a55da84 100644 (file)
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -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>

diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index a05d12696da215df3edea8876da5f0f1df8841f0..522325a5db882ad82b0abb809c02091d48efcfcb 100644 (file)
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -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>