github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-18 07:14:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

minor bug fix

Browse Source 
Former-commit-id: cb65f6e4a1a38454760bbecef0246b9b014471b7
This commit is contained in:
Jeremy Long
2013-04-20 14:48:58 -04:00
parent 033637dd92
commit 9d3cd0e13a
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java
View File

@@ -107,35 +107,35 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal
public void analyze(Dependency ignore, Engine engine) throws AnalysisException { public void analyze(Dependency ignore, Engine engine) throws AnalysisException {
if (!analyzed) { if (!analyzed) {
analyzed = true; analyzed = true;
Set<Dependency> dependenciesToRemove = new HashSet<Dependency>(); final Set<Dependency> dependenciesToRemove = new HashSet<Dependency>();
ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator(); final ListIterator<Dependency> mainIterator = engine.getDependencies().listIterator();
//for (Dependency dependencyToCheck : engine.getDependencies()) { //for (Dependency nextDependency : engine.getDependencies()) {
while (mainIterator.hasNext()) { while (mainIterator.hasNext()) {
final Dependency dependency = mainIterator.next(); final Dependency dependency = mainIterator.next();
if (mainIterator.hasNext()) { if (mainIterator.hasNext()) {
ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex()); final ListIterator<Dependency> subIterator = engine.getDependencies().listIterator(mainIterator.nextIndex());
while (subIterator.hasNext()) { while (subIterator.hasNext()) {
final Dependency dependencyToCheck = subIterator.next(); final Dependency nextDependency = subIterator.next();
if (identifiersMatch(dependency, dependencyToCheck) if (identifiersMatch(dependency, nextDependency)
&& hasSameBasePath(dependency, dependencyToCheck)) { && hasSameBasePath(dependency, nextDependency)) {
if (isCore(dependency, dependencyToCheck)) { if (isCore(dependency, nextDependency)) {
dependency.addRelatedDependency(dependencyToCheck); dependency.addRelatedDependency(nextDependency);
//move any "related dependencies" to the new "parent" dependency //move any "related dependencies" to the new "parent" dependency
final Iterator<Dependency> i = dependencyToCheck.getRelatedDependencies().iterator(); final Iterator<Dependency> i = nextDependency.getRelatedDependencies().iterator();
while (i.hasNext()) { while (i.hasNext()) {
dependency.addRelatedDependency(i.next()); dependency.addRelatedDependency(i.next());
i.remove(); i.remove();
} }
dependenciesToRemove.add(dependencyToCheck); dependenciesToRemove.add(nextDependency);
} else { } else {
if (isCore(dependencyToCheck, dependency)) { if (isCore(nextDependency, dependency)) {
dependencyToCheck.addRelatedDependency(dependency); nextDependency.addRelatedDependency(dependency);
//move any "related dependencies" to the new "parent" dependency //move any "related dependencies" to the new "parent" dependency
final Iterator<Dependency> i = dependency.getRelatedDependencies().iterator(); final Iterator<Dependency> i = dependency.getRelatedDependencies().iterator();
while (i.hasNext()) { while (i.hasNext()) {
dependencyToCheck.addRelatedDependency(i.next()); nextDependency.addRelatedDependency(i.next());
i.remove(); i.remove();
} }
dependenciesToRemove.add(dependency); dependenciesToRemove.add(dependency);

2
src/main/resources/schema/DependencyCheck.xsd
View File

@@ -7,7 +7,7 @@
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" /> <xs:element name="name" type="xs:string" minOccurs="1" maxOccurs="1" />
<xs:element name="reportDate" type="xs:date" minOccurs="1" maxOccurs="1" /> <xs:element name="reportDate" type="xs:string" minOccurs="1" maxOccurs="1" />
<xs:element name="credits" type="xs:string" minOccurs="1" maxOccurs="1" /> <xs:element name="credits" type="xs:string" minOccurs="1" maxOccurs="1" />
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>