From 60a3f2bc64b7a5f502e4133ced31f0b25c88d3f1 Mon Sep 17 00:00:00 2001
From: Hunter0x7c7 <1125607007@qq.com>
Date: 星期四, 12 九月 2024 14:57:03 +0800
Subject: [PATCH] 版本v1.0.2(3)发布。
---
pom.xml | 88 ++++++++++++++++++++++++++------------------
1 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/pom.xml b/pom.xml
index f507727..1459e00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>com.github.hunter0x7c7</groupId>
<artifactId>SyncTools</artifactId>
- <version>1.0.1.RELEASE</version>
+ <version>1.0.2.RELEASE</version>
<packaging>war</packaging>
<name>SyncTools</name>
@@ -15,14 +15,15 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <maven.compiler.source>9</maven.compiler.source>
+ <maven.compiler.target>9</maven.compiler.target>
<junit.version>5.3.1</junit.version>
+ <javafx.version>11</javafx.version>
<lombok.version>1.18.2</lombok.version>
- <jetty.version>2.3.0</jetty.version>
- <slf4j.version>1.8.0-beta2</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
+ <!--<jetty.version>2.3.0</jetty.version>-->
+ <!--<slf4j.version>1.8.0-beta2</slf4j.version>-->
+ <!--<log4j.version>1.2.17</log4j.version>-->
<retrofit.version>2.3.0</retrofit.version>
<rxjava.version>1.1.8</rxjava.version>
@@ -30,7 +31,7 @@
<gson.version>2.8.2</gson.version>
<okhttp.version>3.4.1</okhttp.version>
- <common-data.version>0.2.8</common-data.version>
+ <!--<common-data.version>0.2.8</common-data.version>-->
</properties>
@@ -44,18 +45,18 @@
</snapshots>
</repository>-->
- <!--<repository>
- <id>nexus</id>
- <name>nexus</name>
+ <repository>
+ <id>public_maven</id>
+ <name>public_maven</name>
<url>http://www.zgleiju.com:8964/nexus/repository/public_maven/</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
- </repository>-->
+ </repository>
</repositories>
- <!--灏嗛」鐩墦鍖呮垚exe瀹夎鍖�-->
+ <!--灏嗛」鐩墦鍖呮垚exe瀹夎鍖� mvn package-->
<build>
<plugins>
<plugin>
@@ -79,8 +80,8 @@
<!-- 绮剧畝鐗坖re -->
<bundleJre>true</bundleJre>
<!-- 缁戝畾鑷畾涔塉RE璺緞 -->
- <!--<jrePath>D:\Develop\Java\jdk-9.0.1\jre</jrePath>-->
- <jrePath>/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/jre</jrePath>
+ <jrePath>D:\Develop\Java\jdk-9.0.1\jre</jrePath>
+ <!--<jrePath>/Library/Java/JavaVirtualMachines/jre-9.0.1.jre/Contents/Home</jrePath>-->
<!-- 鐢熸垚瀹夎鍖� -->
<generateInstaller>false</generateInstaller>
<!-- 涓嶄娇鐢ㄧ鐞嗗憳韬唤鎵撳紑绋嬪簭 -->
@@ -88,12 +89,12 @@
<!-- 灏嗘寚瀹氭枃浠跺す鍖呭惈鍒扮敓鎴愮殑绋嬪簭璺緞 -->
<!-- 鎵嬪姩寮曞叆棰濆璧勬簮-->
<additionalResources>
- <!--<additionalResource>F:\workspace_java\JavaFx\SyncTools\libs</additionalResource>-->
- <additionalResource>/Users/hunter/workspace/JavaFx/SyncTools/lib</additionalResource>
- </additionalResources>
- <!-- 褰撳墠鎵撳寘鐨勫钩鍙� -->
- <platform>mac</platform>
- <name>SyncToolsV1.0.1</name>
+ <additionalResource>F:\workspace_java\JavaFx\SyncTools\libs</additionalResource>
+ <!--<additionalResource>/Users/hunter/workspace/JavaFx/SyncTools/lib</additionalResource>-->
+ </additionalResources>
+ <!-- 褰撳墠鎵撳寘鐨勫钩鍙� -->
+ <platform>windows</platform>
+ <name>SyncTools</name>
<!-- exe 鍚嶇О锛岄�氳繃寮曠敤鐨勬柟寮� -->
<displayName>${project.name}</displayName>
<!-- 铏氭嫙鏈哄弬鏁� -->
@@ -102,21 +103,24 @@
<vmArg>-Dfile.encoding=GBK</vmArg><!-- 瑙ｅ喅鎵撳寘涔嬪悗鎵樼洏涔辩爜 -->
</vmArgs>
<!-- 鐗瑰畾骞冲彴鍙傛暟 -->
- <!--<winConfig>
+ <winConfig>
<icoFile>
F:\workspace_java\JavaFx\SyncTools\src\main\deploy\package\windows\SyncTools.ico
</icoFile>
<generateSetup>false</generateSetup>
<generateMsi>false</generateMsi>
<generateMsm>false</generateMsm>
- </winConfig>-->
+ </winConfig>
<!--<linuxConfig></linuxConfig>-->
- <macConfig>
- <!-- 杞欢鍥炬爣 -->
+ <!--<macConfig>
+ <appId>com.github.hunter0x7c7.SyncTools</appId>
<icnsFile>
/Users/hunter/workspace/JavaFx/SyncTools/src/main/deploy/package/mac/SyncTools.icns
</icnsFile>
- </macConfig>
+ <generateDmg>false</generateDmg>
+ <generatePkg>false</generatePkg>
+ <relocateJar>false</relocateJar>
+ </macConfig>-->
</configuration>
</execution>
</executions>
@@ -130,14 +134,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<!--<configuration>
- <source>8</source>
- <target>8</target>
+ <source>8</source>
+ <target>8</target>
</configuration>-->
<configuration>
<verbose>true</verbose>
<fork>true</fork>
- <!--<executable>D:\Develop\Java\jdk-9.0.1\bin\javac</executable>-->
- <executable>/Library/Java/JavaVirtualMachines/jdk1.8.0_101.jdk/Contents/Home/bin/javac</executable>
+ <executable>D:\Develop\Java\jdk-9.0.1\bin\javac</executable>
+ <!--<executable>/Library/Java/JavaVirtualMachines/jdk-9.0.1.jdk/Contents/Home/bin/javac</executable>-->
</configuration>
</plugin>
</plugins>
@@ -152,6 +156,18 @@
<scope>test</scope>
</dependency>
+ <!-- JavaFx -->
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-base</artifactId>
+ <version>${javafx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.openjfx</groupId>
+ <artifactId>javafx-fxml</artifactId>
+ <version>${javafx.version}</version>
+ </dependency>
+
<!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
@@ -161,7 +177,7 @@
</dependency>
<!-- Log -->
- <dependency>
+ <!--<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
@@ -175,7 +191,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>${slf4j.version}</version>
- </dependency>
+ </dependency>-->
<!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server -->
<!-- <dependency>
@@ -238,14 +254,14 @@
<version>${common-data.version}</version>
</dependency>-->
<!-- apache io鎿嶄綔閫氱敤jar鍖� -->
- <dependency>
+ <!--<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
- </dependency>
+ </dependency>-->
<!-- httpclient 鏀寔jar -->
- <dependency>
+ <!--<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.3.5</version>
@@ -254,9 +270,9 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.3.5</version>
- </dependency>
+ </dependency>-->
-
+ <!-- SQL Server -->
<dependency>
<groupId>com.microsoft.sqlserver</groupId>
<artifactId>mssql-jdbc</artifactId>
--
Gitblit v1.9.1