jiazhizhong/fx-falsework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整到可以正常打包

Browse Source
This commit is contained in:
杨朝晖
2021-01-10 14:00:55 +08:00
parent a5eb082efa
commit 6fa352c50b
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
falsework-client/pom.xml
View File

@@ -8,7 +8,6 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>falsework-client</artifactId> <artifactId>falsework-client</artifactId>
<properties> <properties>
@@ -16,6 +15,8 @@
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>8</maven.compiler.target>
<feign.version>10.9</feign.version> <feign.version>10.9</feign.version>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<datafx.version>8.0.2</datafx.version>
<jfoenix.version>8.0.10</jfoenix.version>
</properties> </properties>
@@ -34,21 +35,21 @@
<artifactId>jfoenix</artifactId> <artifactId>jfoenix</artifactId>
<version>${jfoenix.version}</version> <version>${jfoenix.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/jfoenix-8.0.10.jar</systemPath> <systemPath>${pom.basedir}/libs/jfoenix-8.0.10.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>datafx-flow</groupId> <groupId>datafx-flow</groupId>
<artifactId>datafx-flow</artifactId> <artifactId>datafx-flow</artifactId>
<version>${datafx.version}</version> <version>${datafx.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar</systemPath> <systemPath>${pom.basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>tilesfx</groupId> <groupId>tilesfx</groupId>
<artifactId>tilesfx</artifactId> <artifactId>tilesfx</artifactId>
<version>1.6.8</version> <version>1.6.8</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/tilesfx-1.6.8.jar</systemPath> <systemPath>${pom.basedir}/libs/tilesfx-1.6.8.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
@@ -56,21 +57,21 @@
<artifactId>datafx-injection</artifactId> <artifactId>datafx-injection</artifactId>
<version>${datafx.version}</version> <version>${datafx.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar</systemPath> <systemPath>${pom.basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>datafx-eventsystem</groupId> <groupId>datafx-eventsystem</groupId>
<artifactId>datafx-eventsystem</artifactId> <artifactId>datafx-eventsystem</artifactId>
<version>${datafx.version}</version> <version>${datafx.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar</systemPath> <systemPath>${pom.basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>datafx-core</groupId> <groupId>datafx-core</groupId>
<artifactId>datafx-core</artifactId> <artifactId>datafx-core</artifactId>
<version>${datafx.version}</version> <version>${datafx.version}</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar</systemPath> <systemPath>${pom.basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.inject</groupId> <groupId>javax.inject</groupId>

1
falsework-client/src/test/java/TableViewSample.java
View File

@@ -1,4 +1,3 @@
import com.epri.fx.server.vo.UserVO;
import javafx.application.Application; import javafx.application.Application;
import javafx.beans.property.IntegerProperty; import javafx.beans.property.IntegerProperty;
import javafx.beans.property.ListProperty; import javafx.beans.property.ListProperty;

12
falsework-sever/pom.xml
View File

@@ -104,7 +104,7 @@
<artifactId>DmJdbcDriver</artifactId> <artifactId>DmJdbcDriver</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/DmJdbcDriver-1.0.0.jar</systemPath> <systemPath>${pom.basedir}/libs/DmJdbcDriver-1.0.0.jar</systemPath>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
@@ -116,7 +116,7 @@
<artifactId>pinyin4j</artifactId> <artifactId>pinyin4j</artifactId>
<version>2.5.0</version> <version>2.5.0</version>
<scope>system</scope> <scope>system</scope>
<systemPath>${basedir}/libs/pinyin4j-2.5.0.jar</systemPath> <systemPath>${pom.basedir}/libs/pinyin4j-2.5.0.jar</systemPath>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -134,6 +134,14 @@
</excludes> </excludes>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>

6
pom.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.epri</groupId> <groupId>org.epri</groupId>
@@ -10,7 +11,7 @@
<modules> <modules>
<module>falsework-client</module> <module>falsework-client</module>
<module>falsework-client</module> <module>falsework-sever</module>
</modules> </modules>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
@@ -29,6 +30,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration> <configuration>
<source>${java.version}</source> <source>${java.version}</source>
<target>${java.version}</target> <target>${java.version}</target>