minor cleanup

This commit is contained in:
eugenp 2015-10-11 15:08:45 +03:00
parent ef7bd85b51
commit 93eddd516d
3 changed files with 25 additions and 4 deletions

View File

@ -179,6 +179,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>${maven-compiler-plugin.version}</version>
<configuration> <configuration>
<source>${java-version}</source> <source>${java-version}</source>
<target>${java-version}</target> <target>${java-version}</target>
@ -188,6 +189,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin> </plugin>
<plugin> <plugin>
@ -211,6 +213,22 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${maven-surefire-plugin.version}</version>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
<excludes>
<exclude>**/*IntegrationTest.java</exclude>
<exclude>**/*LiveTest.java</exclude>
</excludes>
<systemPropertyVariables>
<!-- <provPersistenceTarget>h2</provPersistenceTarget> -->
</systemPropertyVariables>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
@ -235,8 +253,11 @@
<!-- guava --> <!-- guava -->
<guava.version>18.0</guava.version> <guava.version>18.0</guava.version>
<!-- maven --> <!-- Maven plugins -->
<cargo-maven2-plugin.version>1.4.15</cargo-maven2-plugin.version> <cargo-maven2-plugin.version>1.4.16</cargo-maven2-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-war-plugin.version>2.6</maven-war-plugin.version>
<maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
</properties> </properties>

View File

@ -27,7 +27,7 @@ import com.jayway.restassured.specification.RequestSpecification;
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = { ConfigTest.class, PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class) @ContextConfiguration(classes = { ConfigTest.class, PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class)
public class ChangePasswordApiTest { public class ChangePasswordLiveTest {
private final String URL_PREFIX = "http://localhost:8080/spring-security-login-and-registration"; private final String URL_PREFIX = "http://localhost:8080/spring-security-login-and-registration";
private final String URL = URL_PREFIX + "/user/updatePassword"; private final String URL = URL_PREFIX + "/user/updatePassword";

View File

@ -26,7 +26,7 @@ import org.springframework.transaction.annotation.Transactional;
@ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class) @ContextConfiguration(classes = { TestConfig.class }, loader = AnnotationConfigContextLoader.class)
@Transactional @Transactional
@TransactionConfiguration @TransactionConfiguration
public class SpringSecurityRolesTest { public class SpringSecurityRolesIntegrationTest {
@Autowired @Autowired
private UserRepository userRepository; private UserRepository userRepository;