Commit Graph

5742 Commits

Author SHA1 Message Date
Phillip Webb
8d12130a2b Add exclude attribute to @SpringBootApplication
Fixes gh-2207
2014-12-19 13:52:08 -08:00
Stephane Nicoll
0e88e1b86e Merge pull request #2203 from pauldub/master
* pull2203:
  Fix typo in howto.adoc
2014-12-19 15:22:42 +01:00
pauldub
b865539adc Fix typo in howto.adoc 2014-12-19 15:22:28 +01:00
Andy Wilkinson
ed0038f3c7 Merge branch '1.1.x' 2014-12-18 15:49:32 +00:00
Andy Wilkinson
e72f3c0215 Upgrade to Jetty 8.1.16.v20140903
Closes gh-2199
2014-12-18 15:43:40 +00:00
Andy Wilkinson
ddaec013bd Merge branch '1.1.x' 2014-12-18 15:32:23 +00:00
Andy Wilkinson
950eafe9cc Improve diagnostics when ServletContext.addListener fails
The various servlet containers that we support vary in the quality
of their diagnostics when ServletContext.addListener fails. To make
problem diagnosis easier, this commit ensures that the toString of the
the listener that was being added is included in the exception that's
thrown when a failure occurs.

Closes gh-2197
2014-12-18 15:31:22 +00:00
Stephane Nicoll
9a55cc49b5 Fix typo 2014-12-18 08:38:16 +01:00
Phillip Webb
0f3b959686 Scan full classpath with /templates checks
Update template auto configurations to search for template folders in
the entire classpath rather than just the root jar.

Fixes gh-2184
2014-12-17 23:10:35 -08:00
Phillip Webb
7e7acea548 Don't check for /templates when using groovy-all
Update GroovyTemplateAutoConfiguration so that the `/template`
folder check only occurs when the groovy-all jar is not being
used.

Fixes gh-2190
See gh-1915
2014-12-17 21:37:20 -08:00
Phillip Webb
6ad23b1cc4 Merge pull request #2113 from BigMichi1/thymleaf-conditional-comments
* thymleaf-conditional-comments:
  Auto-configure for Thymeleaf conditionalcomments
2014-12-17 16:23:40 -08:00
Michael Cramer
3b858edfa9 Auto-configure for Thymeleaf conditionalcomments
Add auto-configuration for thymeleaf-extras-conditionalcomments which
allows parsing of conditional comments for IE.

Example:

	<!--[if lt IE 8]>
		<link rel="stylesheet" th:href="@{/styleIE.css}"
		type="text/css"/>
	<![endif]-->

Without this dialect all Thymeleaf attributes are ignored inside the
comment.

Fixes gh-2113
2014-12-17 16:23:28 -08:00
Phillip Webb
5c27cba86b Merge pull request #2172 from ceefour/patch-1
* patch-1:
  Clarify SSL "How-to" documentation
2014-12-17 16:13:58 -08:00
Hendy Irawan
ba97090375 Clarify SSL "How-to" documentation
Update the SSL "How-to" documentation to make it clearer that SSL
configuration replaces the usual connector.

Closes gh-2172
See gh-2167
2014-12-17 16:13:28 -08:00
Phillip Webb
a663f07375 Upgrade to Jersey 2.14
Closes gh-2166
2014-12-17 16:02:12 -08:00
Phillip Webb
b27d500934 Merge pull request #2179 from izeye/master
* pull2179:
  Rename SecurityPrequisite -> SecurityPrerequisite
2014-12-17 16:00:18 -08:00
izeye
3784959b6f Rename SecurityPrequisite -> SecurityPrerequisite
Closes gh-2179
2014-12-17 15:58:59 -08:00
Stephane Nicoll
cdbc0c7f46 Harmonize JTA dependency
Mixing Hibernate and a JTA provider may lead to duplicate JTA
dependencies as the API is published with different coordinates.

The following has been applied:

* We now use `javax.transaction:javax.transaction-api` everywhere.
* The `data-jpa` starter has been updated to replace the JBoss JTA
  dependency with the standard one.
* The `jta-bitronix` starter has been updated to use JTA 1.2 instead of
  JTA 1.1 (unfortunately, JTA 1.1 is published with different
  coordinates).
* The `jta-atomikos` starter has been updated to define a dependency on
  JTA as the current version does not do it at all.
* The HornetQ JMS server is also relying on JTA but that dependency
  should have been optional. It has been excluded for the time being as
  it was using (yet) another set of coordinates.

Fixes gh-2092
2014-12-17 15:53:48 -08:00
Andy Wilkinson
843ee14cea Merge branch '1.1.x' 2014-12-17 20:21:46 +00:00
Andy Wilkinson
5c67e6f141 Update war layout to package custom scope dependencies in WEB-INF/lib/
Fixes gh-2187
2014-12-17 20:21:29 +00:00
Andy Wilkinson
ff714f6c17 Update module layout to package custom scope dependencies in lib/
Fixes gh-2187
2014-12-17 20:14:03 +00:00
Phillip Webb
6391973ed0 Always reinitialize logging system
Update LoggingSystems so that they can reinitialize themselves
before logging begins. This allows reset of the root logger (which
may have been set to OFF in beforeInitialize) and also re-evaluation
of systems properties such as PID which may not have been set when
logging configuration was first loaded.

