diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java index bccb50d4bd..548c3ab4bd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/FallbackWebSecurityAutoConfiguration.java @@ -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 { -} \ No newline at end of file +} diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java index e6748ac4cb..51f3be65f8 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/command/jar/JarCommand.java @@ -155,11 +155,9 @@ public class JarCommand extends OptionParsingCommand { options.valuesOf(this.excludeOption)); List roots = new ArrayList(); for (URL classpathEntry : classpath) { - File file = new File(URI.create(classpathEntry.toString())); - roots.add(file); + roots.add(new File(URI.create(classpathEntry.toString()))); } - List found = matcher.find(roots); - return found; + return matcher.find(roots); } private void writeJar(File file, Class[] compiledClasses, diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java index 9f5a44e2f9..daa05d7cfb 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/autoconfigure/RabbitCompilerAutoConfiguration.java @@ -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. diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableRabbitMessaging.java b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableRabbitMessaging.java index e6f9cb8d44..4fd1391b59 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableRabbitMessaging.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/groovy/EnableRabbitMessaging.java @@ -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 { -} \ No newline at end of file +} diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml index b16af205d9..0c953308c8 100644 --- a/spring-boot-dependencies/pom.xml +++ b/spring-boot-dependencies/pom.xml @@ -43,7 +43,7 @@ 1.7.6 1.13 0.7-groovy-2.0 - 4.0.2.RELEASE + 4.0.3.BUILD-SNAPSHOT 3.0.1.RELEASE 2.2.5.RELEASE 1.5.1.RELEASE diff --git a/spring-boot-docs/src/main/asciidoc/howto.adoc b/spring-boot-docs/src/main/asciidoc/howto.adoc index a8cc76b0e5..3c673c9892 100644 --- a/spring-boot-docs/src/main/asciidoc/howto.adoc +++ b/spring-boot-docs/src/main/asciidoc/howto.adoc @@ -569,8 +569,7 @@ Tomcat 8 for it to work. For example, using the starter poms in Maven: ---- -change the classpath to use Tomcat 8 -for it to work. +change the classpath to use Tomcat 8 for it to work. diff --git a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java index da643050cb..50bf0d3133 100644 --- a/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java +++ b/spring-boot-samples/spring-boot-sample-data-jpa/src/main/java/sample/data/jpa/SampleDataJpaApplication.java @@ -29,4 +29,5 @@ public class SampleDataJpaApplication { public static void main(String[] args) throws Exception { SpringApplication.run(SampleDataJpaApplication.class, args); } + } diff --git a/spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/secure/SampleSecureApplication.java b/spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/secure/SampleSecureApplication.java index ae483343d2..dbfeb69b2f 100644 --- a/spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/secure/SampleSecureApplication.java +++ b/spring-boot-samples/spring-boot-sample-secure/src/main/java/sample/secure/SampleSecureApplication.java @@ -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(); diff --git a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 0569a4bc25..a4491caed7 100644 --- a/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-boot/src/main/java/org/springframework/boot/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -510,8 +510,10 @@ public class TomcatEmbeddedServletContainerFactory extends } } catch (ClassNotFoundException ex) { + // Swallow and continue } catch (LinkageError ex) { + // Swallow and continue } return nativePage; }