From e9876165d3b5eb8181c4ad1189b1a26cf9afa643 Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Fri, 15 Sep 2017 18:39:37 +0000
Subject: [PATCH] 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
---
 sonar/examples/pom.xml                |  2 +-
 sonar/excelant/pom.xml                |  4 ++--
 sonar/main/pom.xml                    |  2 +-
 sonar/ooxml-schema-encryption/pom.xml |  2 +-
 sonar/ooxml-schema-security/pom.xml   |  2 +-
 sonar/ooxml-schema/pom.xml            |  2 +-
 sonar/ooxml/pom.xml                   | 13 ++++++-------
 sonar/pom.xml                         |  6 +++---
 sonar/scratchpad/pom.xml              |  2 +-
 9 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 955a11759..2f7657886 100644
--- 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 da39b407c..624360160 100644
--- 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 b8fdf05a4..0695148dd 100644
--- 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 f88490204..b05d0b044 100644
--- 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 ac7e4fa56..e1d3daa45 100644
--- 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 24221f8c9..cbe50d65a 100644
--- 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 bcbe99520..ed10f74b0 100644
--- 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 b10831c91..b49b9457b 100644
--- 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 12bc99556..570d73857 100644
--- 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>