Merge branch 'master' into pr/884-tim

2016-12-08 22:28:12 +01:00
parent f3b79ff214 d13f274bb3
commit e75e0097a3
278 changed files with 8629 additions and 2390 deletions
@@ -11,8 +11,9 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.4.0.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <version>1.4.2.RELEASE</version>
+        <relativePath/>
+        <!-- lookup parent from repository -->
    </parent>

    <dependencies>
@@ -48,12 +49,20 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
                </configuration>
            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>**/*ControllerTest.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
        </plugins>
    </build>
 </project>