Commit Graph

4412 Commits

Author SHA1 Message Date
Andy Wilkinson
31705982a0 Upgrade to Spring Social Twitter 1.1.1.RELEASE
Closes gh-3913
2015-09-22 10:35:09 +01:00
Phillip Webb
d22d0683b2 Fixup build following release 2015-09-16 12:03:23 -04:00
Spring Buildmaster
9409c49c10 Next development version 2015-09-16 09:00:17 -07:00
Phillip Webb
11d59df3fd Add registerErrorPageFilter option flag
Update SpringBootServletInitializer with a registerErrorPageFilter flag
that can be used to disable ErrorPageFilter registration.

Fixes gh-3603
2015-09-11 13:03:10 -07:00
Phillip Webb
de48223a2e Only handle status errors when sendError is called
Update ErrorPageFilter to only handle errors when `response.sendError`
has been called. This should allow custom @ExceptionHandlers to
completely handle errors and return custom status codes without
triggering the "Cannot forward to error page" log message.

The Javadoc for sendError states:

  "The server defaults to creating the response to look like an
   HTML-formatted server error page containing the specified message"

Where as setStatus states

  "This method is used to set the return status code when there is
   no error "

Fixes gh-2745
2015-09-11 12:27:39 -07:00
Phillip Webb
5f250ebbc1 Add exception endpoints to tomcat-jsp sample
Update `spring-boot-sample-tomcat-jsp` to include endpoints that trigger
exceptions. Primarily to aid testing of the ErrorPageFilter.

See gh-2745
2015-09-11 12:25:48 -07:00
Phillip Webb
86d5c19259 Don't mix collection values from different sources
Update PropertySourcesPropertyValues so that collection values are only
added from a single PropertySource. Prior to this commit, given the
following:

    PropertySource-A
     list[0]=x

    PropertySource-B
     list[0]=y
     list[1]=z

PropertySourcesPropertyValues would take `x` from A and `z` from B,
resulting in a binding of `[x,z]`. The updated code now returns the
more logical `[x]`.

Fixes gh-2611
2015-09-10 19:39:55 -07:00
Phillip Webb
16a1bd0483 Revert "Only format changed lines"
This reverts commit e04fb15574.

Formatting only changed lines doesn't appear to work well.
2015-09-10 17:38:59 -07:00
Phillip Webb
e97042507b Restore cargo downloads directory to /tmp
Using the $home directory seems to be causing intermittent failures on
the CI box.

See gh-3861
2015-09-10 15:29:34 -07:00
Phillip Webb
624350f41e Merge pull request #3605 from tan9/patch-3
* pr/3605:
  Catch more general Hibernate 4.2 LinkageError
2015-09-10 14:58:44 -07:00
Pei-Tang Huang
a5430d8a0c Catch more general Hibernate 4.2 LinkageError
Update HibernateJpaAutoConfiguration to catch LinkageError rather than
NoClassDefFoundError. Required due to the fact that JBoss EAP 6 wraps
NoClassDefFoundErrors.

Fixes gh-3605
2015-09-10 14:58:26 -07:00
Phillip Webb
b7e9f805c9 Set ignoreUnknownFields=true on ServerProperties
Update ServerProperties so that unknown SERVER_* environment properties
do not cause startup failures.

Fixes gh-3903
2015-09-10 14:49:41 -07:00
Phillip Webb
e69a5879b0 Merge pull request #3926 from trecloux/gh-3924_propagate-log-level-to-JUL
* gh-3926:
  Propagates logback log levels to java.util.logging
2015-09-10 14:45:40 -07:00
Thomas Recloux
22e0a50a11 Propagates logback log levels to java.util.logging
Adds the LevelChangePropagator logback listener in order to propagate
Logback's log level changes to java.util.logging loggers.

Logback documentation :
http://logback.qos.ch/manual/configuration.html#LevelChangePropagator

Fixes gh-3924
Closes gh-3926
2015-09-10 14:44:45 -07:00
Phillip Webb
e04fb15574 Only format changed lines
Update Eclipse cleanup actions to only format changed lines. This will
hopefully help to prevent so many false diffs caused by differences
between Eclipse Luna and Eclipse Mars.
2015-09-08 14:27:29 -07:00
Phillip Webb
15686ed4fd Reformat code 2015-09-08 14:07:06 -07:00
Phillip Webb
0f6b60d8c8 Organize imports 2015-09-08 14:05:00 -07:00
Phillip Webb
653d2b2b4e Tweak eclipse settings
- Update whitespace after inline generics
- Use a more sensible import order
- Update Javadoc warning settings
2015-09-08 13:40:47 -07:00
Phillip Webb
adf2c44bdd Set registerShutdownHook to false for tests
Update SpringApplicationContextLoader so that setRegisterShutdownHook
is false for tests.

Fixes gh-3763
2015-09-03 10:58:27 -07:00
Phillip Webb
b4e0a77269 Polish POM whitespace 2015-09-03 10:39:49 -07:00
Phillip Webb
feb2452f06 Simplify WebApplicationContext class guard
See gh-3856
2015-09-03 10:33:53 -07:00
Andy Wilkinson
cb4e709ba2 Upgrade to Spring Social LinkedIn 1.0.2.RELEASE
Closes gh-3869
2015-09-02 16:28:50 +01:00
Andy Wilkinson
3d099fe9be Upgrade to Spring Social Facebook 2.0.2.RELEASE
Closes gh-3779
2015-09-02 16:28:50 +01:00
Andy Wilkinson
2429cc6766 Upgrade to Hibernate 4.3.11.Final
Closes gh-3868
2015-09-02 16:28:50 +01:00
Barry Lagerweij
8d75aa0ea9 Fix Oracle XA datasource class name
Closes gh-3846
2015-09-02 16:44:29 +02:00
Stephane Nicoll
5043c959a2 Refine check
Refine commit 8a96481 to set the web environment to false if spring web
is not available in the classpath. Thanks to @mjustin for spotting that
mistake.

