Commit Graph

7093 Commits

Author SHA1 Message Date
Phillip Webb
2cb38bc8e2 Apply Log4J2LoggingSystem.FILTER to main config
Update Log4J2LoggingSystem so that the FILTER is applied to the main
configuration and not to the root logger. Prior to this commit calls
to `logger.isErrorEnabled()` would not consider the filter and hence
would always return `true`. This caused `SpringApplication` to silently
swallow exceptions.

Fixes gh-5271
2016-07-18 14:26:11 -07:00
Phillip Webb
3c67ecca61 Downgrade to HSQLDB 2.3.3
Closes gh-6415
2016-07-18 13:07:00 -07:00
Phillip Webb
3b0b65cafc Fix deprecation warning 2016-07-18 13:05:19 -07:00
Phillip Webb
fd6c0029dc Formatting 2016-07-13 10:44:37 -07:00
Dave Syer
af426d0856 Be more defensive about a null password in Undertow SSL
Fixes gh-6387
2016-07-13 15:36:55 +01:00
Andy Wilkinson
b1dd92881d Retry class file upload to remote application that fails to connect
Closes gh-6339
2016-07-13 10:35:42 +01:00
Andy Wilkinson
68fb5789ca Create one SpringApplicationAdminMXBeanRegistrar per context hierarchy
Previously, one SpringApplicationAdminMXBeanRegistrar was created
per context. When there was more then one context this would result
in a javax.management.InstanceAlreadyExistsException being thrown
as an attempt was made to register the MBean more than once.

This commit updates SpringApplicationAdminJmxAutoConfiguration so
that the registrar is only created when there's no such existing bean
in the context hierarchy.

Closes gh-6378
2016-07-13 09:52:23 +01:00
Andy Wilkinson
49302b3449 Merge pull request #6381 from Raja Dilip Kolli
* gh-6381:
  Upgrade to Thymeleaf 2.1.5.RELEASE
2016-07-13 08:50:08 +01:00
Raja Dilip Kolli
e49ec03215 Upgrade to Thymeleaf 2.1.5.RELEASE
Closes gh-6381
2016-07-13 08:49:19 +01:00
Andy Wilkinson
c2db9fa385 Update admin MBean to only be ready when its own context is ready
Previously, if there was a hierarchy of SpringApplications, the admin
MBean would report that the application was ready as soon as any
application in the hierarchy was ready. This could lead to a client
trying to query a property in the environment before it's available.

This commit updates the MBean registrar to that the MBean only reports
that the application is ready when the context that contains the
registrar has refreshed and fired its ApplicationReadyEvent.

Closes gh-6362
2016-07-12 09:13:36 +01:00
Andy Wilkinson
4963cfd67b Reset thread's interrupted flag when catching InterruptedException
Closes gh-6360
2016-07-11 16:46:05 +01:00
Andy Wilkinson
e53d3167ab Set TCCL of shutdown thread when triggered by the shutdown endpoint
Previously, the shutdown endpoint would spawn a new thread to perform
the shutdown but did not explicitly configure its thread context
class loader (TCCL). This mean that the new thread would use the
request thread's TCCL as its TCCL. This meant that a different TCCL
would be used compared to a shutdown triggered by the shutdown hook
and also caused problems with Tomcat's thread leak detection logic.

This commit updates the shutdown endpoint to explicitly configure the
TCCL of the shutdown thread to be the ClassLoader that loaded the
endpoint's class.

Closes gh-6361
2016-07-11 11:27:41 +01:00
Stephane Nicoll
78879f4bdb Fix documentation
Closes gh-6358
2016-07-11 11:08:36 +02:00
Andy Wilkinson
26a233a870 Upgrade to Hikari 2.4.7
Closes gh-6344
2016-07-08 11:18:14 +01:00
Stephane Nicoll
bbb29dd70f Remove @Primary from IntegrationMBeanExporter
Commit 3ea84f9e1 has wrongly introduced a `@Primary` marker on
`IntegrationMBeanExporter` so any use of both Spring's JMX support
and Spring Integration's JMX support leads to an exception. This commit
makes sure to remove the unnecessary `@Primary`

Closes gh-6328
2016-07-07 15:36:02 +02:00
Stephane Nicoll
eeb95693b3 Fixup version numbers following release 2016-07-04 16:45:17 +02:00
Spring Buildmaster
2216369348 Next Development Version 2016-07-04 14:15:02 +00:00
Stephane Nicoll
566b4e9a16 Upgrade to Spring Framework 4.2.7.RELEASE
Closes gh-6249
2016-07-04 13:25:11 +02:00
Andy Wilkinson
46a1f0d00e Upgrade to Spring Cloud Connectors 1.2.3.RELEASE
Closes gh-6315
2016-07-04 09:27:57 +01:00
Phillip Webb
e452373c04 Fix imports in health sample documentation
Fixes gh-6312
2016-07-03 21:52:57 -07:00
Stephane Nicoll
49fefdafd8 Fix doc formatting
Closes gh-6275
2016-07-01 14:07:01 +02:00
Andy Wilkinson
5f6821d7eb Drop back to Git Commit ID Plugin 2.1.13
Closes gh-6276
2016-07-01 13:02:08 +01:00
Andy Wilkinson
e4cead6b89 Upgrade to Git Commit ID Plugin 2.1.15
Closes gh-6276
2016-07-01 12:22:26 +01:00
Andy Wilkinson
e2de73b87e Upgrade to Maven Javadoc Plugin 2.10.4
Closes gh-6274
2016-07-01 12:22:26 +01:00
Andy Wilkinson
51ea174256 Upgrade to Maven Failsafe Plugin 2.18.1
Closes gh-6273
2016-07-01 12:22:25 +01:00
Andy Wilkinson
f48c02ccb5 Upgrade to Spring Integration 4.2.8.RELEASE
Closes gh-6271
2016-07-01 11:37:39 +01:00
Andy Wilkinson
72d59b9fcf Upgrade to Freemarker 2.3.24-incubating
Closes gh-6270
2016-07-01 11:37:10 +01:00
Andy Wilkinson
0976178def Upgrade to Groovy 2.4.7
Closes gh-6269
2016-07-01 11:36:33 +01:00
Andy Wilkinson
5e6f859304 Upgrade to Tomcat 8.0.36
Closes gh-6268
2016-07-01 11:36:04 +01:00
Andy Wilkinson
03c0b24798 Upgrade to httpasynclient 4.1.2
Closes gh-6267
2016-07-01 11:35:40 +01:00
Andy Wilkinson
6d3f6c5886 Upgrade to EhCache 2.10.2.2.21
Closes gh-6266
2016-07-01 11:35:15 +01:00
Andy Wilkinson
bf90e67042 Upgrade to Jackson 2.6.7
Closes gh-6265
2016-07-01 11:34:42 +01:00
Andy Wilkinson
02e989c863 Check that URL is actually a file URL before getting a File from it
Previously, Log4J2LoggingSystem used ResourceUtils.isFileURL(URL) to
check that the URL of the configuration was suitable for accessing as a
File. Unfortunately, this fails when the URL’s protocol is vfs or
vfsfile as both return true and then fail when the URL is subsequently
passed into ResourceUtils.getFile(URL).

This commit switches to checking that the URL’s protocol is file,
the only protocol that will allow getFile(URL) to succeed.

Closes gh-6246
2016-06-30 15:55:22 +01:00
Andy Wilkinson
4c8729a3f2 Upgrade to Undertow 1.3.23.Final
Closes gh-6245
2016-06-29 17:02:40 +01:00
Andy Wilkinson
911f728bc3 Start building against Spring Framework 4.2.7 snapshots
See gh-6249
2016-06-29 17:01:55 +01:00
Stephane Nicoll
779537551e Merge pull request #6176 from magiccrafter:master
* pr/6176:
  Polish "Use missing MongoClientOptions in MongoProperties"
  Use missing MongoClientOptions in MongoProperties
