renamed modules and fixed errors with various lifecycle stages

This commit is contained in:
Jeremy Long
2018-01-25 06:54:01 -05:00
parent 3736161e39
commit 62a5db6b8b
740 changed files with 40 additions and 12 deletions

34
pom.xml
View File

@@ -24,12 +24,12 @@ Copyright (c) 2012 - Jeremy Long
<packaging>pom</packaging>
<modules>
<module>dependency-check-core</module>
<module>dependency-check-cli</module>
<module>dependency-check-ant</module>
<module>dependency-check-maven</module>
<module>dependency-check-utils</module>
<module>dependency-check-plugin</module>
<module>utils</module>
<module>core</module>
<module>cli</module>
<module>ant</module>
<module>maven</module>
<module>archetype</module>
<module>build-reporting</module>
</modules>
<name>Dependency-Check</name>
@@ -379,6 +379,26 @@ Copyright (c) 2012 - Jeremy Long
</scripts>
</configuration>
</execution>
<execution>
<id>add-dynamic-properties-site</id>
<phase>pre-site</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<scripts>
<script><![CDATA[
if ("dependency-check-parent".equals("${project.artifactId}")) {
config = "file:///${project.basedir}/src/main/config"
} else {
config = "file:///${project.basedir}/../src/main/config"
}
project.properties['odc.config']= config
]]></script>
</scripts>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@@ -630,7 +650,7 @@ Copyright (c) 2012 - Jeremy Long
<configuration>
<target name="copy xsd to site">
<copy todir="target/site/">
<fileset dir="dependency-check-core/src/main/resources/schema/">
<fileset dir="core/src/main/resources/schema/">
<include name="**/*.xsd"/>
</fileset>
</copy>