Closes gh-3856
2015-09-01 18:39:43 +02:00
Stephane Nicoll
426a8dc103 Store container installs in home directory
Previously, deployment tests were storing the container archives in the
default location (that is `/tmp`) for a total weight of 160MB. In case
the temp directory is cleaned on CI, these have to be downloaded again.

We're now configuring cargo to store these archives in the home directory
instead. This should improve the speed and the stability of the
deployment tests

Closes gh-3861
2015-09-01 16:41:29 +02:00
Stephane Nicoll
8a96481423 Properly guard customization of application context class
SpringApplication wrongly expects spring-web to be on the classpath to
figure out whether or not the web environment should be enabled for a
custom context class.

We now properly guard this check so that the web environment is not
enabled (read: not checked) if `spring-web` is not available.

Closes gh-3856
2015-09-01 09:15:40 +02:00
Stephane Nicoll
cd39e6a742 Upgrade to H2 1.4.188
Closes gh-3843
2015-08-29 08:01:00 +02:00
Andy Wilkinson
f143bd2cfb Upgrade to Tomcat 8.0.26
Closes gh-3406
Closes gh-3526
2015-08-26 15:01:29 +01:00
Stephane Nicoll
6393569d42 Polish Externalized Configuration section
Closes gh-3823
2015-08-25 15:22:02 +02:00
Stephane Nicoll
6869b0d987 Fix wrong imports on StringUtils
Closes gh-3792
2015-08-20 14:46:20 +02:00
Stephane Nicoll
11b82cc6fe Properly guard DB health indicator
The DataSource health indicator uses `JdbcTemplate` behind the scenes
but nothing was checking that it is actually available.

`DataSourcesHealthIndicatorConfiguration` is now disabled if
`spring-jdbc` is not on the classpath.

Fixes gh-3765
2015-08-17 10:08:07 +02:00
Andy Wilkinson
190f8a7e0a Upgrade Travis configuration to run on new infrastructure
Closes gh-3760
2015-08-14 18:08:48 +01:00
Andy Wilkinson
4f0f51b5ed Upgrade to Spring Web Services 2.2.2.RELEASE
Closes gh-3423
2015-08-10 20:30:54 +01:00
Andy Wilkinson
a2f4c1cc4a Add support for configuring allowSessionOverride via the environment
This commit adds support for using the environment to configure the
Freemarker and Velocity view resolvers to allow session overrides.

Closes gh-3410
2015-08-10 16:58:17 +01:00
Andy Wilkinson
f9a775518f Upgrade to Spring Batch 3.0.5.RELEASE
Closes gh-3421
2015-08-10 16:35:22 +01:00
Stephane Nicoll
1ee31e73d3 Avoid NPE if @ConfigurationProperties is not present
The annotation processor detects `@ConfigurationProperties` bean or
method definition and merges manual meta-data. The former step will fail
with a NPE if the annotation is not present on the classpath. This could
happen if the annotation processor is added to a module that is not
actually using Spring Boot.

We now have a defensive check that skips that steps but still attempts to
merge manual meta-data if present.

Closes gh-3720
2015-08-10 16:34:30 +02:00
Thomas Traude
2b6d7a3f15 Update URL to Groovy Docs
Closes gh-3715
2015-08-09 09:03:54 +02:00
Stephane Nicoll
f88d548de0 Fix typo
Closes gh-3700
2015-08-07 16:03:25 +02:00
Andy Wilkinson
890fb9665d Upgrade to Spring Loaded 1.2.4.RELEASE
Closes gh-3681
2015-08-05 16:51:49 +01:00
Andy Wilkinson
dd4c542e32 Upgrade to Undertow 1.1.8.Final
Closes gh-3674
2015-08-05 16:33:00 +01:00
Andy Wilkinson
c4d0f949d4 Upgrade to mysql:mysql-connector-java 5.1.36
Closes gh-3673
2015-08-05 16:32:31 +01:00
Andy Wilkinson
370247f9e4 Upgrade to Jetty 9.2.13.v20150730
Closes gh-3672
2015-08-05 16:31:36 +01:00
Andy Wilkinson
8df4985675 Upgrade to Freemarker 2.3.23
Closes gh-3671
2015-08-05 16:30:43 +01:00
Andy Wilkinson
82212e6271 Upgrade to Spring Integration 4.1.6.RELEASE
Closes gh-3670
2015-08-05 16:30:01 +01:00
Andy Wilkinson
5756195c05 Upgrade to Spring Security 3.2.8.RELEASE
Closes gh-3669
2015-08-05 16:29:29 +01:00
Andy Wilkinson
905346d0cd Consider @Bean methods with args to determine type created by factory
Previously, BeanTypeRegistry would only look for a @Bean method
with no arguments when trying to determine the type that will be
created by a factory bean. This meant that the type produced by a
factory bean declared via a @Bean that has one or more arguments would
be unknown and any on missing bean conditions look for a bean of the
type produced by the factory bean would match in error.

This commit updates BeanTypeRegistry to, where possible, use the
factory method metadata for the bean definition when determining the
type that will be created. This allows it to determine the type for
factory bean created by @Bean methods that take arguments and also
avoids the use reflection to find the factory method. Where factory
method metadata is not available, the existing reflection-based
approach is used as a fallback.

Closes gh-3657
2015-08-04 11:34:53 +01:00
Phillip Webb
2c0ec1b428 Polish 2015-08-03 11:09:33 -07:00
Andy Wilkinson
acfb07bdd6 Merge branch 'gh-3628' into 1.2.x 2015-08-03 16:23:47 +01:00