pull/590/head
Phillip Webb 11 years ago
parent c11d94105a
commit 44d708ef7a

@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -43,4 +43,4 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
@AutoConfigureAfter(SecurityAutoConfiguration.class)
@EnableWebSecurity
public class FallbackWebSecurityAutoConfiguration {
}
}

@ -155,11 +155,9 @@ public class JarCommand extends OptionParsingCommand {
options.valuesOf(this.excludeOption));
List<File> roots = new ArrayList<File>();
for (URL classpathEntry : classpath) {
File file = new File(URI.create(classpathEntry.toString()));
roots.add(file);
roots.add(new File(URI.create(classpathEntry.toString())));
}
List<MatchedResource> found = matcher.find(roots);
return found;
return matcher.find(roots);
}
private void writeJar(File file, Class<?>[] compiledClasses,

@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.

@ -1,5 +1,5 @@
/*
* Copyright 2012-2013 the original author or authors.
* Copyright 2012-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -22,9 +22,14 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.boot.cli.compiler.autoconfigure.RabbitCompilerAutoConfiguration;
/**
* Pseudo annotation used to trigger {@link RabbitCompilerAutoConfiguration}.
*/
@Target(ElementType.TYPE)
@Documented
@Retention(RetentionPolicy.RUNTIME)
public @interface EnableRabbitMessaging {
}
}

@ -43,7 +43,7 @@
<slf4j.version>1.7.6</slf4j.version>
<snakeyaml.version>1.13</snakeyaml.version>
<spock.version>0.7-groovy-2.0</spock.version>
<spring.version>4.0.2.RELEASE</spring.version>
<spring.version>4.0.3.BUILD-SNAPSHOT</spring.version>
<spring-integration.version>3.0.1.RELEASE</spring-integration.version>
<spring-batch.version>2.2.5.RELEASE</spring-batch.version>
<spring-data-jpa.version>1.5.1.RELEASE</spring-data-jpa.version>

@ -569,8 +569,7 @@ Tomcat 8 for it to work. For example, using the starter poms in Maven:
</dependencies>
----
change the classpath to use Tomcat 8
for it to work.
change the classpath to use Tomcat 8 for it to work.

@ -29,4 +29,5 @@ public class SampleDataJpaApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(SampleDataJpaApplication.class, args);
}
}

@ -40,7 +40,7 @@ public class SampleSecureApplication implements CommandLineRunner {
new UsernamePasswordAuthenticationToken("user", "N/A", AuthorityUtils
.commaSeparatedStringToAuthorityList("ROLE_USER")));
try {
System.out.println(service.secure());
System.out.println(this.service.secure());
}
finally {
SecurityContextHolder.clearContext();

@ -510,8 +510,10 @@ public class TomcatEmbeddedServletContainerFactory extends
}
}
catch (ClassNotFoundException ex) {
// Swallow and continue
}
catch (LinkageError ex) {
// Swallow and continue
}
return nativePage;
}

Loading…
Cancel
Save