Updating library dependencies to modern versions

This commit is contained in:
Brendan Robert 2021-04-02 15:08:12 -05:00
parent 6ede1e27ed
commit 0be1b6fe3e
2 changed files with 20 additions and 20 deletions

View File

@ -5,7 +5,7 @@
<artifactId>OutlawEditor</artifactId>
<name>OutlawEditor</name>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
<version>2.0-SNAPSHOT</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<mainClass>org.badvision.outlaweditor.Application</mainClass>
@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
<version>1.24.0</version>
<version>1.26.4</version>
<executions>
<execution>
<id>generate-scr-scrdescriptor</id>
@ -40,7 +40,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version>
<version>5.1.2</version>
<extensions>true</extensions>
<configuration>
<instructions>
@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>3.1.2</version>
<executions>
<execution>
<id>unpack-dependencies</id>
@ -79,7 +79,7 @@
</manifest>
</archive>
</configuration>
<version>3.0.2</version>
<version>3.2.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@ -88,12 +88,12 @@
<source>1.8</source>
<target>1.8</target>
</configuration>
<version>3.6.1</version>
<version>3.8.1</version>
</plugin>
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.13.2</version>
<version>0.14.0</version>
<executions>
<execution>
<goals>
@ -113,7 +113,7 @@
<plugin>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.11.1</version>
<version>0.12.0</version>
</plugin>
</plugins>
</configuration>
@ -128,24 +128,24 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<version>4.13.2</version>
<scope>test</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2_commons</groupId>
<artifactId>jaxb2-basics</artifactId>
<version>0.11.1</version>
<version>0.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>5.6.4</version>
<version>5.6.10</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<version>5.6.4</version>
<version>5.6.10</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@ -155,22 +155,22 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<version>2.0.12</version>
<version>2.1.26</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.16</version>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.16</version>
<version>5.0.0</version>
</dependency>
<dependency>
<groupId>org.controlsfx</groupId>
<artifactId>controlsfx</artifactId>
<version>8.40.15</version>
<version>8.40.18</version>
</dependency>
</dependencies>
</project>

View File

@ -307,13 +307,13 @@ public class DataUtilities {
public static String getStringValueFromCell(Cell cell) {
switch (cell.getCellType()) {
case Cell.CELL_TYPE_BOOLEAN:
case BOOLEAN:
return Boolean.toString(cell.getBooleanCellValue());
case Cell.CELL_TYPE_BLANK:
case BLANK:
return null;
case Cell.CELL_TYPE_NUMERIC:
case NUMERIC:
return Double.toString(cell.getNumericCellValue());
case Cell.CELL_TYPE_STRING:
case STRING:
return cell.getStringCellValue();
default:
return "???";