Switch to 3.15-beta1 in the sonar-build-files as well

Add a bit more cleanup and removal of old libs

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

diff --git a/build.xml b/build.xml
index 1c39959fae4c70f671a9cef15ade3b3fa672d1be..b116b936971cdc7ba443124fc722f8a90da3897c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -421,6 +421,14 @@ under the License.
 
     <target name="clean" description="Remove generated artefacts">
         <delete dir="build"/>
+        <delete includeemptydirs="true">
+            <fileset dir="sonar">
+                <include name="*/xmlbeans.marker"/>
+                <include name="*/target/**"/>
+                <include name="*/build/**"/>
+                <include name="*/src/**"/>
+            </fileset>
+        </delete>
     </target>
 
     <target name="testexist">
@@ -454,11 +462,13 @@ under the License.
                 <include name="org.jacoco.*-0.7.1*"/>
                 <include name="org.jacoco.*-0.7.2*"/>
                 <include name="org.jacoco.*-0.7.3*"/>
+                <include name="org.jacoco.*-0.7.4*"/>
                 <include name="dom4j*"/>
                 <include name="apache-rat-0.10*"/>
                 <include name="xercesImpl-*.jar"/>
                 <include name="junit-3*"/>
                 <include name="junit-4.11*"/>
+                <include name="findbugs-*-2.0.3*"/>
                <include name="forbiddenapis-1.*.jar"/>
             </fileset>
                <fileset dir="${ooxml.lib}">

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 61f596fd1b61576892197e8a574194e23aee0c31..adf819f2c09f2ed5527ac3933d94c1052531b40f 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-examples</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 8f1baddb302eb7c16e2a61785211139c193e2ace..d87e512f2d5eab2d9dcfabad0f922033c52da91a 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-excelant</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 2df74832edd9a9c59400c7192d7d19a48b2b4b8f..41ed60992a118cbc0328d804ba49d967abd6f0d0 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-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 835f644b0816f12b4dcfb26b1e2056f481aff2fe..625d43b8f1f15431f91b2830758febbb9b481965 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-encryption</artifactId>

diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
index 0b2dfbacbb9fe8ca17d3d86811289cf99724f502..351774d7c35b8d6c182057ecca362a47dfa940d8 100644 (file)
--- a/sonar/ooxml-schema-security/pom.xml
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi-parent</artifactId>
-        <version>3.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema-security</artifactId>

diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index bcdd049f0c5ff51c43099774605daf5dbf1eee38..db390a26e62a2eee70d1e144dc0a2ea43bb27f68 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema</artifactId>

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 743da6279d84406a625e616d7ce539ae296d94cc..25559380c10d2cd1381d639920971ec6ece26d37 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-ooxml</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/pom.xml b/sonar/pom.xml
index 1e8b96b2a073e2cfdd0abfa5e5483240a307a872..19061e98dee93bdebe554f9998b4db5478fe6299 100644 (file)
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -3,7 +3,7 @@
        <groupId>org.apache.poi</groupId>
        <artifactId>poi-parent</artifactId>
        <packaging>pom</packaging>
-       <version>3.14-beta1-SNAPSHOT</version>
+       <version>3.15-beta1-SNAPSHOT</version>
        <name>Apache POI - the Java API for Microsoft Documents</name>
        <description>Maven build of Apache POI for Sonar checks</description>
        <url>http://poi.apache.org/</url>

diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index d689694dbe4ded8fa4c10a40acdebdb3c6ed6069..5a3c8b74160a1fe189aae06beb7fe4cc5bbd635a 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.14-beta1-SNAPSHOT</version>
+        <version>3.15-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-scratchpad</artifactId>
     <packaging>jar</packaging>