DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-17 21:15:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed merge conflict post maven release

Browse source
This commit is contained in:
Justin Bankes 2016-07-15 01:25:12 -07:00
commit 69ab98a78c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pom.xml
View file

@ -48,7 +48,8 @@
<scm> <scm>
<developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection> <developerConnection>scm:git:https://github.com/liatrio/spring-petclinic/</developerConnection>
</scm> <tag>HEAD</tag>
</scm>
<dependencyManagement> <dependencyManagement>
<!-- Import the maven Spring IO Platform Bill Of Materials (BOM) --> <!-- Import the maven Spring IO Platform Bill Of Materials (BOM) -->
@ -305,7 +306,7 @@
<version>3.0</version> <version>3.0</version>
<configuration> <configuration>
<compilerArguments> <compilerArguments>
<Xlint/> <Xlint />
</compilerArguments> </compilerArguments>
<verbose>true</verbose> <verbose>true</verbose>
<source>${java.version}</source> <source>${java.version}</source>
@ -382,7 +383,7 @@
<artifactId>cobertura-maven-plugin</artifactId> <artifactId>cobertura-maven-plugin</artifactId>
<version>${cobertura.version}</version> <version>${cobertura.version}</version>
<configuration> <configuration>
<check/> <check />
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -412,7 +413,7 @@
<formats> <formats>
<format>html</format> <format>html</format>
</formats> </formats>
<check/> <check />
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>