From f917c5915cbf08f82c249e31eb4a99c2559cf9f8 Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Sun, 4 Nov 2018 10:44:31 +1300
Subject: Fix missing charset issue (fix #4126)

---
 pom.xml          | 13 -------------
 setup/package.sh |  4 ++--
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index f1d93cdc0..373958e71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -165,19 +165,6 @@
             <artifactId>jxls</artifactId>
             <version>2.4.6</version>
         </dependency>
-
-        <!-- temporary solution before jxls-poi is updated -->
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>4.0.0</version>
-        </dependency>
-
         <dependency>
             <groupId>org.jxls</groupId>
             <artifactId>jxls-poi</artifactId>
diff --git a/setup/package.sh b/setup/package.sh
index 451543152..09a2c28a9 100755
--- a/setup/package.sh
+++ b/setup/package.sh
@@ -129,7 +129,7 @@ package_other () {
 package_windows () {
   info "Building Windows 64 installer"
   unzip -q -o java-*.windows.x86_64.zip
-  jlink --module-path java-*.windows.x86_64/jmods --add-modules java.se.ee --output out/jre
+  jlink --module-path java-*.windows.x86_64/jmods --add-modules java.se.ee,jdk.charsets --output out/jre
   rm -rf java-*.windows.x86_64
   wine app/ISCC.exe traccar.iss >/dev/null
   rm -rf out/jre
@@ -143,7 +143,7 @@ package_linux () {
   cp traccar.service out
 
   unzip -q -o jdk-*-linux-$1.zip
-  jlink --module-path jdk-*-linux-$1/jmods --add-modules java.se.ee --output out/jre
+  jlink --module-path jdk-*-linux-$1/jmods --add-modules java.se.ee,jdk.charsets --output out/jre
   rm -rf jdk-*-linux-$1
   makeself --quiet --notemp out traccar.run "traccar" ./setup.sh
   rm -rf out/jre
-- 
cgit v1.2.3