From ba13bd01403baf91268261ccea5e9b5449bf5fe1 Mon Sep 17 00:00:00 2001
From: David Horwitz <dhorwitz@gmail.com>
Date: Fri, 26 Jun 2015 08:05:35 +0200
Subject: [PATCH] SAK-29573 poi 3.12

---
 assignment/assignment-impl/impl/pom.xml        | 2 +-
 gradebook/app/ui/pom.xml                       | 4 ++--
 jsf/jsf-spreadsheet/pom.xml                    | 2 +-
 master/pom.xml                                 | 1 +
 roster2/pom.xml                                | 2 +-
 samigo/samigo-app/pom.xml                      | 4 ++--
 search/search-impl/impl/pom.xml                | 7 +++----
 signup/pom.xml                                 | 2 +-
 site-manage/site-association-tool/tool/pom.xml | 2 +-
 sitestats/pom.xml                              | 3 +--
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/assignment/assignment-impl/impl/pom.xml b/assignment/assignment-impl/impl/pom.xml
index 8c970786408b..1d8a2c19d2f8 100644
--- a/assignment/assignment-impl/impl/pom.xml
+++ b/assignment/assignment-impl/impl/pom.xml
@@ -100,7 +100,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.11</version>
+            <version>${sakai.poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
diff --git a/gradebook/app/ui/pom.xml b/gradebook/app/ui/pom.xml
index 9f5fdad3ad9d..3746024772fd 100644
--- a/gradebook/app/ui/pom.xml
+++ b/gradebook/app/ui/pom.xml
@@ -285,12 +285,12 @@
     <dependency>
     	<groupId>org.apache.poi</groupId>
     	<artifactId>poi</artifactId>
-    	<version>3.11</version>    
+    	<version>${sakai.poi.version}</version>    
     </dependency>
      <dependency>
     	<groupId>org.apache.poi</groupId>
     	<artifactId>poi-ooxml</artifactId>
-    	<version>3.11</version>    
+    	<version>${sakai.poi.version}</version>    
     </dependency>
   </dependencies>
 
diff --git a/jsf/jsf-spreadsheet/pom.xml b/jsf/jsf-spreadsheet/pom.xml
index 7d86f2944c13..8be0313655c8 100644
--- a/jsf/jsf-spreadsheet/pom.xml
+++ b/jsf/jsf-spreadsheet/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
         	<groupId>org.apache.poi</groupId>
         	<artifactId>poi</artifactId>
-        	<version>3.11</version>
+        	<version>${sakai.poi.version}</version>
         </dependency>
         <dependency>
             <groupId>com.lowagie</groupId>
diff --git a/master/pom.xml b/master/pom.xml
index c5d05ed341d3..0dfecf0930c9 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -119,6 +119,7 @@
     <sakai.xerces.api.version>2.6.2</sakai.xerces.api.version>
     <sakai.log4j.version>1.2.17</sakai.log4j.version>
     <sakai.slf4j.version>1.7.5</sakai.slf4j.version>
+    <sakai.poi.version>3.12</sakai.poi.version>
     <rsfutil.version>0.8.1-SNAPSHOT</rsfutil.version>
     <sakairsf.components.version>11-SNAPSHOT</sakairsf.components.version>
     <sakairsf.version>11-SNAPSHOT</sakairsf.version>
diff --git a/roster2/pom.xml b/roster2/pom.xml
index 7bacf956451e..fca8fdb8d44a 100644
--- a/roster2/pom.xml
+++ b/roster2/pom.xml
@@ -143,7 +143,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>${poi.version}</version>
+			<version>${sakai.poi.version}</version>
 		</dependency>
         <dependency>
 			<groupId>org.projectlombok</groupId>
diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml
index 8d55315fe313..8949cdec7f8a 100644
--- a/samigo/samigo-app/pom.xml
+++ b/samigo/samigo-app/pom.xml
@@ -207,12 +207,12 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.11</version>
+            <version>${sakai.poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>3.11</version>
+            <version>${sakai.poi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
diff --git a/search/search-impl/impl/pom.xml b/search/search-impl/impl/pom.xml
index 2b7f32ab9d77..9b46f6dc3e29 100644
--- a/search/search-impl/impl/pom.xml
+++ b/search/search-impl/impl/pom.xml
@@ -28,7 +28,6 @@
             </dependencies>
             <properties>
                 <maven.test.jvmargs />
-                <poi.version>3.11</poi.version>
                 <lucene.version>4.5.0</lucene.version>
                 <bouncycastle.artifact.version>jdk16</bouncycastle.artifact.version>
             </properties>
@@ -137,19 +136,19 @@
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
-      <version>${poi.version}</version>
+      <version>${sakai.poi.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-ooxml</artifactId>
-      <version>${poi.version}</version>
+      <version>${sakai.poi.version}</version>
       <type>jar</type>
     </dependency>
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi-scratchpad</artifactId>
-      <version>${poi.version}</version>
+      <version>${sakai.poi.version}</version>
       <type>jar</type>
     </dependency>
     <!-- As Tika is uses PDFbox the 2 versions need to 
diff --git a/signup/pom.xml b/signup/pom.xml
index fd8b6f831b8c..4d0d61b88eca 100644
--- a/signup/pom.xml
+++ b/signup/pom.xml
@@ -146,7 +146,7 @@
 			<dependency>
 				<groupId>org.apache.poi</groupId>
 				<artifactId>poi</artifactId>
-				<version>3.11</version>
+				<version>${sakai.poi.version}</version>
 				<scope>compile</scope>
 			</dependency>
 			<dependency>
diff --git a/site-manage/site-association-tool/tool/pom.xml b/site-manage/site-association-tool/tool/pom.xml
index 14ada728ad1b..13d84f959189 100644
--- a/site-manage/site-association-tool/tool/pom.xml
+++ b/site-manage/site-association-tool/tool/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>3.10.1</version>
+            <version>${sakai.poi.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/sitestats/pom.xml b/sitestats/pom.xml
index 65b7e1080715..c655c8d06f5c 100644
--- a/sitestats/pom.xml
+++ b/sitestats/pom.xml
@@ -31,7 +31,6 @@
     <mysql.version>5.1.25</mysql.version>
     <!-- <ojdbc.version>10.2.0.2.0</ojdbc.version> -->
     <fop.version>1.0</fop.version>
-    <poi.version>3.11</poi.version>
     <jfreechart.version>1.0.5</jfreechart.version>
     <sst.wicket.version>6.20.0</sst.wicket.version>
   </properties>
@@ -141,7 +140,7 @@
       <dependency>
         <groupId>org.apache.poi</groupId>
         <artifactId>poi</artifactId>
-        <version>${poi.version}</version>
+        <version>${sakai.poi.version}</version>
       </dependency>
       <!-- Apache Wicket -->
       <dependency>