Rob Winch 10 лет назад
Родитель
Сommit
5b0f8918ce

+ 0 - 2
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<String,Object> attrs = metadata.getAnnotationAttributes(ConditionalOnMissingBean.class.getName());
 

+ 1 - 1
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"