From 5b0f8918cefa690fb69a0356d7b3ae796ce65c7d Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Thu, 22 Jan 2015 12:34:52 -0600 Subject: [PATCH] Fix Eclipse import --- .../config/annotation/web/configuration/OnBeanCondition.java | 2 -- samples/cas/sample-xml/cassample.gradle | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java index b5e51850f0..7f485a9e01 100644 --- a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java +++ b/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OnBeanCondition.java @@ -26,12 +26,10 @@ import java.util.Map; * @author Rob Winch */ class OnMissingBeanCondition implements ConfigurationCondition { - @Override public ConfigurationPhase getConfigurationPhase() { return ConfigurationPhase.REGISTER_BEAN; } - @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Map attrs = metadata.getAnnotationAttributes(ConditionalOnMissingBean.class.getName()); diff --git a/samples/cas/sample-xml/cassample.gradle b/samples/cas/sample-xml/cassample.gradle index 441f4c9b38..c31cae6658 100644 --- a/samples/cas/sample-xml/cassample.gradle +++ b/samples/cas/sample-xml/cassample.gradle @@ -23,7 +23,7 @@ sourceSets { integrationTest.groovy.srcDir file('src/integration-test/groovy') } -eclipse.classpath.plusConfigurations += configurations.integrationTestRuntime +eclipse.classpath.plusConfigurations += [configurations.integrationTestRuntime] dependencies { providedCompile "javax.servlet:javax.servlet-api:$servletApiVersion"