From c861f24ba36ab5701dc496f7df79bccee6ad8bb5 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 11 Jun 2014 10:04:06 -0700 Subject: [PATCH] Switch mergeDependencies to use a set. --- .../boot/dependency/tools/AbstractDependencies.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/AbstractDependencies.java b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/AbstractDependencies.java index 32693cd0e91..f3f75249918 100644 --- a/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/AbstractDependencies.java +++ b/spring-boot-tools/spring-boot-dependency-tools/src/main/java/org/springframework/boot/dependency/tools/AbstractDependencies.java @@ -19,14 +19,15 @@ package org.springframework.boot.dependency.tools; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedHashMap; -import java.util.List; +import java.util.LinkedHashSet; import java.util.Map; +import java.util.Set; import org.springframework.boot.dependency.tools.Dependency.Exclusion; /** * Abstract base implementation for {@link Dependencies}. - * + * * @author Phillip Webb * @author Andy Wilkinson * @since 1.1.0 @@ -68,12 +69,11 @@ abstract class AbstractDependencies implements Dependencies { private Dependency mergeDependencies(Dependency existingDependency, Dependency newDependency) { - List combinedExclusions = new ArrayList(); + Set combinedExclusions = new LinkedHashSet(); combinedExclusions.addAll(existingDependency.getExclusions()); combinedExclusions.addAll(newDependency.getExclusions()); - return new Dependency(newDependency.getGroupId(), newDependency.getArtifactId(), - newDependency.getVersion(), combinedExclusions); + newDependency.getVersion(), new ArrayList(combinedExclusions)); } /**