diff --git a/coverage/pom.xml b/coverage/pom.xml new file mode 100644 index 00000000000..2d63707754d --- /dev/null +++ b/coverage/pom.xml @@ -0,0 +1,178 @@ + + + 4.0.0 + + gov.nsa.datawave + datawave-parent + 6.10.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-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 + ${project.version} + + + 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 + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-accumulo + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-atom + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-cached-results + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-client + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-common + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-common-util + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-dictionary + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-map-reduce + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-map-reduce-embedded + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-map-reduce-status + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-model + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-modification + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-query + ${project.version} + + + gov.nsa.datawave.webservices + datawave-ws-security + ${project.version} + + + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + + report-aggregate + + verify + + + + + + diff --git a/docker/sonarqube/README.md b/docker/sonarqube/README.md new file mode 100644 index 00000000000..62f707b0366 --- /dev/null +++ b/docker/sonarqube/README.md @@ -0,0 +1,56 @@ +## SonarQube + +## Preliminary Steps +(you *will* need to run this daily before attempting to start sonarqube - use precompose.sh script in case other things are needed) +sudo sysctl -w vm.max_map_count=262144 +sudo sysctl -w fs.file-max=131072 + +sudo vi /etc/sysctl.conf +vm.max_map_count=262144 +fs.file-max=131072 + +You need to run in older versions of maven. 3.8.6 works, 3.9.6 does NOT. + +## Start SonarQube +In docker/sonarqube directory, run: +```bash +./precompose.sh +docker-compose up -d +``` + +## Setup SonarQube +go to https://localhost:9000 to view the sonarqube app +admin/admin is the default password (change it when you first access it) + +How do you want to create your project? Manually + +Set project name to DataWave +(leave project key as DataWave) +Set main branch to integration +Click Set Up + +How do you want to analyze your repository? Locally + +Leave the token name as "Analyze DataWave" +Set the expiration to Never Expires +Click Generate + +Copy the token (spq_...), save it locally in a file called sonarqubeToken in your home directory. + +Click Continue + +Click Maven + +Create a sonar.sh script, add it to your ~/bin dir (or anywhere that is on your configured path) +```bash +mvn clean verify && mvn -e sonar:sonar -Dsonar.projectKey=Datawave -Dsonar.host.url=http://localhost:9000 -Dsonar.login= +``` + +Run the new sonar.sh script in your checked out datawave repository. When it is done, return to the browser and you can see the results of your scan. + +## Stop SonarQube +In docker/sonarqube directory, run: +```bash +docker-compose stop +``` +You should do this before closing down for the day, or if you are done trying to do analysis. diff --git a/docker/sonarqube/clean.sh b/docker/sonarqube/clean.sh new file mode 100755 index 00000000000..490041a6baa --- /dev/null +++ b/docker/sonarqube/clean.sh @@ -0,0 +1,11 @@ +#!/usr/bin/bash + +docker volume rm sonarqube_data +docker volume rm sonarqube_extensions +docker volume rm sonarqube_logs +docker volume rm sonarqube_postgresql +docker volume rm sonarqube_postgresql_data +docker volume rm sonarqube_sonarqube_data +docker volume rm sonarqube_sonarqube_extensions +docker volume rm sonarqube_sonarqube_logs + diff --git a/docker/sonarqube/compose.yml b/docker/sonarqube/compose.yml new file mode 100644 index 00000000000..e09144b7518 --- /dev/null +++ b/docker/sonarqube/compose.yml @@ -0,0 +1,31 @@ +version: "3" +services: + sonarqube: + image: sonarqube:9.9.4-community + depends_on: + - db + environment: + SONAR_JDBC_URL: jdbc:postgresql://db:5432/sonar + SONAR_JDBC_USERNAME: sonar + SONAR_JDBC_PASSWORD: sonar + volumes: + - sonarqube_data:/opt/sonarqube/data + - sonarqube_extensions:/opt/sonarqube/extensions + - sonarqube_logs:/opt/sonarqube/logs + ports: + - "9000:9000" + db: + image: postgres:12 + environment: + POSTGRES_USER: sonar + POSTGRES_PASSWORD: sonar + volumes: + - postgresql:/var/lib/postgresql + - postgresql_data:/var/lib/postgresql/data + +volumes: + sonarqube_data: + sonarqube_extensions: + sonarqube_logs: + postgresql: + postgresql_data: diff --git a/docker/sonarqube/precompose.sh b/docker/sonarqube/precompose.sh new file mode 100755 index 00000000000..45c7b3152f3 --- /dev/null +++ b/docker/sonarqube/precompose.sh @@ -0,0 +1,4 @@ +#!/bin/bash +sudo sysctl -w vm.max_map_count=524288 +sudo sysctl -w fs.file-max=131072 + diff --git a/pom.xml b/pom.xml index d0155b288ed..56b8c8de21e 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ core web-services warehouse + coverage scm:git:https://github.com/NationalSecurityAgency/datawave.git @@ -34,9 +35,11 @@ + 11 11 UTF-8 + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml 1C 2.1.1 1.4.1.Final @@ -1401,6 +1404,11 @@ false + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + maven-compiler-plugin 3.8.1 @@ -1659,11 +1667,35 @@ xmlbeans-maven-plugin 2.3.3-threadsafe + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + prepare-agent + + prepare-agent + + + + report + + report + + + + 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 @@ -1736,6 +1768,28 @@ + + coverage + + true + + + + + org.jacoco + jacoco-maven-plugin + + + default-prepare-agent + + prepare-agent + + + + + + + autoformat diff --git a/warehouse/accumulo-extensions/pom.xml b/warehouse/accumulo-extensions/pom.xml index 80fa451539b..f09ea95b060 100644 --- a/warehouse/accumulo-extensions/pom.xml +++ b/warehouse/accumulo-extensions/pom.xml @@ -8,6 +8,9 @@ datawave-accumulo-extensions ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.google.guava @@ -55,6 +58,23 @@ test + + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + + clover diff --git a/warehouse/common/pom.xml b/warehouse/common/pom.xml index a8f5547478f..f34a6597884 100644 --- a/warehouse/common/pom.xml +++ b/warehouse/common/pom.xml @@ -8,6 +8,9 @@ datawave-common ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.clearspring.analytics @@ -56,4 +59,21 @@ test + + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + + diff --git a/warehouse/core/pom.xml b/warehouse/core/pom.xml index 723d89c26fd..5bc6d474ecf 100644 --- a/warehouse/core/pom.xml +++ b/warehouse/core/pom.xml @@ -9,6 +9,9 @@ datawave-core jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.beust @@ -230,7 +233,7 @@ 0 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= + @{argLine} -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 true random @@ -257,6 +260,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/data-dictionary-core/pom.xml b/warehouse/data-dictionary-core/pom.xml index f4fc2601bd3..4e83934e429 100644 --- a/warehouse/data-dictionary-core/pom.xml +++ b/warehouse/data-dictionary-core/pom.xml @@ -9,6 +9,9 @@ datawave-data-dictionary-core jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave @@ -26,5 +29,20 @@ src/main/resources + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + diff --git a/warehouse/edge-dictionary-core/pom.xml b/warehouse/edge-dictionary-core/pom.xml index 3e00cc3209b..bdd84dea7b1 100644 --- a/warehouse/edge-dictionary-core/pom.xml +++ b/warehouse/edge-dictionary-core/pom.xml @@ -9,6 +9,9 @@ datawave-edge-dictionary-core jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave @@ -26,5 +29,20 @@ src/main/resources + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + diff --git a/warehouse/index-stats/pom.xml b/warehouse/index-stats/pom.xml index 7005be11d41..45cf8c39283 100644 --- a/warehouse/index-stats/pom.xml +++ b/warehouse/index-stats/pom.xml @@ -9,6 +9,9 @@ datawave-index-stats jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.clearspring.analytics @@ -73,6 +76,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/ingest-core/pom.xml b/warehouse/ingest-core/pom.xml index 6f9211f4131..018d6d0698d 100644 --- a/warehouse/ingest-core/pom.xml +++ b/warehouse/ingest-core/pom.xml @@ -9,6 +9,9 @@ datawave-ingest-core jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.clearspring.analytics @@ -216,6 +219,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/ingest-csv/pom.xml b/warehouse/ingest-csv/pom.xml index 631b7ee047b..ceda4a55965 100644 --- a/warehouse/ingest-csv/pom.xml +++ b/warehouse/ingest-csv/pom.xml @@ -9,6 +9,9 @@ datawave-ingest-csv jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave @@ -134,6 +137,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/ingest-json/pom.xml b/warehouse/ingest-json/pom.xml index 92ac1458c0d..935711a770d 100644 --- a/warehouse/ingest-json/pom.xml +++ b/warehouse/ingest-json/pom.xml @@ -9,6 +9,9 @@ datawave-ingest-json jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.google.code.gson @@ -179,6 +182,19 @@ org.codehaus.mojo exec-maven-plugin + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/ingest-nyctlc/pom.xml b/warehouse/ingest-nyctlc/pom.xml index b7da23fcf41..083fc572c23 100644 --- a/warehouse/ingest-nyctlc/pom.xml +++ b/warehouse/ingest-nyctlc/pom.xml @@ -9,6 +9,9 @@ datawave-ingest-nyctlc jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave @@ -50,6 +53,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/ingest-wikipedia/pom.xml b/warehouse/ingest-wikipedia/pom.xml index 0ba62e360bf..37a84949378 100644 --- a/warehouse/ingest-wikipedia/pom.xml +++ b/warehouse/ingest-wikipedia/pom.xml @@ -9,6 +9,9 @@ datawave-ingest-wikipedia jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave @@ -124,6 +127,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/metrics-core/pom.xml b/warehouse/metrics-core/pom.xml index 6e431d232f8..39381351808 100644 --- a/warehouse/metrics-core/pom.xml +++ b/warehouse/metrics-core/pom.xml @@ -9,6 +9,9 @@ datawave-metrics-core jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.google.code.gson @@ -75,4 +78,21 @@ test + + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + + diff --git a/warehouse/ops-tools/config-compare/pom.xml b/warehouse/ops-tools/config-compare/pom.xml index 1c9c2da8920..4ad1f61cc4b 100644 --- a/warehouse/ops-tools/config-compare/pom.xml +++ b/warehouse/ops-tools/config-compare/pom.xml @@ -7,6 +7,9 @@ 6.11.0-SNAPSHOT datawave-ops-tools-config-compare + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.google.guava @@ -59,4 +62,21 @@ test + + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + + diff --git a/warehouse/ops-tools/index-validation/pom.xml b/warehouse/ops-tools/index-validation/pom.xml index 6cffc37ddb7..5d266734cf0 100644 --- a/warehouse/ops-tools/index-validation/pom.xml +++ b/warehouse/ops-tools/index-validation/pom.xml @@ -9,6 +9,9 @@ datawave-ops-tools-index-validation jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + commons-cli @@ -93,6 +96,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/warehouse/pom.xml b/warehouse/pom.xml index b0fcd087149..e26020e1385 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -466,7 +466,7 @@ 0 0 - -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= + @{argLine} -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 true ${runOrder} @@ -604,4 +604,4 @@ - + \ No newline at end of file diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index dd6b7ecd21e..1dfdf8d806b 100644 --- a/warehouse/query-core/pom.xml +++ b/warehouse/query-core/pom.xml @@ -9,6 +9,9 @@ datawave-query-core jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.clearspring.analytics @@ -395,6 +398,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/accumulo/pom.xml b/web-services/accumulo/pom.xml index 51471ae9125..86e973aa56c 100644 --- a/web-services/accumulo/pom.xml +++ b/web-services/accumulo/pom.xml @@ -9,6 +9,9 @@ datawave-ws-accumulo ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.fasterxml.jackson.module @@ -128,6 +131,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/atom/pom.xml b/web-services/atom/pom.xml index cc402a89e79..227e212139a 100644 --- a/web-services/atom/pom.xml +++ b/web-services/atom/pom.xml @@ -9,6 +9,9 @@ datawave-ws-atom ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave.webservices @@ -138,6 +141,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/cached-results/pom.xml b/web-services/cached-results/pom.xml index cae4f5fdcee..42ba00fe928 100644 --- a/web-services/cached-results/pom.xml +++ b/web-services/cached-results/pom.xml @@ -9,6 +9,9 @@ datawave-ws-cached-results ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.google.guava @@ -169,6 +172,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/client/pom.xml b/web-services/client/pom.xml index d5bca6e60fe..f4bc2839d66 100644 --- a/web-services/client/pom.xml +++ b/web-services/client/pom.xml @@ -9,6 +9,9 @@ datawave-ws-client jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.fasterxml.jackson.core @@ -368,6 +371,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/common-util/pom.xml b/web-services/common-util/pom.xml index e2491316690..43c2ac9682e 100644 --- a/web-services/common-util/pom.xml +++ b/web-services/common-util/pom.xml @@ -9,6 +9,9 @@ datawave-ws-common-util jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.clearspring.analytics @@ -275,6 +278,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/common/pom.xml b/web-services/common/pom.xml index 8dda978a24b..6eb64aa9fa6 100644 --- a/web-services/common/pom.xml +++ b/web-services/common/pom.xml @@ -9,6 +9,9 @@ datawave-ws-common ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + aopalliance @@ -328,6 +331,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 03bb4deaf4d..00374e624df 100644 --- a/web-services/dictionary/pom.xml +++ b/web-services/dictionary/pom.xml @@ -9,6 +9,9 @@ datawave-ws-dictionary ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave @@ -37,6 +40,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/map-reduce-embedded/pom.xml b/web-services/map-reduce-embedded/pom.xml index 3254815820c..48743b92e62 100644 --- a/web-services/map-reduce-embedded/pom.xml +++ b/web-services/map-reduce-embedded/pom.xml @@ -9,6 +9,9 @@ datawave-ws-map-reduce-embedded jar ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave.webservices @@ -41,5 +44,20 @@ src/main/resources + + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + + diff --git a/web-services/map-reduce-status/pom.xml b/web-services/map-reduce-status/pom.xml index 7e41bd33616..e58fa0b1501 100644 --- a/web-services/map-reduce-status/pom.xml +++ b/web-services/map-reduce-status/pom.xml @@ -9,6 +9,9 @@ datawave-ws-map-reduce-status ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + gov.nsa.datawave.webservices @@ -79,6 +82,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/map-reduce/pom.xml b/web-services/map-reduce/pom.xml index 67fb4dc95f6..3ba3b776b2e 100644 --- a/web-services/map-reduce/pom.xml +++ b/web-services/map-reduce/pom.xml @@ -9,6 +9,9 @@ datawave-ws-map-reduce ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + commons-configuration @@ -220,12 +223,25 @@ 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= + @{argLine} -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 false + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/model/pom.xml b/web-services/model/pom.xml index 777a323abca..6c4041e6be9 100644 --- a/web-services/model/pom.xml +++ b/web-services/model/pom.xml @@ -12,6 +12,7 @@ ${project.build.directory}/endorsed UTF-8 + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml @@ -150,6 +151,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/modification/pom.xml b/web-services/modification/pom.xml index f7d02e5f31d..83e8dcf473c 100644 --- a/web-services/modification/pom.xml +++ b/web-services/modification/pom.xml @@ -12,6 +12,7 @@ ${project.build.directory}/endorsed UTF-8 + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml @@ -105,6 +106,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/pom.xml b/web-services/pom.xml index 108a057eb05..83b90208a09 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -531,7 +531,7 @@ 0 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= + @{argLine} -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 true random @@ -734,4 +734,4 @@ - + \ No newline at end of file diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index d7545595370..e59559bb64d 100644 --- a/web-services/query/pom.xml +++ b/web-services/query/pom.xml @@ -9,6 +9,9 @@ datawave-ws-query ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.google.code.gson @@ -295,9 +298,22 @@ ${basedir}/conf - --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + @{argLine} --add-opens java.xml/jdk.xml.internal=ALL-UNNAMED + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/security/pom.xml b/web-services/security/pom.xml index 91be124d025..e5a81295021 100644 --- a/web-services/security/pom.xml +++ b/web-services/security/pom.xml @@ -9,6 +9,9 @@ datawave-ws-security ejb ${project.artifactId} + + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + com.fasterxml.jackson.datatype @@ -346,6 +349,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + +