diff options
| -rw-r--r-- | gui-editors/pom.xml | 5 | ||||
| -rw-r--r-- | gui-pdp-monitoring/pom.xml | 8 | ||||
| -rw-r--r-- | gui-pdp-monitoring/src/webapp/package.json | 4 | ||||
| -rw-r--r-- | pom.xml | 3 |
4 files changed, 16 insertions, 4 deletions
diff --git a/gui-editors/pom.xml b/gui-editors/pom.xml index 9ef52cc..e772a04 100644 --- a/gui-editors/pom.xml +++ b/gui-editors/pom.xml @@ -32,6 +32,11 @@ <name>${project.artifactId}</name> <description>Web Client editors for PDP policies</description> + <properties> + <sonar.sources>${project.basedir}/src/main</sonar.sources> + <sonar.exclusions>src/main/resources/webapp/js/edit_area/**/*,src/main/resources/webapp/js/jquery/**/*,src/main/resources/webapp/js/jquery-ui-1.12.1/**/*,src/main/resources/webapp/js/lib/**/*</sonar.exclusions> + </properties> + <modules> <module>gui-editor-apex</module> </modules> diff --git a/gui-pdp-monitoring/pom.xml b/gui-pdp-monitoring/pom.xml index 0f8743c..17b008f 100644 --- a/gui-pdp-monitoring/pom.xml +++ b/gui-pdp-monitoring/pom.xml @@ -32,7 +32,9 @@ <properties> <webapp.dir>src/webapp</webapp.dir> - <sonar.javascript.lcov.reportPaths>src/webapp/coverage/lcov.info</sonar.javascript.lcov.reportPaths> + <sonar.nodejs.executable>${project.basedir}/src/webapp/node/node</sonar.nodejs.executable> + <sonar.sources>${project.basedir}/src/main,${project.basedir}/src/webapp/js</sonar.sources> + <sonar.exclusions>src/webapp/js/__test__/**</sonar.exclusions> </properties> <dependencies> @@ -104,12 +106,16 @@ <goals> <goal>npm</goal> </goals> + <configuration> + <arguments>install</arguments> + </configuration> </execution> <execution> <id>npm test</id> <goals> <goal>npm</goal> </goals> + <phase>test</phase> <configuration> <arguments>test</arguments> </configuration> diff --git a/gui-pdp-monitoring/src/webapp/package.json b/gui-pdp-monitoring/src/webapp/package.json index 793d6ba..88389ca 100644 --- a/gui-pdp-monitoring/src/webapp/package.json +++ b/gui-pdp-monitoring/src/webapp/package.json @@ -26,14 +26,14 @@ }, "jest": { "collectCoverage": true, - "coverageDirectory": "../../../target/code-coverage", + "coverageDirectory": "../../target/code-coverage", "transform": { "^.+\\.[t|j]sx?$": "babel-jest" }, "testResultsProcessor": "jest-sonar-reporter" }, "jestSonar": { - "reportPath": "../../../target/reports", + "reportPath": "../../target/reports", "reportFile": "test-reporter.xml", "indent": 4, "sonar56x": true @@ -42,7 +42,8 @@ <properties> <policy.common.version>1.7.1-SNAPSHOT</policy.common.version> <policy.models.version>2.3.1-SNAPSHOT</policy.models.version> - <sonar.javascript.lcov.reportPaths>target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths> + <jacoco.dataFile>${project.basedir}/../../target/code-coverage/jacoco-ut.exec</jacoco.dataFile> + <sonar.javascript.lcov.reportPaths>${project.basedir}/target/code-coverage/lcov.info</sonar.javascript.lcov.reportPaths> </properties> <modules> |