|
|
@@ -163,6 +163,7 @@
|
|
|
|
|
|
<build>
|
|
|
<plugins>
|
|
|
+
|
|
|
<plugin>
|
|
|
<groupId>org.springframework.boot</groupId>
|
|
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
@@ -176,7 +177,7 @@
|
|
|
<configuration>
|
|
|
<source>1.8</source>
|
|
|
<target>1.8</target>
|
|
|
-<<<<<<< HEAD
|
|
|
+ <!--
|
|
|
<webResources>
|
|
|
<resource>
|
|
|
<directory>${project.basedir}/libs</directory>
|
|
|
@@ -187,8 +188,7 @@
|
|
|
</includes>
|
|
|
</resource>
|
|
|
</webResources>
|
|
|
-=======
|
|
|
->>>>>>> upstream/master
|
|
|
+ -->
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
|
|
|
@@ -196,6 +196,7 @@
|
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
|
|
</plugin>
|
|
|
+
|
|
|
</plugins>
|
|
|
</build>
|
|
|
</project>
|
Lawrence