Adjust Maven pom.xml for 4.0, Java 8 and newer third party libs

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

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 955a11759b6681a742690e97594b0ca9a8c79376..2f7657886c3b93ecb4dc5d400fc39ca365f3a4d3 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-examples</artifactId>
     <packaging>jar</packaging>

diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index da39b407cffb32046d965e4049930c537af54c14..624360160bc3cf7a54ccc6f502ee2004a4a7d391 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-excelant</artifactId>
     <packaging>jar</packaging>
@@ -108,7 +108,7 @@
                <dependency>
                        <groupId>org.apache.ant</groupId>
                        <artifactId>ant</artifactId>
-                       <version>1.8.2</version>
+                       <version>1.10.1</version>
         </dependency>
     </dependencies>
 </project>

diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index b8fdf05a4da24d09b19c6f4304373284058a97e3..0695148ddb87484203799a3998f811c3ae539e7b 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-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 f8849020400371c7c60f782ebe2ce7146a02ac8f..b05d0b044f535b3200aa3c646b1bc566b13bdb4c 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-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 ac7e4fa5609d29e36370095679887bbd5cc6ff1f..e1d3daa45961302b58861dc5b90fa5ea7f8e15c8 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-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 24221f8c9cc8d71fa86d280d1b563d5eb9d04cb1..cbe50d65a05275f000c416faaf24d93cc69244f3 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-beta1-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     <artifactId>poi-ooxml-schema</artifactId>

diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index bcbe99520fa1373593692b50b94c8dc410290979..ed10f74b0cd345c7bba42c7d58c779017cb65041 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-ooxml</artifactId>
     <packaging>jar</packaging>
@@ -142,17 +142,17 @@
                <dependency>
                        <groupId>org.bouncycastle</groupId>
                        <artifactId>bcprov-jdk15on</artifactId>
-                       <version>1.54</version>
+                       <version>1.58</version>
                </dependency>
                <dependency>
                        <groupId>org.apache.santuario</groupId>
                        <artifactId>xmlsec</artifactId>
-                       <version>2.0.5</version>
+                       <version>2.1.0</version>
                </dependency>
                <dependency>
                        <groupId>com.github.virtuald</groupId>
                        <artifactId>curvesapi</artifactId>
-                       <version>1.04</version>
+                       <version>1.05</version>
                </dependency>
   
                <!-- non-test dependency for OOXMLLite -->
@@ -162,17 +162,16 @@
             <version>${junit.version}</version>
         </dependency>
 
-        <!-- Keep using 1.15 until we switch to Java 7 -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-core</artifactId>
-            <version>1.15</version>
+            <version>1.19</version>
                        <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
             <artifactId>jmh-generator-annprocess</artifactId>
-            <version>1.15</version>
+            <version>1.19</version>
                        <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/sonar/pom.xml b/sonar/pom.xml
index b10831c91e56ad2bde901b0f1925828c429cc667..b49b9457bdc450fcd88edb99555d82fd0e5cc7d1 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.18-beta1-SNAPSHOT</version>
+       <version>4.0-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>
@@ -81,8 +81,8 @@
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>3.5.1</version>
                                        <configuration>
-                                               <source>1.6</source>
-                                               <target>1.6</target>
+                                               <source>1.8</source>
+                                               <target>1.8</target>
                                        </configuration>
                                </plugin>
                        </plugins>

diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index 12bc99556b9160913ec864769a2abc76cd1be7a7..570d73857a0f6c59e78f9468368e10ea22022741 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.18-beta1-SNAPSHOT</version>
+        <version>4.0-beta1-SNAPSHOT</version>
     </parent>
     <artifactId>poi-scratchpad</artifactId>
     <packaging>jar</packaging>