|
@@ -96,8 +96,8 @@
|
|
|
<maven.test.skip>true</maven.test.skip>
|
|
|
<downloadSources>true</downloadSources>
|
|
|
<!-- compiler settings properties -->
|
|
|
- <java_source_version>1.7</java_source_version>
|
|
|
- <java_target_version>1.7</java_target_version>
|
|
|
+ <java_source_version>1.8</java_source_version>
|
|
|
+ <java_target_version>1.<8/java_target_version>
|
|
|
<file_encoding>UTF-8</file_encoding>
|
|
|
<spring_version>3.2.18.RELEASE</spring_version>
|
|
|
<maven-jacoco-plugin.version>0.8.3</maven-jacoco-plugin.version>
|
|
@@ -370,15 +370,42 @@
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
<plugin>
|
|
|
- <groupId>org.codehaus.mojo</groupId>
|
|
|
- <artifactId>cobertura-maven-plugin</artifactId>
|
|
|
- <version>2.7</version>
|
|
|
+ <groupId>org.jacoco</groupId>
|
|
|
+ <artifactId>jacoco-maven-plugin</artifactId>
|
|
|
+ <version>${maven-jacoco-plugin.version}</version>
|
|
|
+ <executions>
|
|
|
+ <execution>
|
|
|
+ <goals>
|
|
|
+ <goal>prepare-agent</goal>
|
|
|
+ </goals>
|
|
|
+ <configuration>
|
|
|
+ <destFile>
|
|
|
+ ${project.build.directory}/coverage-reports/jacoco.exec
|
|
|
+ </destFile>
|
|
|
+ <propertyName>jacocoArgLine</propertyName>
|
|
|
+ </configuration>
|
|
|
+ </execution>
|
|
|
+ <execution>
|
|
|
+ <id>report</id>
|
|
|
+ <phase>test</phase>
|
|
|
+ <goals>
|
|
|
+ <goal>report</goal>
|
|
|
+ </goals>
|
|
|
+ <configuration>
|
|
|
+ <dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
|
|
|
+ <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
|
|
|
+ </configuration>
|
|
|
+ </execution>
|
|
|
+ </executions>
|
|
|
+ </plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
+ <artifactId>maven-surefire-plugin</artifactId>
|
|
|
+ <version>${maven-surefire.version}</version>
|
|
|
<configuration>
|
|
|
- <formats>
|
|
|
- <format>html</format>
|
|
|
- <format>xml</format>
|
|
|
- </formats>
|
|
|
- <check />
|
|
|
+ <useSystemClassLoader>true</useSystemClassLoader>
|
|
|
+ <forkMode>once</forkMode>
|
|
|
+ <argLine>${jacocoArgLine}</argLine>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
<!-- javadoc -->
|