diff options
| -rw-r--r-- | champ-lib/champ-core/pom.xml | 6 | ||||
| -rw-r--r-- | champ-lib/champ-janus/pom.xml | 70 | ||||
| -rw-r--r-- | champ-lib/champ-titan/pom.xml | 70 | ||||
| -rw-r--r-- | champ-lib/pom.xml | 87 | ||||
| -rw-r--r-- | champ-service/pom.xml | 3 | ||||
| -rwxr-xr-x | pom.xml | 32 |
6 files changed, 50 insertions, 218 deletions
diff --git a/champ-lib/champ-core/pom.xml b/champ-lib/champ-core/pom.xml index ada6905..5779296 100644 --- a/champ-lib/champ-core/pom.xml +++ b/champ-lib/champ-core/pom.xml @@ -32,6 +32,12 @@ limitations under the License. <groupId>org.onap.aai.champ.champ-lib</groupId> <artifactId>champ-core</artifactId> + + <properties> + <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in + coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> + <jacoco.line.coverage.limit>0.81</jacoco.line.coverage.limit> + </properties> <dependencies> <!-- Event Bus Library. --> diff --git a/champ-lib/champ-janus/pom.xml b/champ-lib/champ-janus/pom.xml index ab808b2..6d714df 100644 --- a/champ-lib/champ-janus/pom.xml +++ b/champ-lib/champ-janus/pom.xml @@ -35,6 +35,9 @@ limitations under the License. <properties> <tinkerpop.version>3.2.3</tinkerpop.version> + <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in + coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> + <jacoco.line.coverage.limit>0.65</jacoco.line.coverage.limit> </properties> <dependencies> @@ -112,73 +115,6 @@ limitations under the License. <build> <plugins> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <rules> - <!-- implementation is needed only for Maven 2 --> - <rule implementation="org.jacoco.maven.RuleConfiguration"> - <element>BUNDLE</element> - <limits> - <!-- implementation is needed only for Maven 2 --> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>INSTRUCTION</counter> - <value>COVEREDRATIO</value> - <minimum>.15</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>BRANCH</counter> - <value>COVEREDRATIO</value> - <minimum>.14</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>COMPLEXITY</counter> - <value>COVEREDRATIO</value> - <minimum>.15</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>LINE</counter> - <value>COVEREDRATIO</value> - <minimum>.18</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>METHOD</counter> - <value>COVEREDRATIO</value> - <minimum>.10</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>CLASS</counter> - <value>MISSEDCOUNT</value> - <maximum>2</maximum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> diff --git a/champ-lib/champ-titan/pom.xml b/champ-lib/champ-titan/pom.xml index a08305d..b3a446d 100644 --- a/champ-lib/champ-titan/pom.xml +++ b/champ-lib/champ-titan/pom.xml @@ -34,6 +34,9 @@ limitations under the License. <properties> <tinkerpop.version>3.0.1-incubating</tinkerpop.version> + <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in + coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> + <jacoco.line.coverage.limit>0.72</jacoco.line.coverage.limit> </properties> <dependencies> @@ -123,73 +126,6 @@ limitations under the License. <build> <plugins> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <rules> - <!-- implementation is needed only for Maven 2 --> - <rule implementation="org.jacoco.maven.RuleConfiguration"> - <element>BUNDLE</element> - <limits> - <!-- implementation is needed only for Maven 2 --> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>INSTRUCTION</counter> - <value>COVEREDRATIO</value> - <minimum>.15</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>BRANCH</counter> - <value>COVEREDRATIO</value> - <minimum>.14</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>COMPLEXITY</counter> - <value>COVEREDRATIO</value> - <minimum>.15</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>LINE</counter> - <value>COVEREDRATIO</value> - <minimum>.18</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>METHOD</counter> - <value>COVEREDRATIO</value> - <minimum>.10</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>CLASS</counter> - <value>MISSEDCOUNT</value> - <maximum>2</maximum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-deploy-plugin</artifactId> <configuration> diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml index e734607..e21c16f 100644 --- a/champ-lib/pom.xml +++ b/champ-lib/pom.xml @@ -48,6 +48,9 @@ limitations under the License. <!--this, simply remove the "-SNAPSHOT" from your <version> declaration at the--> <!--top of pom.xml –>--> <!--<distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot>--> + <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in + coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> + <jacoco.line.coverage.limit>0.79</jacoco.line.coverage.limit> </properties> <dependencies> @@ -57,95 +60,11 @@ limitations under the License. <version>4.12</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jacoco</groupId> - <artifactId>org.jacoco.agent</artifactId> - <version>0.7.9</version> - <classifier>runtime</classifier> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - <version>0.7.9</version> - <configuration> - <excludes> - <!-- These three need to be included again at some point --> - <exclude>**/AbstractGremlinChampGraph*</exclude> - <exclude>**/DseChampGraphImpl*</exclude> - <exclude>**/DseChampformer*</exclude> - <!-- Permanently excluded, not worth testing --> - <exclude>**/ChampAPIPerformanceTest*</exclude> - </excludes> - </configuration> - <executions> - <execution> - <id>default-prepare-agent</id> - <goals> - <goal>prepare-agent</goal> - </goals> - </execution> - <execution> - <id>default-report</id> - <phase>prepare-package</phase> - <goals> - <goal>report</goal> - </goals> - </execution> - <execution> - <id>default-check</id> - <goals> - <goal>check</goal> - </goals> - <configuration> - <rules> - <!-- implementation is needed only for Maven 2 --> - <rule implementation="org.jacoco.maven.RuleConfiguration"> - <element>BUNDLE</element> - <limits> - <!-- implementation is needed only for Maven 2 --> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>INSTRUCTION</counter> - <value>COVEREDRATIO</value> - <minimum>.15</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>BRANCH</counter> - <value>COVEREDRATIO</value> - <minimum>.12</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>COMPLEXITY</counter> - <value>COVEREDRATIO</value> - <minimum>.15</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>LINE</counter> - <value>COVEREDRATIO</value> - <minimum>.10</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>METHOD</counter> - <value>COVEREDRATIO</value> - <minimum>.17</minimum> - </limit> - <limit implementation="org.jacoco.report.check.Limit"> - <counter>CLASS</counter> - <value>MISSEDCOUNT</value> - <maximum>5</maximum> - </limit> - </limits> - </rule> - </rules> - </configuration> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.6.1</version> diff --git a/champ-service/pom.xml b/champ-service/pom.xml index 1efa608..610de3f 100644 --- a/champ-service/pom.xml +++ b/champ-service/pom.xml @@ -42,6 +42,9 @@ limitations under the License. <version.org.apache.commons.commons-lang3>3.7</version.org.apache.commons.commons-lang3> <version.org.hamcrest.hamcrest-library>1.3</version.org.hamcrest.hamcrest-library> <version.org.springframework.boot.spring-boot-dependencies>1.5.19.RELEASE</version.org.springframework.boot.spring-boot-dependencies> + <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in + coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> + <jacoco.line.coverage.limit>0.16</jacoco.line.coverage.limit> </properties> <dependencyManagement> @@ -37,6 +37,10 @@ limitations under the License. <properties> <onap.nexus.url>https://nexus.onap.org</onap.nexus.url> <event.client.version>1.4.0-SNAPSHOT</event.client.version> + <!-- Minimum code coverage percentage. Please update this figure as coverage increases to prevent any drops in + coverage caused by new changes. Note that this figure cannot be lower than the ONAP requirement of 0.55 --> + <jacoco.line.coverage.limit>0.57</jacoco.line.coverage.limit> + <jacoco.report.directory>${project.build.directory}/code-coverage</jacoco.report.directory> </properties> <modules> @@ -55,6 +59,34 @@ limitations under the License. <skip>true</skip> </configuration> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <executions> + <execution> + <id>default-check</id> + <goals> + <goal>check</goal> + </goals> + <configuration> + <dataFile>${jacoco.report.directory}/jacoco-ut.exec</dataFile> + <rules> + <!-- implementation is needed only for Maven 2 --> + <rule implementation="org.jacoco.maven.RuleConfiguration"> + <element>BUNDLE</element> + <limits> + <limit implementation="org.jacoco.report.check.Limit"> + <counter>LINE</counter> + <value>COVEREDRATIO</value> + <minimum>${jacoco.line.coverage.limit}</minimum> + </limit> + </limits> + </rule> + </rules> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> |