Merge pull request #320 from OHDSI/release-0.10.6

Release 0.10.6

Author: Maxim Moinat

docs/index.html

@@ -325,9 +325,9 @@ <h1>Features</h1>
 <li>Rabbit in a Hat generates ETL specification document according to OMOP templatement according to OMOP template</li>
 </ul>
 </div>
-<div id="current-version" class="section level1">
-<h1>Current version</h1>
-<p><a href="https://github.com/OHDSI/WhiteRabbit/releases/latest"><strong>v0.10.4</strong></a></p>
+<div id="latest-version" class="section level1">
+<h1>Latest version</h1>
+<p><a href="https://github.com/OHDSI/WhiteRabbit/releases/latest"><strong>v0.10.6</strong></a></p>
 </div>
 
 

docs/index.md

@@ -20,5 +20,5 @@ It comes with **RabbitInAHat**, an application for interactive design of an ETL
 - Interactive tool (Rabbit in a Hat) for designing the ETL using the scan report as basis
 - Rabbit in a Hat generates ETL specification document according to OMOP templatement according to OMOP template
 
-# Current version
-[**v0.10.4**](https://github.com/OHDSI/WhiteRabbit/releases/latest)
+# Latest version
+[**v0.10.6**](https://github.com/OHDSI/WhiteRabbit/releases/latest)

pom.xml

@@ -6,7 +6,7 @@
     <groupId>org.ohdsi</groupId>
     <artifactId>leporidae</artifactId>
     <packaging>pom</packaging>
-    <version>0.10.5</version>
+    <version>0.10.6</version>
     <modules>
         <module>rabbitinahat</module>
         <module>whiterabbit</module>

rabbit-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.5</version>
+        <version>0.10.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,47 +30,49 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.23</version>
+            <version>8.0.25</version>
         </dependency>
         <dependency>
             <groupId>org.dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>2.1.3</version>
         </dependency>
+        <!-- Note: Apache poi v5.x is current incompatible with the QuickAndDirtyXLSReader-->
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
-            <version>5.0.0</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-ooxml</artifactId>
-            <version>5.0.0</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi-excelant</artifactId>
-            <version>5.0.0</version>
+            <version>4.1.2</version>
         </dependency>
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.2</version>
         </dependency>
+        <!-- Note: Apache xmlbeans v4.x and v5.x is incompatible with Apache poi v4-->
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
-            <version>5.0.1</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.2.19</version>
+            <version>42.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.cedarsoftware</groupId>
             <artifactId>json-io</artifactId>
-            <version>4.12.0</version>
+            <version>4.13.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -90,12 +92,12 @@
         <dependency>
             <groupId>org.hsqldb</groupId>
             <artifactId>hsqldb</artifactId>
-            <version>2.5.1</version>
+            <version>2.6.1</version>
         </dependency>
         <dependency>
             <groupId>com.healthmarketscience.jackcess</groupId>
             <artifactId>jackcess</artifactId>
-            <version>4.0.0</version>
+            <version>4.0.1</version>
         </dependency>
         <dependency>
             <groupId>net.sf.ucanaccess</groupId>
@@ -105,7 +107,7 @@
         <dependency>
             <groupId>com.amazon.redshift</groupId>
             <artifactId>redshift-jdbc42</artifactId>
-            <version>2.1.0.1</version>
+            <version>2.1.0.2</version>
         </dependency>
         <dependency>
             <groupId>com.teradata.jdbc</groupId>

rabbit-core/src/main/java/org/ohdsi/ooxml/ReadXlsxFileWithHeader.java

@@ -83,7 +83,7 @@ public Row next() {
 			List<String> cells = new ArrayList<String>(fieldName2ColumnIndex.size());
 			for (Cell cell : iterator.next()) {
 				String text;
-				if (cell.getCellType().equals(CellType.NUMERIC))
+				if (cell.getCellTypeEnum() == CellType.NUMERIC)
 					text = myFormatter.format(cell.getNumericCellValue());
 				else
 					text = cell.toString();

rabbitinahat/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.5</version>
+        <version>0.10.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

rabbitinahat/src/main/java/org/ohdsi/rabbitInAHat/RabbitInAHatMain.java

@@ -88,7 +88,7 @@ public class RabbitInAHatMain implements ResizeListener {
 	public final static String		ACTION_UNMARK_COMPLETED				= "Mark Highlighted As Incomplete";
 	public final static String		ACTION_HELP							= "Open documentation";
 
-	public final static String DOCUMENTATION_URL = "http://ohdsi.github.io/WhiteRabbit";
+	public final static String DOCUMENTATION_URL = "http://ohdsi.github.io/WhiteRabbit/RabbitInAHat.html";
 	private final static FileFilter FILE_FILTER_GZ = new FileNameExtensionFilter("GZIP Files (*.gz)", "gz");
 	private final static FileFilter FILE_FILTER_JSON = new FileNameExtensionFilter("JSON Files (*.json)", "json");
 	private final static FileFilter FILE_FILTER_DOCX = new FileNameExtensionFilter("Microsoft Word documents (*.docx)", "docx");

whiterabbit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>leporidae</artifactId>
         <groupId>org.ohdsi</groupId>
-        <version>0.10.5</version>
+        <version>0.10.6</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>