Merge pull request #29 from SKART1/IMP-26-maven-for-trabis

Imp 26 maven for travis
This commit is contained in:
Samuel Carlsson 2016-08-01 14:39:53 +02:00 committed by GitHub
commit 7371e0a890
6 changed files with 36 additions and 6 deletions

32
pom.xml
View File

@ -27,6 +27,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.target>1.7</maven.compiler.target>
<maven.compiler.source>1.7</maven.compiler.source>
</properties>
@ -65,6 +66,7 @@
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.4.2</version>
<configuration>
@ -84,17 +86,45 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.5</version>
<version>2.19.1</version>
<configuration>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<!--Integration tests -->
<exclude>se.vidstige.jadb.test.integration.*</exclude>
<!--Mocks and data-->
<exclude>**/data/*</exclude>
<exclude>**/fakes/*</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<includes>
<include>**/*.java</include>
</includes>
<excludes>
<!--Integration tests -->
<exclude>se.vidstige.jadb.test.unit.*</exclude>
<!--Mocks and data-->
<exclude>**/data/*</exclude>
<exclude>**/fakes/*</exclude>
</excludes>
</configuration>
<executions>
<execution>
<goals>
<goal>integration-test</goal>
<goal>verify</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

View File

@ -1,4 +1,4 @@
package se.vidstige.jadb.test;
package se.vidstige.jadb.test.integration;
import org.junit.Before;
import org.junit.BeforeClass;

View File

@ -1,4 +1,4 @@
package se.vidstige.jadb.test;
package se.vidstige.jadb.test.integration;
import org.junit.Before;
import org.junit.BeforeClass;

View File

@ -1,4 +1,4 @@
package se.vidstige.jadb.test;
package se.vidstige.jadb.test.unit;
import org.junit.Assert;
import org.junit.Test;

View File

@ -1,4 +1,4 @@
package se.vidstige.jadb.test;
package se.vidstige.jadb.test.unit;
import org.junit.Assert;
import org.junit.Test;

View File

@ -1,4 +1,4 @@
package se.vidstige.jadb.test;
package se.vidstige.jadb.test.unit;
import org.junit.After;
import org.junit.Assert;