From 480a0c03fd101f3ac5b0bb4299a7d38d3950b5bb Mon Sep 17 00:00:00 2001 From: Christopher Gross cogross Date: Thu, 22 Jun 2023 19:43:37 +0000 Subject: [PATCH] sonarqube code coverage --- coverage/pom.xml | 188 ++++++++++++++++++++++++++++++++ pom.xml | 39 +++++++ warehouse/core/pom.xml | 2 +- warehouse/pom.xml | 4 +- web-services/map-reduce/pom.xml | 2 +- web-services/pom.xml | 4 +- web-services/query/pom.xml | 2 +- 7 files changed, 234 insertions(+), 7 deletions(-) create mode 100644 coverage/pom.xml diff --git a/coverage/pom.xml b/coverage/pom.xml new file mode 100644 index 00000000000..9f16f30c14f --- /dev/null +++ b/coverage/pom.xml @@ -0,0 +1,188 @@ + + + 4.0.0 + + gov.nsa.datawave + datawave-parent + 5.9.0-SNAPSHOT + + coverage + Datawave Code Coverage Aggregate Report + + true + + + + gov.nsa.datawave + datawave-accumulo-extensions + ${project.version} + + + gov.nsa.datawave + datawave-common + ${project.version} + + + gov.nsa.datawave + datawave-core + ${project.version} + + + gov.nsa.datawave + datawave-data-dictionary-core + ${project.version} + + + gov.nsa.datawave + datawave-edge-dictionary-core + ${project.version} + + + gov.nsa.datawave + datawave-edge-dictionary-core + ${project.version} + + + gov.nsa.datawave + datawave-index-stats + ${project.version} + + + gov.nsa.datawave + datawave-ingest-core + ${project.version} + + + gov.nsa.datawave + datawave-ingest-csv + ${project.version} + + + gov.nsa.datawave + datawave-ingest-json + ${project.version} + + + gov.nsa.datawave + datawave-ingest-nyctlc + ${project.version} + + + gov.nsa.datawave + datawave-ingest-wikipedia + 5.9.0-SNAPSHOT + + + gov.nsa.datawave + datawave-metrics-core + ${project.version} + + + gov.nsa.datawave + datawave-ops-tools-config-compare + ${project.version} + + + gov.nsa.datawave + datawave-ops-tools-index-validation + ${project.version} + + + gov.nsa.datawave + datawave-query-core + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-accumulo + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-accumulo + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-atom + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-cached-results + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-client + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-common + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-common-util + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-dictionary + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-map-reduce + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-map-reduce-embedded + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-map-reduce-status + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-model + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-modification + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-query + 5.9.0-SNAPSHOT + + + gov.nsa.datawave.webservices + datawave-ws-security + 5.9.0-SNAPSHOT + + + + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + + + diff --git a/pom.xml b/pom.xml index cc492cdb849..d5e0209fbc4 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,7 @@ common-test web-services warehouse + coverage scm:git:https://github.com/NationalSecurityAgency/datawave.git @@ -28,6 +29,7 @@ 11 11 UTF-8 + ${maven.multiModuleProjectDirectory}/coverage/target/site/jacoco-aggregate/jacoco.xml 1C 2.1.0 1.4.1.Final @@ -1355,6 +1357,11 @@ false + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + maven-compiler-plugin 3.8.1 @@ -1562,11 +1569,21 @@ xmlbeans-maven-plugin 2.3.3-threadsafe + + org.jacoco + jacoco-maven-plugin + 0.8.6 + org.mortbay.jetty maven-jetty-plugin 6.1.26 + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.9.1.2184 + pl.project13.maven git-commit-id-plugin @@ -1639,6 +1656,28 @@ + + coverage + + true + + + + + org.jacoco + jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + + + + autoformat diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 1e8371b0676..065a7332c62 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -208,7 +208,7 @@ 1 0 -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx1024m -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc= - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED @{argLine} true random -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -DBT_ROOT=${env.BT_ROOT} -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx2g -Djava.library.path=${env.HADOOP_HOME}/lib/native -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc= - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED @{argLine} true ${runOrder} @@ -526,7 +526,7 @@ false -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -DBT_ROOT=${env.BT_ROOT} -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx2g -Djava.library.path=${env.HADOOP_HOME}/lib/native -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc= - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED @{argLine} datawave.common.test.integration.IntegrationTest true ${runOrder} diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index c83934a57a3..01e88beae66 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -217,7 +217,7 @@ another classloader. maven-surefire-plugin -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx1024m -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc= - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED @{argLine} false diff --git a/web-services/pom.xml b/web-services/pom.xml index a9d25c87a90..9e3b39f8b60 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -527,7 +527,7 @@ 1 0 -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx1024m -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc= - --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED + --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED @{argLine} true random