Update to POI 3.17

joniles · joniles · commit 498248ab7260 · 2017-09-18T12:27:45.000+01:00
diff --git a/.classpath b/.classpath
@@ -8,7 +8,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/sqlite-jdbc-3.8.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/rtfparserkit-1.10.0.jar"/>
-	<classpathentry kind="lib" path="lib/poi-3.16.jar"/>
 	<classpathentry kind="lib" path="lib/commons-collections4-4.1.jar"/>
+	<classpathentry kind="lib" path="lib/poi-3.17.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## 6.2.0 (git master)
+* Updated to use POI 3.17.
+* Improve accuracy of calendar exception dates read from XER files and P6 database.
 
 ## 6.1.2 (12/09/2017)
 * Gracefully handle incomplete records in XER files.
diff --git a/build.xml b/build.xml
@@ -40,7 +40,7 @@
 		-->
 		<property name="target-jvm-version" value="1.6" />
 
-		<property name="poi.jar" value="poi-3.16" />
+		<property name="poi.jar" value="poi-3.17" />
 		<path id="poi.path">
 			<pathelement location="${lib.dir}/${poi.jar}.jar" />
 		</path>
diff --git a/lib/poi-3.17.jar b/lib/poi-3.17.jar
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -26,7 +26,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>3.16</version>
+			<version>3.17</version>
 		</dependency>
 
 		<dependency>
diff --git a/maven/src/changes/changes.xml b/maven/src/changes/changes.xml
@@ -6,7 +6,8 @@
 	</properties>
 	<body>
 		<release date="git master" version="6.2.0">
-		<action dev="joniles" type="update">Improve accuracy of calendar exception dates read from XER files and P6 database.</action>
+			<action dev="joniles" type="update">Updated to use POI 3.17.</action>
+			<action dev="joniles" type="update">Improve accuracy of calendar exception dates read from XER files and P6 database.</action>
 	    </release>
 	    <release date="12/09/2017" version="6.1.2">
 	    	<action dev="joniles" type="update">Gracefully handle incomplete records in XER files.</action>
diff --git a/src.net/MpxjConvert/MpxjConvert.csproj b/src.net/MpxjConvert/MpxjConvert.csproj
@@ -148,8 +148,8 @@
     <Reference Include="mpxj-for-csharp">
       <HintPath>..\..\lib.net\mpxj-for-csharp.dll</HintPath>
     </Reference>
-    <Reference Include="poi-3.16">
-      <HintPath>..\..\lib.net\poi-3.16.dll</HintPath>
+    <Reference Include="poi-3.17">
+      <HintPath>..\..\lib.net\poi-3.17.dll</HintPath>
     </Reference>
     <Reference Include="commons-collections4-4.1">
       <HintPath>..\..\lib.net\commons-collections4-4.1.dll</HintPath>
diff --git a/src.net/MpxjCreate/MpxjCreate/MpxjCreate.csproj b/src.net/MpxjCreate/MpxjCreate/MpxjCreate.csproj
@@ -126,8 +126,8 @@
     <Reference Include="mpxj-for-csharp">
       <HintPath>..\..\..\lib.net\mpxj-for-csharp.dll</HintPath>
     </Reference>
-    <Reference Include="poi-3.16">
-      <HintPath>..\..\..\lib.net\poi-3.16.dll</HintPath>
+    <Reference Include="poi-3.17">
+      <HintPath>..\..\..\lib.net\poi-3.17.dll</HintPath>
     </Reference>
     <Reference Include="rtfparserkit-1.10.0">
       <HintPath>..\..\..\lib.net\rtfparserkit-1.10.0.dll</HintPath>
diff --git a/src.net/MpxjQuery/MpxjQuery.csproj b/src.net/MpxjQuery/MpxjQuery.csproj
@@ -150,8 +150,8 @@
     <Reference Include="MpxjUtilities">
       <HintPath>..\..\lib.net\MpxjUtilities.dll</HintPath>
     </Reference>
-    <Reference Include="poi-3.16">
-      <HintPath>..\..\lib.net\poi-3.16.dll</HintPath>
+    <Reference Include="poi-3.17">
+      <HintPath>..\..\lib.net\poi-3.17.dll</HintPath>
     </Reference>
     <Reference Include="commons-collections4-4.1">
       <HintPath>..\..\lib.net\commons-collections4-4.1.dll</HintPath>
diff --git a/src.net/MpxjTest/MpxjTest.csproj b/src.net/MpxjTest/MpxjTest.csproj
@@ -154,8 +154,8 @@
     <Reference Include="mpxj-test">
       <HintPath>..\..\lib.net\mpxj-test.dll</HintPath>
     </Reference>
-    <Reference Include="poi-3.16">
-      <HintPath>..\..\lib.net\poi-3.16.dll</HintPath>
+    <Reference Include="poi-3.17">
+      <HintPath>..\..\lib.net\poi-3.17.dll</HintPath>
     </Reference>
     <Reference Include="commons-collections4-4.1">
       <HintPath>..\..\lib.net\commons-collections4-4.1.dll</HintPath>
diff --git a/src/net/sf/mpxj/mpp/ProjectPropertiesReader.java b/src/net/sf/mpxj/mpp/ProjectPropertiesReader.java
@@ -26,15 +26,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import net.sf.mpxj.Day;
-import net.sf.mpxj.MPXJException;
-import net.sf.mpxj.ProjectFile;
-import net.sf.mpxj.ProjectProperties;
-import net.sf.mpxj.Rate;
-import net.sf.mpxj.ScheduleFrom;
-import net.sf.mpxj.TimeUnit;
-import net.sf.mpxj.common.NumberHelper;
-
 import org.apache.poi.hpsf.CustomProperties;
 import org.apache.poi.hpsf.CustomProperty;
 import org.apache.poi.hpsf.DocumentSummaryInformation;
@@ -44,6 +35,15 @@
 import org.apache.poi.poifs.filesystem.DocumentEntry;
 import org.apache.poi.poifs.filesystem.DocumentInputStream;
 
+import net.sf.mpxj.Day;
+import net.sf.mpxj.MPXJException;
+import net.sf.mpxj.ProjectFile;
+import net.sf.mpxj.ProjectProperties;
+import net.sf.mpxj.Rate;
+import net.sf.mpxj.ScheduleFrom;
+import net.sf.mpxj.TimeUnit;
+import net.sf.mpxj.common.NumberHelper;
+
 /**
  * This class reads project properties data from MPP8, MPP9, and MPP12 files.
  */
@@ -126,7 +126,7 @@ public void process(ProjectFile file, Props props, DirectoryEntry rootDir) throw
          CustomProperties customProperties = documentSummaryInformation.getCustomProperties();
          if (customProperties != null)
          {
-            for (CustomProperty property : customProperties.values())
+            for (CustomProperty property : customProperties.properties())
             {
                customPropertiesMap.put(property.getName(), property.getValue());
             }
