diff options
| author | Tharre <tharre3@gmail.com> | 2018-05-11 15:49:43 +0200 |
|---|---|---|
| committer | Tharre <tharre3@gmail.com> | 2018-05-11 15:49:43 +0200 |
| commit | f7d14a76123911f0bced08356a0c69e61147cb1b (patch) | |
| tree | a75b0baa891453a14046c78503603d21986126c5 /pom.xml | |
| parent | acd6b64e494192f7c73032240029bfa53dccb362 (diff) | |
| parent | 5298356db60cd971fed686d379130102843db819 (diff) | |
| download | sepm-groupproject-f7d14a76123911f0bced08356a0c69e61147cb1b.tar.gz sepm-groupproject-f7d14a76123911f0bced08356a0c69e61147cb1b.tar.xz sepm-groupproject-f7d14a76123911f0bced08356a0c69e61147cb1b.zip | |
Merge branch 'develop'
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 27 |
1 files changed, 23 insertions, 4 deletions
@@ -25,6 +25,8 @@ <junit.version>4.12</junit.version> <mockito.version>2.18.0</mockito.version> <google-java-format.version>1.5</google-java-format.version> + <testfx.version>4.0.13-alpha</testfx.version> + <dbunit.version>2.5.1</dbunit.version> <!-- plugins --> <maven-surefire-plugin.version>2.21.0</maven-surefire-plugin.version> <maven-shade-plugin.version>3.1.1</maven-shade-plugin.version> @@ -65,13 +67,13 @@ <version>${auto-value.version}</version> <scope>provided</scope> </dependency> - <!-- runtime dependencies --> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <version>${h2.version}</version> - <scope>runtime</scope> + <scope>compile</scope> </dependency> + <!-- runtime dependencies --> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> @@ -102,6 +104,23 @@ <artifactId>google-java-format</artifactId> <version>${google-java-format.version}</version> </dependency> + <dependency> + <groupId>org.testfx</groupId> + <artifactId>testfx-core</artifactId> + <version>${testfx.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.testfx</groupId> + <artifactId>testfx-junit</artifactId> + <version>${testfx.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.dbunit</groupId> + <artifactId>dbunit</artifactId> + <version>${dbunit.version}</version> + </dependency> </dependencies> <build> @@ -112,8 +131,8 @@ <version>${maven-surefire-plugin.version}</version> <configuration> <!-- enable parallel test runs --> - <parallel>methods</parallel> - <threadCount>10</threadCount> + <!--parallel>methods</parallel--> + <!--threadCount>10</threadCount--> <!-- discover all *.java files --> <includes> <include>*.java</include> |