diff --git a/core/pom.xml b/core/pom.xml index fdd534eb239..68e393adbc4 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -65,7 +65,7 @@ 1 0 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= true random diff --git a/coverage/pom.xml b/coverage/pom.xml new file mode 100644 index 00000000000..e793c554a7a --- /dev/null +++ b/coverage/pom.xml @@ -0,0 +1,315 @@ + + + 4.0.0 + + gov.nsa.datawave + datawave-parent + 7.12.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.microservice + accumulo-api + ${version.datawave.accumulo-api} + + + gov.nsa.datawave.microservice + accumulo-utils + ${version.datawave.accumulo-utils} + + + gov.nsa.datawave.microservice + audit-api + ${version.datawave.audit-api} + + + gov.nsa.datawave.microservice + authorization-api + ${version.datawave.authorization-api} + + + gov.nsa.datawave.microservice + base-rest-responses + ${version.datawave.base-rest-responses} + + + gov.nsa.datawave.microservice + common-utils + ${version.datawave.common-utils} + + + gov.nsa.datawave.microservice + dictionary-api + ${version.datawave.dictionary-api} + + + gov.nsa.datawave.microservice + mapreduce-query-api + ${version.datawave.mapreduce-query-api} + + + gov.nsa.datawave.microservice + metadata-utils + ${version.datawave.metadata-utils} + + + log4j + log4j + + + org.slf4j + slf4j-reload4j + + + ch.qos.reload4j + reload4j + + + + + gov.nsa.datawave.microservice + metrics-reporter + ${version.datawave.metrics-reporter} + + + gov.nsa.datawave.microservice + query-api + ${version.datawave.query-api} + + + gov.nsa.datawave.microservice + query-api + ${version.datawave.query-api} + jboss + + + gov.nsa.datawave.microservice + query-metric-api + ${version.datawave.query-metric-api} + + + gov.nsa.datawave + * + + + gov.nsa.datawave.microservice + accumulo-utils + + + gov.nsa.datawave.webservices + * + + + javax.xml.bind + jaxb-api + + + log4j + * + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + slf4j-reload4j + + + + + gov.nsa.datawave.microservice + type-utils + ${version.datawave.type-utils} + + + log4j + * + + + org.slf4j + slf4j-log4j12 + + + org.apache.hadoop + hadoop-common + + + + + 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} + + + gov.nsa.datawave.microservice + base-rest-responses + ${version.datawave.base-rest-responses} + tests + test-jar + test + + + + + + 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..a81c569f364 --- /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:7777 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:7777 -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..5f64b272148 --- /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: + - "7777: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/microservices/configcheck/pom.xml b/microservices/configcheck/pom.xml index 769ba2328b5..d883fce69c8 100644 --- a/microservices/configcheck/pom.xml +++ b/microservices/configcheck/pom.xml @@ -232,7 +232,7 @@ 1 0 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= true random diff --git a/pom.xml b/pom.xml index bfdf749bb46..00742ab674d 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,12 @@ + 11 11 UTF-8 + ${project.basedir}/coverage/target/site/jacoco-aggregate/jacoco.xml + **/StandardLexer.java 1C 2.1.2 1.4.1.Final @@ -1479,6 +1483,11 @@ false + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + maven-compiler-plugin 3.8.1 @@ -1744,11 +1753,35 @@ xmlbeans-maven-plugin 2.3.3-threadsafe + + org.jacoco + jacoco-maven-plugin + 0.8.12 + + + 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 @@ -1821,6 +1854,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 79b9907c579..78776a6a1ee 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 ac4fcff3d5e..fb9c9296eec 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 7a3af33edfe..70dfb1e00e2 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 b30568a3704..0ff86d1b0c4 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.microservice @@ -30,5 +33,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 240afe88491..307a91f59ae 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.microservice @@ -30,5 +33,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 94530eac1e9..2cac57e7f03 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 d5bdc58af93..45abc7f83fb 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 @@ -226,6 +229,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 33d84206beb..a774413fe01 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 + commons-net @@ -149,6 +152,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 ea583e9b4b1..ba3ba9a4fa5 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 b3602a0b715..4265595a797 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 cd8cf4d27d9..c00605a5fac 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 5f627c3d433..34aafab6229 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 f9f24ea391c..878df6a1634 100644 --- a/warehouse/ops-tools/config-compare/pom.xml +++ b/warehouse/ops-tools/config-compare/pom.xml @@ -7,6 +7,9 @@ 7.12.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 774bb3efcfc..39bbdcbf8a0 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 24b87cf8de7..a81a3565fb6 100644 --- a/warehouse/pom.xml +++ b/warehouse/pom.xml @@ -482,7 +482,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} @@ -620,4 +620,4 @@ - + \ No newline at end of file diff --git a/warehouse/query-core/pom.xml b/warehouse/query-core/pom.xml index 8f357492a06..61abf071208 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 @@ -440,6 +443,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 7d87388b234..05cefc81f10 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 @@ -139,6 +142,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 4fd79402460..e3309862966 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 @@ -143,6 +146,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 be126e77781..256a2950e78 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 @@ -184,6 +187,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 708f6fe2f28..1ffa6ae8daf 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 @@ -373,6 +376,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 36d59da2ccf..dd12657ace6 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 @@ -298,6 +301,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 d9e74159848..2ff823bd581 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 @@ -339,6 +342,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/deploy/spring-framework-integration/pom.xml b/web-services/deploy/spring-framework-integration/pom.xml index 7114083302f..494c4f8aa58 100644 --- a/web-services/deploy/spring-framework-integration/pom.xml +++ b/web-services/deploy/spring-framework-integration/pom.xml @@ -180,6 +180,7 @@ maven-surefire-plugin ${version.surefire.plugin} + @{argLine} false ${project.build.directory}/conf diff --git a/web-services/dictionary/pom.xml b/web-services/dictionary/pom.xml index 72b5c0a8b5f..1c55c42d2c0 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 @@ -41,6 +44,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 c2f31d4c66e..a2b1e1d1909 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 994ad4feed3..cc842786819 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 5f6e41d20d6..d09f02a1f6a 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 @@ -241,12 +244,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 84e0df6f838..f1ef7f740c6 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 @@ -155,6 +156,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 674c21e2d9d..76d687e621b 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 @@ -110,6 +111,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + + diff --git a/web-services/pom.xml b/web-services/pom.xml index 53597e1f8f0..05af491b719 100644 --- a/web-services/pom.xml +++ b/web-services/pom.xml @@ -553,7 +553,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 @@ -756,4 +756,4 @@ - + \ No newline at end of file diff --git a/web-services/query/pom.xml b/web-services/query/pom.xml index c4a758a4c8e..701a5bf87a2 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 @@ -307,9 +310,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 b8c6b9fd992..6da43320f03 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 @@ -318,6 +321,19 @@ + + org.jacoco + jacoco-maven-plugin + + + report + + report-aggregate + + verify + + +