From 4c0a70f3001e676d77c77273280e75a872e63ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E7=B2=BE=E5=8D=8E?= <842761733@qq.com>
Date: Wed, 31 Jul 2019 11:58:20 +0800
Subject: [PATCH] =?UTF-8?q?2.2.0=E8=BF=AD=E4=BB=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                                | 4 ++--
 jodconverter-web/pom.xml                  | 2 +-
 jodconverter-web/src/main/bin/startup.bat | 2 +-
 jodconverter-web/src/main/bin/startup.sh  | 2 +-
 pom.xml                                   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a089650b..84af31f1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,5 +27,5 @@ RUN yum install -y kde-l10n-Chinese &&\
 	mkfontdir &&\
 	fc-cache -fv
 ENV LC_ALL zh_CN.UTF-8
-ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-2.1.2/bin
-ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.1.2/conf/application.properties","-jar","/opt/kkFileView-2.1.2/bin/kkFileView-2.1.2.jar"]
\ No newline at end of file
+ENV KKFILEVIEW_BIN_FOLDER /opt/kkFileView-2.2.0-SNAPSHOT/bin
+ENTRYPOINT ["java","-Dfile.encoding=UTF-8","-Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider","-Dspring.config.location=/opt/kkFileView-2.2.0-SNAPSHOT/conf/application.properties","-jar","/opt/kkFileView-2.2.0-SNAPSHOT/bin/kkFileView-2.2.0-SNAPSHOT.jar"]
\ No newline at end of file
diff --git a/jodconverter-web/pom.xml b/jodconverter-web/pom.xml
index 07d5b1fe..736e418d 100644
--- a/jodconverter-web/pom.xml
+++ b/jodconverter-web/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>kkFileView</artifactId>
-    <version>2.1.2</version>
+    <version>2.2.0-SNAPSHOT</version>
 
 
     <properties>
diff --git a/jodconverter-web/src/main/bin/startup.bat b/jodconverter-web/src/main/bin/startup.bat
index 49a0eb71..637e330c 100644
--- a/jodconverter-web/src/main/bin/startup.bat
+++ b/jodconverter-web/src/main/bin/startup.bat
@@ -4,4 +4,4 @@ cd "%KKFILEVIEW_BIN_FOLDER%"
 echo Using KKFILEVIEW_BIN_FOLDER %KKFILEVIEW_BIN_FOLDER%
 echo Starting kkFileView...
 echo Please check log file for more information
-java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\conf\application.properties -jar kkFileView-2.1.2.jar -> ..\log\kkFileView.log
\ No newline at end of file
+java -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=..\conf\application.properties -jar kkFileView-2.2.0-SNAPSHOT.jar -> ..\log\kkFileView.log
\ No newline at end of file
diff --git a/jodconverter-web/src/main/bin/startup.sh b/jodconverter-web/src/main/bin/startup.sh
index 7185c62f..f97cef26 100644
--- a/jodconverter-web/src/main/bin/startup.sh
+++ b/jodconverter-web/src/main/bin/startup.sh
@@ -27,4 +27,4 @@ else
 fi
 echo "Starting kkFileView..."
 echo "Please check log file for more information"
-nohup java -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../conf/application.properties -jar kkFileView-2.1.2.jar > ../log/kkFileView.log 2>&1 &
+nohup java -Dfile.encoding=UTF-8 -Dsun.java2d.cmm=sun.java2d.cmm.kcms.KcmsServiceProvider -Dspring.config.location=../conf/application.properties -jar kkFileView-2.2.0-SNAPSHOT.jar > ../log/kkFileView.log 2>&1 &
diff --git a/pom.xml b/pom.xml
index 61519a4f..3a9663e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>cn.keking</groupId>
     <artifactId>filepreview</artifactId>
-    <version>2.1.2</version>
+    <version>2.2.0-SNAPSHOT</version>
     <modules>
         <module>jodconverter-core</module>
         <module>jodconverter-web</module>