2016-06-27 15:17:44 +02:00
Stephane Nicoll
4e07003e1d Polish "Use missing MongoClientOptions in MongoProperties"
Closes gh-6176
2016-06-27 15:14:24 +02:00
Nasko Vasilev
59f9cfb8a6 Use missing MongoClientOptions in MongoProperties
See gh-6176
2016-06-27 15:14:08 +02:00
Stephane Nicoll
13403a0f72 Merge pull request #6203 from julien-may:1.3.x
* pr/6203:
  Polish "Add condition on MongoClientFactoryBean"
  Add condition on MongoClientFactoryBean
2016-06-27 14:56:03 +02:00
Stephane Nicoll
7a5fabf59d Polish "Add condition on MongoClientFactoryBean"
Closes gh-6203
2016-06-27 14:55:47 +02:00
Julien May
2003c5e1ae Add condition on MongoClientFactoryBean
This commit makes sure that the condition that links a `MongoClient` to
the embedded mongo server kicks in only if `MongoClientFactoryBean` is
also on the classpath.

Previously, only a condition on the mongo driver existed, leading to
`ClassNotFoundException` if Spring Data MongoDB wasn't available.

See gh-6203
2016-06-27 14:39:20 +02:00
Stephane Nicoll
17f8a244de Fix property names with successive capital letters
Previously, if a property name had successive capital letters, the
generated meta-data would clean it in such a way it is defined as a
regular word. For instance a `myFOO` property would be written as
`my-foo` in the meta-data.

It turns out this decision is wrong as the binder has no way to compute
back the name of the property and therefore `my-foo` wouldn't bind to
`setMyFOO` as it should.

This commit updates the meta-data name generation algorithm to properly
identify such cases: `myFOO` now translates to `my-f-o-o`. While the
generated name is a bit ugly, it now provides a consistent binding
experience.

Closes gh-5330
2016-06-27 12:02:34 +02:00
Andy Wilkinson
8d491f278b Create FilePermission lazily in JarURLConnection
JarURLConnection is very performance sensitive. The change in 3772d9f
meant that every JarURLConnection would create a FilePermission,
irrespective of whether it was actually used.

This commit updates JarURLConnection to create its FilePermission
lazily. When there is no security manager a permission will no longer
be created at all.

Closes gh-5411
See gh-6215
2016-06-24 11:49:35 +01:00
Andy Wilkinson
17546628f5 Remove springloaded from samples
springloaded isn't required in any of the samples, yet some of them
make use of it without being a springloaded-specific sample. This
is creating the false impression that springloaded is necessary in
cases where it's not.
2016-06-23 12:58:42 +01:00
Stephane Nicoll
bffcb1aad2 Document available layouts
Closes gh-5524
2016-06-23 10:42:47 +02:00
Andy Wilkinson
6c8f8c9d82 Better diagnotics when ESCF subclass breaks with custom management port
When a custom management.port is used, the child context is configured
with an EmbeddedServletContainerFactory bean that has the same class
as the parent context’s EmbeddedServletContainerFactory bean. This
ensures that the child context uses the same type of embedded container
as its parent when there are multiple embedded containers on the
classpath. It also causes a failure when the custom
EmbeddedServletContainerFactory subclass cannot be instantiated, for
example because it’s an anonymous inner-class.

This commit improves the diagnostics so that we fail fast with an
information exception message when we detect that the embedded servlet
container factory bean’s class cannot be instantiated.

Closes gh-6193
2016-06-21 15:05:00 +01:00
Dave Syer
f083447a1b Bump spring-retry to 1.1.3 2016-06-21 14:53:01 +01:00
Phillip Webb
5b97981c87 Polish 2016-06-20 18:13:43 -07:00
Andy Wilkinson
9d194c2d43 Add test to verify binding of a property with all upper-case suffix
See gh-5330
2016-06-20 20:24:41 +01:00
Brian Clozel
c1fcecb415 Document JSP limitation: error page customization
Closes gh-2893
2016-06-20 17:56:30 +02:00