diff --git a/build-reporting/pom.xml b/build-reporting/pom.xml new file mode 100644 index 000000000..ad3943d9c --- /dev/null +++ b/build-reporting/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + org.owasp + dependency-check-parent + 1.4.6-SNAPSHOT + + + build-reporting + + + + org.owasp + dependency-check-utils + ${project.version} + + + org.owasp + dependency-check-core + ${project.version} + + + org.owasp + dependency-check-ant + ${project.version} + + + org.owasp + dependency-check-cli + ${project.version} + + + org.owasp + dependency-check-maven + ${project.version} + + + + + + org.jacoco + jacoco-maven-plugin + + + report-aggregate + verify + + report-aggregate + + + + + + + diff --git a/dependency-check-ant/pom.xml b/dependency-check-ant/pom.xml index c3504b6e2..9c7962954 100644 --- a/dependency-check-ant/pom.xml +++ b/dependency-check-ant/pom.xml @@ -223,48 +223,6 @@ Copyright (c) 2013 - Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/dependency-check-data - - - - diff --git a/dependency-check-cli/pom.xml b/dependency-check-cli/pom.xml index e62681f64..a1d13d0c2 100644 --- a/dependency-check-cli/pom.xml +++ b/dependency-check-cli/pom.xml @@ -69,62 +69,6 @@ Copyright (c) 2012 - Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - org.owasp.dependencycheck.App - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - cpe - data/cpe - target - - - cve - data/cpe - target - - - - org.codehaus.mojo appassembler-maven-plugin diff --git a/dependency-check-core/pom.xml b/dependency-check-core/pom.xml index dc7590c6c..7cb0cee7f 100644 --- a/dependency-check-core/pom.xml +++ b/dependency-check-core/pom.xml @@ -121,93 +121,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - - - .*\$KEYS\.class - .*\$Element\.class - - - .*\$KEYS\.class - .*\$Element\.class - - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - org.owasp.dependencycheck.data.cpe.Fields - 0 - 0 - - - org.owasp.dependencycheck.App - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/data - - - temp.directory - ${project.build.directory}/temp - - - - **/*IntegrationTest.java - **/*MySQLTest.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - - - - data.directory - ${project.build.directory}/data - - - temp.directory - ${project.build.directory}/temp - - - - @@ -481,13 +394,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin @@ -507,7 +413,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - **/*MySQLTest.java + **/*MySqlIT.java @@ -538,13 +444,6 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-surefire-plugin - - true - - org.apache.maven.plugins maven-failsafe-plugin @@ -564,7 +463,7 @@ Copyright (c) 2012 Jeremy Long. All Rights Reserved. - **/*MySQLTest.java + **/*MySqlIT.java diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java similarity index 97% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java index 5a78871c1..774748e78 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/EngineIT.java @@ -29,12 +29,13 @@ import org.owasp.dependencycheck.exception.ReportException; import org.owasp.dependencycheck.reporting.ReportGenerator; import org.owasp.dependencycheck.utils.InvalidSettingException; import org.owasp.dependencycheck.utils.Settings; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class EngineIntegrationTest extends BaseDBTestCase { +public class EngineIT extends BaseDBTestCase { /** * Test running the entire engine. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java similarity index 99% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java index 12fcd195f..a80e845bd 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerIT.java @@ -33,7 +33,7 @@ import org.owasp.dependencycheck.utils.Settings; * * @author Jeremy Long */ -public class ArchiveAnalyzerIntegrationTest extends BaseDBTestCase { +public class ArchiveAnalyzerIT extends BaseDBTestCase { /** * Test of getSupportedExtensions method, of class ArchiveAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java index e26d825a3..562a5bff3 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/CPEAnalyzerIT.java @@ -34,12 +34,14 @@ import org.owasp.dependencycheck.data.cpe.IndexEntry; import org.owasp.dependencycheck.dependency.Confidence; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.dependency.Identifier; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class CPEAnalyzerIntegrationTest extends BaseDBTestCase { +public class CPEAnalyzerIT extends BaseDBTestCase { /** * Tests of buildSearch of class CPEAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java similarity index 97% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java index 69e93e458..3378cf94a 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzerIT.java @@ -24,7 +24,7 @@ import org.owasp.dependencycheck.BaseDBTestCase; * * @author Jeremy Long */ -public class DependencyBundlingAnalyzerIntegrationTest extends BaseDBTestCase { +public class DependencyBundlingAnalyzerIT extends BaseDBTestCase { /** * Test of analyze method, of class DependencyBundlingAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java similarity index 96% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java index 172418c49..807a84666 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/VulnerabilitySuppressionAnalyzerIT.java @@ -26,13 +26,15 @@ import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.Engine; import org.owasp.dependencycheck.dependency.Dependency; import org.owasp.dependencycheck.utils.Settings; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * Testing the vulnerability suppression analyzer. * * @author Jeremy Long */ -public class VulnerabilitySuppressionAnalyzerIntegrationTest extends BaseDBTestCase { +public class VulnerabilitySuppressionAnalyzerIT extends BaseDBTestCase { /** * Test of getName method, of class VulnerabilitySuppressionAnalyzer. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java similarity index 90% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java index 54ad59c88..d73942304 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBIT.java @@ -33,12 +33,27 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class CveDBIntegrationTest extends BaseDBTestCase { +public class CveDBIT extends BaseDBTestCase { /** * Pretty useless tests of open, commit, and close methods, of class CveDB. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java similarity index 94% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java index a27ef0191..04bb6af5e 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySQLTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBMySqlIT.java @@ -27,12 +27,14 @@ import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.dependency.Vulnerability; import org.owasp.dependencycheck.dependency.VulnerableSoftware; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class CveDBMySQLTest extends BaseTest { +public class CveDBMySqlIT extends BaseTest { /** * Test of getCPEs method, of class CveDB. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java similarity index 94% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java index 6c6af8bcf..5243018c4 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesIT.java @@ -24,12 +24,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import org.junit.Test; import org.owasp.dependencycheck.data.update.nvd.NvdCveInfo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class DatabasePropertiesIntegrationTest extends BaseDBTestCase { +public class DatabasePropertiesIT extends BaseDBTestCase { /** * Test of isEmpty method, of class DatabaseProperties. diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java similarity index 93% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java index d2305a956..3211ff214 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIT.java @@ -23,12 +23,14 @@ import org.junit.Test; import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.data.update.exception.UpdateException; import org.owasp.dependencycheck.data.update.nvd.UpdateableNvdCve; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class NvdCveUpdaterIntegrationTest extends BaseTest { +public class NvdCveUpdaterIT extends BaseTest { public NvdCveUpdater getUpdater() { NvdCveUpdater instance = new NvdCveUpdater(); diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java similarity index 98% rename from dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java rename to dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java index f379d332d..af638db7d 100644 --- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIntegrationTest.java +++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorIT.java @@ -39,12 +39,13 @@ import org.owasp.dependencycheck.exception.ReportException; import org.owasp.dependencycheck.utils.InvalidSettingException; import org.owasp.dependencycheck.utils.Settings; import org.xml.sax.SAXException; +import static org.junit.Assert.fail; /** * * @author Jeremy Long */ -public class ReportGeneratorIntegrationTest extends BaseDBTestCase { +public class ReportGeneratorIT extends BaseDBTestCase { /** * Test of generateReport method, of class ReportGenerator. diff --git a/dependency-check-maven/pom.xml b/dependency-check-maven/pom.xml index 498bdcb94..7acd5269f 100644 --- a/dependency-check-maven/pom.xml +++ b/dependency-check-maven/pom.xml @@ -85,23 +85,6 @@ Copyright (c) 2013 Jeremy Long. All Rights Reserved. - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/dependency-check-data - - - temp.directory - ${project.build.directory}/temp - - - - true org.apache.maven.plugins diff --git a/dependency-check-utils/pom.xml b/dependency-check-utils/pom.xml index da6abef71..035222a77 100644 --- a/dependency-check-utils/pom.xml +++ b/dependency-check-utils/pom.xml @@ -41,62 +41,7 @@ Copyright (c) 2014 - Jeremy Long. All Rights Reserved. - - org.codehaus.mojo - cobertura-maven-plugin - - - - 85 - 85 - false - 85 - 85 - 85 - 85 - - - .*\$.* - 0 - 0 - - - - - - - - clean - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Dfile.encoding=UTF-8 - - - data.directory - ${project.build.directory}/data - - - temp.directory - ${project.build.directory}/temp - - - - **/*IntegrationTest.java - - - - - org.apache.maven.plugins - maven-failsafe-plugin - + diff --git a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java similarity index 95% rename from dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java rename to dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java index 7e9e39309..a181249f6 100644 --- a/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIntegrationTest.java +++ b/dependency-check-utils/src/test/java/org/owasp/dependencycheck/utils/DownloaderIT.java @@ -21,12 +21,13 @@ import java.io.File; import java.net.URL; import static org.junit.Assert.assertTrue; import org.junit.Test; +import static org.junit.Assert.assertTrue; /** * * @author Jeremy Long */ -public class DownloaderIntegrationTest extends BaseTest { +public class DownloaderIT extends BaseTest { /** * Test of fetchFile method, of class Downloader. diff --git a/pom.xml b/pom.xml index 8698773ce..36d31223b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,7 @@ Copyright (c) 2012 - Jeremy Long dependency-check-maven dependency-check-utils dependency-check-plugin + build-reporting Dependency-Check https://github.com/jeremylong/DependencyCheck.git @@ -132,7 +133,6 @@ Copyright (c) 2012 - Jeremy Long 3.0 2.17 - 2.7 3.6 @@ -162,9 +162,9 @@ Copyright (c) 2012 - Jeremy Long 1.10 - org.codehaus.mojo - cobertura-maven-plugin - 2.7 + org.jacoco + jacoco-maven-plugin + 0.7.9 org.apache.maven.plugins @@ -278,19 +278,64 @@ Copyright (c) 2012 - Jeremy Long + + org.jacoco + jacoco-maven-plugin + + + pre-unit-test + + prepare-agent + + + + surefireArgLine + + + + pre-integration-test + pre-integration-test + + prepare-agent + + + + failsafeArgLine + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + ${surefireArgLine} -Dfile.encoding=UTF-8 + + + data.directory + ${project.build.directory}/data + + + temp.directory + ${project.build.directory}/temp + + + + **/*MySqlIT.java + + + org.apache.maven.plugins maven-failsafe-plugin + ${failsafeArgLine} temp.directory ${project.build.directory}/temp - - **/*IntegrationTest.java - @@ -529,13 +574,15 @@ Copyright (c) 2012 - Jeremy Long - org.codehaus.mojo - cobertura-maven-plugin - ${reporting.cobertura-plugin.version} + org.jacoco + jacoco-maven-plugin + 0.7.9 + + - cobertura + report-aggregate