|
@@ -96,12 +96,15 @@
|
|
|
<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>
|
|
|
<maven-surefire.version>2.22.1</maven-surefire.version>
|
|
|
+ <argline>-server -Xms256m -Xmx512m -Dfile.encoding=UTF-8
|
|
|
+ -Djava.net.preferIPv4Stack=true -XX:MetaspaceSize=64m -XX:MaxMetaspaceSize=128m
|
|
|
+ </argline>
|
|
|
</properties>
|
|
|
|
|
|
<modules>
|
|
@@ -370,15 +373,39 @@
|
|
|
</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>
|
|
|
+ <id>jacoco-initialize</id>
|
|
|
+ <goals>
|
|
|
+ <goal>prepare-agent</goal>
|
|
|
+ </goals>
|
|
|
+ <configuration>
|
|
|
+ <propertyName>jacocoArgLine</propertyName>
|
|
|
+ </configuration>
|
|
|
+ </execution>
|
|
|
+ <execution>
|
|
|
+ <id>report-aggregate</id>
|
|
|
+ <phase>verify</phase>
|
|
|
+ <goals>
|
|
|
+ <goal>report-aggregate</goal>
|
|
|
+ </goals>
|
|
|
+ </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>${argline} ${jacocoArgLine}</argLine>
|
|
|
+ <systemProperties>
|
|
|
+ <!-- common shared -->
|
|
|
+ </systemProperties>
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
<!-- javadoc -->
|
|
@@ -401,30 +428,6 @@
|
|
|
</configuration>
|
|
|
</plugin>
|
|
|
</plugins>
|
|
|
- <sourceDirectory>src/main/java</sourceDirectory>
|
|
|
- <testSourceDirectory>src/test/java</testSourceDirectory>
|
|
|
- <resources>
|
|
|
- <resource>
|
|
|
- <directory>src/main/resources</directory>
|
|
|
- <includes>
|
|
|
- <include>**/*</include>
|
|
|
- </includes>
|
|
|
- <excludes>
|
|
|
- <exclude>**/.svn/</exclude>
|
|
|
- </excludes>
|
|
|
- </resource>
|
|
|
- </resources>
|
|
|
- <testResources>
|
|
|
- <testResource>
|
|
|
- <directory>src/test/resources</directory>
|
|
|
- <includes>
|
|
|
- <include>**/*</include>
|
|
|
- </includes>
|
|
|
- <excludes>
|
|
|
- <exclude>**/.svn/</exclude>
|
|
|
- </excludes>
|
|
|
- </testResource>
|
|
|
- </testResources>
|
|
|
<pluginManagement>
|
|
|
<plugins>
|
|
|
<plugin>
|