Permalink
Browse files

Configuration update, test coverage fixed

Signed-off-by: Indrek Jentson <indrek.jentson@cgi.com>
  • Loading branch information...
Indrek Jentson
Indrek Jentson committed Jul 3, 2017
1 parent f033bd1 commit fb3ef6ef444968c3aca7b04dbe993a5fcb8767ea
Showing with 47 additions and 29 deletions.
  1. +1 −0 .gitignore
  2. +1 −4 .idea/misc.xml
  3. +45 −25 pom.xml
View
@@ -7,3 +7,4 @@ javadoc
*.log
utility-package-lib
zip-package-lib
/buildNumber.properties
View
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CppTools.Loader" reportImplicitCastToBool="false" reportNameReferencedOnce="false" version="3" compilerSelect="AUTO" />
<component name="EntryPointsManager">
<entry_points version="2.0" />
</component>
<component name="FindBugsConfigurable">
<option name="make" value="true" />
<option name="effort" value="default" />
@@ -57,7 +54,7 @@
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="false" project-jdk-name="1.7" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
<output url="file://$PROJECT_DIR$/build" />
</component>
<component name="SuppressionsComponent">
<option name="suppComments" value="[]" />
View
70 pom.xml
@@ -6,7 +6,7 @@
<groupId>org.digidoc4j</groupId>
<artifactId>digidoc4j</artifactId>
<packaging>jar</packaging>
<version>1.0.6.RC.1</version>
<version>1.0.6.RC.1.${buildNumber}</version>
<name>DigiDoc4j</name>
<description>DigiDoc4j is a Java library for digitally signing documents and creating digital signature containers of signed documents</description>
<url>https://github.com/open-eid/digidoc4j</url>
@@ -77,6 +77,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
<argLine>@{argLine} -Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>
<plugin>
@@ -101,29 +102,35 @@
<id>test-coverage</id>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<testFailureIgnore>true</testFailureIgnore>
</configuration>
</plugin>
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<configuration>
<destFile>${project.basedir}/target/jacoco-unit.exec</destFile>
<dataFile>${project.basedir}/target/jacoco-unit.exec</dataFile>
</configuration>
<executions>
<execution>
<id>prepare-unit-tests</id>
<id>prepare-unit-test-agent</id>
<phase>process-test-classes</phase>
<goals>
<goal>prepare-agent</goal>
</goals>
<configuration>
<destFile>${project.basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
</configuration>
</execution>
<execution>
<id>jacoco-site</id>
<phase>verify</phase>
<id>generate-unit-test-report</id>
<phase>package</phase>
<goals>
<goal>merge</goal>
<goal>report</goal>
</goals>
<configuration>
<dataFile>${project.basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
</configuration>
</execution>
</executions>
</plugin>
@@ -566,7 +573,29 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.4</version>
<executions>
<execution>
<id>buildnumber</id>
<phase>validate</phase>
<goals>
<goal>create</goal>
</goals>
</execution>
</executions>
<configuration>
<format>{0,number}</format>
<items>
<item>buildNumber</item>
</items>
<doCheck>false</doCheck>
<doUpdate>false</doUpdate>
<revisionOnScmFailure>unknownbuild</revisionOnScmFailure>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -668,6 +697,10 @@
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.7.9</version>
<configuration>
<destFile>${project.basedir}/target/jacoco-unit.exec</destFile>
<dataFile>${project.basedir}/target/jacoco-unit.exec</dataFile>
</configuration>
<executions>
<execution>
<id>prepare-unit-test-agent</id>
@@ -682,19 +715,6 @@
<goal>report</goal>
</goals>
</execution>
<execution>
<id>prepare-integration-test-agent</id>
<goals>
<goal>prepare-agent-integration</goal>
</goals>
</execution>
<execution>
<id>generate-integration-test-report</id>
<goals>
<goal>merge</goal>
<goal>report-integration</goal>
</goals>
</execution>
</executions>
</plugin>
@@ -707,7 +727,7 @@
<additionalClasspathElement>${project.basedir}/lib/esteidtestcerts.jar</additionalClasspathElement>
</additionalClasspathElements>
<!-- Default test configuration -->
<argLine>-Dfile.encoding=UTF-8</argLine>
<argLine>@{argLine} -Dfile.encoding=UTF-8</argLine>
</configuration>
</plugin>

0 comments on commit fb3ef6e

Please sign in to comment.