This commit may possibly reintroduce gh-1091, but it seems like
reloading is our only option.

Fixes gh-2125
2014-12-17 11:33:29 -08:00
Phillip Webb
8fd99bde8b Update samples to use specific log configuration 2014-12-17 11:33:29 -08:00
Phillip Webb
f35135e43d Polish documentation 2014-12-17 11:33:28 -08:00
Dave Syer
80d55c4720 Additional condition to protect Reactor 2.0 users 2014-12-17 17:11:25 +00:00
Stephane Nicoll
1b039e78e6 Documentation improvement of DataSource configuration
Closes gh-2126
2014-12-17 14:25:33 +01:00
Stephane Nicoll
f6ab41dfc5 Merge pull request #2181 from panchenko/master
* pull2181:
  Remove duplicate "should" word from README
2014-12-17 13:31:18 +01:00
Alex Panchenko
8f869e6be3 Remove duplicate "should" word from README 2014-12-17 13:30:09 +01:00
Phillip Webb
a724d4581f Set Jetty temp dir
Ensure that the system temp directory is passed to the Jetty
WebAppContext. This prevents `jsp` folders from appearing in the current
directory.

Fixes gh-2169
2014-12-16 15:12:09 -08:00
Phillip Webb
917723a883 Automatically alias MultipartResolver beans
Update DispatcherServletAutoConfiguration to alias a MultipartResolver
that is not named correctly. This allows the DispatcherServlet to pick
up any MultipartResolver bean, regardless of its name.

See gh-2162
2014-12-16 11:30:43 -08:00
Phillip Webb
4a0c33e7fc Drop joda-time-*.jar from SkipPatternJarScanner
The `joda-time-jsptags.jar` jar file cannot be skipped.

Fixes gh-2168
2014-12-16 09:31:15 -08:00
Phillip Webb
f2af8b30b0 Code formatting 2014-12-16 09:30:45 -08:00
Stephane Nicoll
fe5800f8be Fix typo 2014-12-16 14:55:15 +01:00
Stephane Nicoll
77427f53cc Support of Lombok annotated ConfigurationProperties
Previously, no configuration properties were discovered on a class using
lombok instead of regular getters/setters.

This commit adds a support for some of the lombok annotations,
specifically that is @Data, @Getter and @Setter. Provides the same
semantic as what lombok is generating.

Closes gh-2114
2014-12-16 10:41:07 +01:00
Stephane Nicoll
82c6142166 Merge pull request #2165 from izeye/master
* pull2165:
  Fix typo in tests
2014-12-16 08:38:56 +01:00
izeye
d5435da495 Fix typo in tests 2014-12-16 08:38:42 +01:00
Phillip Webb
f4fbc3e339 Fix Maven Spring Loaded detection logic
Ensure that the Maven plugin RunMojo attempts to detect the Spring
Loaded agent before deciding if the JVM should be forked.

Fixes gh-2140
2014-12-15 13:10:33 -08:00
Phillip Webb
9f31e09cf0 Fix 'pid' references in the PortFileWriter
Fix numerous copy-paste errors in EmbeddedServerPortFileWriter
where PID concepts are referenced.

Fixes gh-2161
2014-12-15 12:28:39 -08:00
Phillip Webb
4293b7b797 Ensure CharacterEncodingFilter is ordered highest
Update HttpEncodingAutoConfiguration to ensure that the
CharacterEncodingFilter is ordered above any HiddenHttpMethodFilter.

Fixes gh-2148
2014-12-15 04:52:10 -08:00
Michael Cramer
6806689c08 Upgrade to Spring Integration 4.1.1.RELEASE
Closes gh-2155
2014-12-15 09:58:06 +00:00
Michael Cramer
790e5fcf67 Upgrade to H2 1.4.183
Closes gh-2154
2014-12-15 09:58:05 +00:00
Michael Cramer
24ba436e2b Upgrade to Spring AMQP 1.4.1.RELEASE
Closes gh-2152
2014-12-15 09:58:05 +00:00
Andy Wilkinson
cfd17eb479 Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2014-12-15 09:37:01 +00:00
Michael Cramer
ef64186bb9 Upgrade to SLF4J 1.7.8
Closes gh-2151
2014-12-15 09:34:19 +00:00
Phillip Webb
7f33d942f4 Fix banner NPE when when using the default package
Update ResourceBanner to protect against a null application package.

Fixes gh-2143
2014-12-14 13:51:11 -08:00
Phillip Webb
e24196b863 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/StartupInfoLogger.java
	spring-boot/src/main/java/org/springframework/boot/logging/logback/LogbackLoggingSystem.java
2014-12-14 13:48:59 -08:00
Phillip Webb
1ef77d7d97 Protect against null CodeSource location
Update LogbackLoggingSystem to protect against a potential null
CodeSource result.

Fixes gh-2149
2014-12-14 13:43:00 -08:00
Phillip Webb
c22018aaa1 Polish 2014-12-14 13:40:46 -08:00
Stephane Nicoll
ca4d1f97b5 Adding meta-data for spring.output.ansi.enabled
Closes gh-2145
2014-12-14 11:59:54 +01:00
Phillip Webb
6b4bb4d654 Unify console and file logback patterns
Update the file log pattern to write the thread name after the `---`
separator. The allows both file and console logs to be parsed in the
same way.

Fixes gh-2136
2014-12-12 19:05:37 -08:00