From a15fc5b3dc286ee0747b7ff2262390da886d0516 Mon Sep 17 00:00:00 2001
From: litongjava <litongjava@qq.com>
Date: Thu, 23 Nov 2023 17:26:14 -1000
Subject: [PATCH] switch to jdk 1.8

---
 .github/workflows/build.yml | 91 +++++++++++++++++++------------------
 pom.xml                     | 14 ++++--
 readme.md                   |  1 +
 3 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e5146ab..69004fb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,44 +1,47 @@
-name: Java CI with Maven and Java FX
-
-on:
-  push:
-    branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
-
-jobs:
-  build_windows:
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'oracle'
-          cache: maven
-
-      - name: Download and Extract Models
-        run: |
-          Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_det_infer-onnx.zip" -OutFile "model_det.zip"
-          Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_rec_infer-onnx.zip" -OutFile "model_rec.zip"
-          mkdir models\ch_PP-OCRv4_det_infer
-          mkdir models\ch_PP-OCRv4_rec_infer
-          Expand-Archive "model_det.zip" -DestinationPath "models\ch_PP-OCRv4_det_infer"
-          Expand-Archive "model_rec.zip" -DestinationPath "models\ch_PP-OCRv4_rec_infer"
-
-      - name: Copy Models
-        run: |
-          mkdir target\jfx\app
-          xcopy models target\jfx\app /E /I
-
-
-      - name: Build with Maven
-        run: mvn jfx:native -DskipTests
-
-      - name: Upload package
-        uses: actions/upload-artifact@v3
-        with:
-          name: treehole-windows-2.2.8.msi
-          path: target\jfx\native\treehole-2.2.8.msi
\ No newline at end of file
+#name: Java CI with Maven and Java FX
+#
+#on:
+#  push:
+#    branches: [ "master" ]
+#  pull_request:
+#    branches: [ "master" ]
+#
+#jobs:
+#  build_windows:
+#    runs-on: windows-latest
+#
+#    steps:
+#      - uses: actions/checkout@v3
+#      - name: Set up JDK 8
+#        uses: actions/setup-java@v3
+#        with:
+#          java-version: '8'
+#          distribution: 'oracle'
+#          cache: maven
+#
+#      - name: Download and Extract Models
+#        run: |
+#          Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_det_infer-onnx.zip" -OutFile "model_det.zip"
+#          Invoke-WebRequest -Uri "https://github.com/litongjava/tools-ocr/releases/download/model-ppocr-v4/ch_PP-OCRv4_rec_infer-onnx.zip" -OutFile "model_rec.zip"
+#          mkdir models\ch_PP-OCRv4_det_infer
+#          mkdir models\ch_PP-OCRv4_rec_infer
+#          Expand-Archive "model_det.zip" -DestinationPath "models\ch_PP-OCRv4_det_infer"
+#          Expand-Archive "model_rec.zip" -DestinationPath "models\ch_PP-OCRv4_rec_infer"
+#
+#      - name: Copy Models
+#        run: |
+#          mkdir target\jfx\app
+#          xcopy models target\jfx\app /E /I
+#
+#
+#      - name: Build with Maven
+#        run: mvn jfx:native -DskipTests
+#
+#      - name : Show Native Files
+#        run : dir target\jfx\native
+#          -
+#      - name: Upload package
+#        uses: actions/upload-artifact@v3
+#        with:
+#          name: treehole-windows-2.2.8.msi
+#          path: target\jfx\native\treehole-2.2.8.msi
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 8ba41df..ba47252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,17 +99,17 @@
 <!--    <dependency>-->
 <!--      <groupId>org.openjfx</groupId>-->
 <!--      <artifactId>javafx-controls</artifactId>-->
-<!--      <version>11</version>-->
+<!--      <version>17</version>-->
 <!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>org.openjfx</groupId>-->
 <!--      <artifactId>javafx-swing</artifactId>-->
-<!--      <version>11</version>-->
+<!--      <version>17</version>-->
 <!--    </dependency>-->
 <!--    <dependency>-->
 <!--      <groupId>org.openjfx</groupId>-->
 <!--      <artifactId>javafx-fxml</artifactId>-->
-<!--      <version>11</version>-->
+<!--      <version>17</version>-->
 <!--    </dependency>-->
 
 
@@ -153,6 +153,14 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.openjfx</groupId>
+        <artifactId>javafx-maven-plugin</artifactId>
+        <version>0.0.8</version>
+        <configuration>
+          <mainClass>${main.class}</mainClass>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>com.zenjava</groupId>
         <artifactId>javafx-maven-plugin</artifactId>
diff --git a/readme.md b/readme.md
index 8bbb492..fe3baf7 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,7 @@
 # 树洞 OCR 文字识别
 一款跨平台的 OCR 小工具,调用本地OCR进行识别,无需联网即可使用
 用到的技术和框架
+- jdk 1.8
 - djl
 - pytorch
 - onnx