diff --git a/falsework-client/pom.xml b/falsework-client/pom.xml index 1db2b6a..92d6439 100644 --- a/falsework-client/pom.xml +++ b/falsework-client/pom.xml @@ -8,7 +8,6 @@ 1.0-SNAPSHOT 4.0.0 - falsework-client @@ -16,6 +15,8 @@ 8 10.9 1.8 + 8.0.2 + 8.0.10 @@ -34,21 +35,21 @@ jfoenix ${jfoenix.version} system - ${basedir}/libs/jfoenix-8.0.10.jar + ${pom.basedir}/libs/jfoenix-8.0.10.jar datafx-flow datafx-flow ${datafx.version} system - ${basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar + ${pom.basedir}/libs/datafx-flow-8.0.2-SNAPSHOT.jar tilesfx tilesfx 1.6.8 system - ${basedir}/libs/tilesfx-1.6.8.jar + ${pom.basedir}/libs/tilesfx-1.6.8.jar @@ -56,21 +57,21 @@ datafx-injection ${datafx.version} system - ${basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar + ${pom.basedir}/libs/datafx-injection-8.0.2-SNAPSHOT.jar datafx-eventsystem datafx-eventsystem ${datafx.version} system - ${basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar + ${pom.basedir}/libs/datafx-eventsystem-8.0.2-SNAPSHOT.jar datafx-core datafx-core ${datafx.version} system - ${basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar + ${pom.basedir}/libs/datafx-core-8.0.2-SNAPSHOT.jar javax.inject diff --git a/falsework-client/src/test/java/TableViewSample.java b/falsework-client/src/test/java/TableViewSample.java index e2a1a6d..e6b5900 100644 --- a/falsework-client/src/test/java/TableViewSample.java +++ b/falsework-client/src/test/java/TableViewSample.java @@ -1,4 +1,3 @@ -import com.epri.fx.server.vo.UserVO; import javafx.application.Application; import javafx.beans.property.IntegerProperty; import javafx.beans.property.ListProperty; diff --git a/falsework-sever/pom.xml b/falsework-sever/pom.xml index 73fc7e8..777ae0f 100644 --- a/falsework-sever/pom.xml +++ b/falsework-sever/pom.xml @@ -104,7 +104,7 @@ DmJdbcDriver 1.0.0 system - ${basedir}/libs/DmJdbcDriver-1.0.0.jar + ${pom.basedir}/libs/DmJdbcDriver-1.0.0.jar commons-codec @@ -116,7 +116,7 @@ pinyin4j 2.5.0 system - ${basedir}/libs/pinyin4j-2.5.0.jar + ${pom.basedir}/libs/pinyin4j-2.5.0.jar @@ -134,6 +134,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.2 + + true + + diff --git a/pom.xml b/pom.xml index 072ef35..f7ff2d9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,6 @@ - 4.0.0 org.epri @@ -10,7 +11,7 @@ falsework-client - falsework-client + falsework-sever 1.8 @@ -29,6 +30,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.1 ${java.version} ${java.version}