Skip to content

Commit

Permalink
revert changes from cf8b043 to fix coverage
Browse files Browse the repository at this point in the history
  • Loading branch information
saberduck authored and ilia-kebets-sonarsource committed Jan 18, 2024
1 parent 5a8aeb5 commit 3e43fea
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ analyze_task:
- jfrog config add repox --url $ARTIFACTORY_URL --access-token $ARTIFACTORY_DEPLOY_ACCESS_TOKEN
- npm config set registry "${ARTIFACTORY_URL}/api/npm/npm"
- npm run build
- PULL_REQUEST_SHA=$GIT_SHA1 regular_mvn_build_deploy_analyze -P-deploy-sonarsource,-release,-sign -Dcommercial -Dmaven.shade.skip=true -Dmaven.install.skip=true -Dmaven.deploy.skip=true -Dsonar.debug=true -Dsonar.coverage.jacoco.xmlReportPaths=$CIRRUS_WORKING_DIR/report-aggregate/target/site/jacoco-aggregate/jacoco.xml
- PULL_REQUEST_SHA=$GIT_SHA1 regular_mvn_build_deploy_analyze -P-deploy-sonarsource,-release,-sign -Dcommercial -Dmaven.shade.skip=true -Dmaven.install.skip=true -Dmaven.deploy.skip=true -Dsonar.coverage.jacoco.xmlReportPaths=$CIRRUS_WORKING_DIR/report-aggregate/target/site/jacoco-aggregate/jacoco.xml

build_win_task:
depends_on:
Expand Down
51 changes: 0 additions & 51 deletions packages/pom.xml

This file was deleted.

17 changes: 15 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
</licenses>

<modules>
<module>packages</module>
<module>sonar-plugin</module>
<module>tools</module>
<!--
Expand Down Expand Up @@ -79,8 +78,12 @@
<doclint>none</doclint>

<!-- sonar analysis -->

<sonar.sources>packages/</sonar.sources>
<sonar.exclusions>packages/**/*.test.ts,packages/**/*.fixture.*,packages/**/fixtures/**/*</sonar.exclusions>
<sonar.tests>packages/</sonar.tests>
<sonar.test.inclusions>packages/**/*.test.ts</sonar.test.inclusions>
<sonar.javascript.lcov.reportPaths>coverage/lcov.info</sonar.javascript.lcov.reportPaths>
<sonar.typescript.tsconfigPath>${project.basedir}/packages/tsconfig.app.json,${project.basedir}/packages/tsconfig.test.json</sonar.typescript.tsconfigPath>
<sonar.cpd.exclusions>sonar-plugin/javascript-checks/src/main/resources/**/*.html</sonar.cpd.exclusions>
<sonar.coverage.exclusions>packages/bridge/src/worker.js</sonar.coverage.exclusions>
</properties>
Expand Down Expand Up @@ -241,6 +244,16 @@
<artifactId>license-maven-plugin</artifactId>
<!-- This plugin is already configured in parent pom, however we want a configuration specific to this project -->
<configuration>
<includes>
<include>packages/**/*.ts</include>
<include>packages/**/*.tsx</include>
<include>profiling/**/*.ts</include>
<include>profiling/**/*.js</include>
<include>tools/resources/rule.*</include>
<include>tools/**/*.mjs</include>
<include>tools/**/*.ts</include>
<include>tools/**/*.java</include>
</includes>
<mapping>
<template_java>JAVADOC_STYLE</template_java>
<template_ts>JAVADOC_STYLE</template_ts>
Expand Down

0 comments on commit 3e43fea

Please sign in to comment.