Commit Graph
1557 Commits
Author SHA1 Message Date
Stephane Nicoll 502daf06ab Merge branch '1.5.x' 2016-10-07 10:23:27 +02:00
Stephane Nicoll d57f3afdd3 Add XA datasource for Apache Derby
Closes gh-6823
2016-10-07 10:23:13 +02:00
Stephane Nicoll 640a77fcfa Merge branch '1.5.x' 2016-10-07 09:46:39 +02:00
Stephane Nicoll 02b0e3955c Merge branch '1.4.x' into 1.5.x 2016-10-07 09:46:21 +02:00
Johnny Lim 1c4c0c6119 Fix String.format() usages
Closes gh-7120
2016-10-07 09:45:43 +02:00
Stephane Nicoll f6f07dd426 Merge branch '1.5.x' 2016-10-06 13:35:44 +02:00
Stephane Nicoll 0fe0ad4cfb Merge branch '1.4.x' into 1.5.x 2016-10-06 13:35:32 +02:00
Stephane Nicoll 668993c4bf Fix typo
Closes gh-7117
2016-10-06 13:35:21 +02:00
Phillip Webb 53f50eda39 Merge branch '1.5.x' 2016-10-03 22:47:11 -07:00
Phillip Webb a2315378d4 Formatting 2016-10-03 22:44:36 -07:00
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 2016-10-03 22:38:22 -07:00
Phillip Webb 3326841a97 Formatting 2016-10-03 22:19:35 -07:00
Stephane Nicoll a9b610c4fc Deprecate ResourceLoaderAware callback
Closes gh-6986
2016-10-03 11:42:46 +02:00
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 2016-10-02 11:08:53 +02:00
Stephane Nicoll e643fc5bd1 Merge branch '1.4.x' into 1.5.x 2016-10-02 11:08:33 +02:00
Johnny Lim 503d735fdd Polish
Closes gh-7081
2016-10-02 11:07:04 +02:00
Andy Wilkinson f82dc8e043 Upgrade to JMS API 2.0
Closes gh-7049
2016-09-29 20:33:21 +01:00
Andy Wilkinson 2a035d0748 Remove support for Velocity following its deprecation in 1.4
Closes gh-6971
2016-09-29 15:44:36 +01:00
Andy Wilkinson 26c9d5a7e2 Merge branch '1.4.x' into 1.5.x 2016-09-29 14:28:20 +01:00
Andy Wilkinson bacdc204ae Polish imports 2016-09-29 14:27:42 +01:00
Stephane Nicoll 1942cd1e81 Merge branch '1.5.x' 2016-09-26 12:45:32 +02:00
Stephane Nicoll 984b02dc7f Upgrade to Undertow 1.4.3.Final
Closes gh-7019
2016-09-26 12:43:24 +02:00
Andy Wilkinson 1d1714ee8b Merge branch '1.5.x' 2016-09-21 20:51:08 +01:00
Andy Wilkinson bdc949d1b7 Remove deprecated merge and locations attributes from @ConfigurationProperties
Closes gh-6972
2016-09-21 20:50:21 +01:00
Andy Wilkinson bd8a9bb310 Polish
See gh-6971 and commit ce1e41d
2016-09-21 19:54:55 +01:00
Andy Wilkinson 0cdbbd49b5 Address warnings caused by deprecations in Spring Framework 5
See gh-6977
2016-09-21 17:34:54 +01:00
Andy Wilkinson 312292b93e Update Animal Sniffer and related annotations for Java 8 baseline
Closes gh-6981
2016-09-21 17:20:49 +01:00
Stephane Nicoll 9bc77254a7 Start building against Spring Framework 5 snapshot
This commit enables compatibility build against Spring Framework 5.

The Velocity and Guava support that are deprecated in the 1.x line have
been removed and few other classes contain minor change to comply to non
backward compatible changes in Spring Framework 5.

This commit also switches the required java version to 8.

Closes gh-6977
2016-09-21 17:37:02 +02:00
Stephane Nicoll ce1e41dce3 Remove deprecated code
This code removes code deprecated in 1.4 with the exception of code that
requires an update to Spring Framework 5.

Closes gh-6971
2016-09-21 14:30:28 +02:00
Phillip Webb 51092af739 Polish 2016-09-20 14:32:09 -07:00
Phillip Webb 0b9667c26f Drop setResolvePlaceholders()
Remove setResolvePlaceholders() from PropertySourcesPropertyValues
and instead rely only on the constructor.

See gh-6964
2016-09-20 14:22:51 -07:00
Phillip Webb 7896ec5a7b Polish 2016-09-20 14:20:52 -07:00
Andy Wilkinson 564207b092 Add Tomcat-specific failure analysis for connector start failures
Previously, when a Tomcat connector failed to start it was assumed that
the failure was due to the port being in use and a PortInUseException
was thrown. Unfortunately, this assumption doesn’t always hold true.
For example, a Tomcat connector will also fail to start when its using
SSL and the key store password is wrong. This could lead to incorrect
guidance from the PortInUseFailureAnalyzer indicating that a port clash
had occurred when, in fact, it was the SSL configuration that needed to
be corrected.

Unfortunately, Tomcat only tells us that the connector failed to start.
It doesn’t provide access to the exception that would allow us to
determine why it failed to start. This commit updates the embedded
Tomcat container to throw a ConnectorStartFailedException in the event
of a connector failing to start. A new failure analyser,
ConnectorStartFailureAnalyzer, has been introduced to analyse the new
exception and offer some more general guidance.

Closes gh-6896
2016-09-20 13:55:10 +01:00
Dave Syer 26a90c1d24 Add flag to PropertiesConfigurationFactory to switch off placeholder resolution
The default behaviour is unchanged, but it is useful for some applications to be
able to bind without placeholder resolution (e.g. to prevent exposing system
environment variables, if the bound object is being sent over the wire).
2016-09-20 10:13:54 +01:00
Phillip Webb b269ab0e4a Make DefaultApplicationArguments public
Fixes gh-6521
2016-09-18 23:41:03 -07:00
Andy Wilkinson 4d2e557fdf Merge branch '1.3.x 2016-09-15 13:35:52 +01:00
Andy Wilkinson b8833c40b6 Allow spring.config.location to be configured via servlet context
Previously, in a war deployment, the web environment’s property sources
were initialized using the servlet context after the application’s
configuration had been read by ConfigFileApplicationListener. This
meant that spring.config.location configured via the servlet context
had no effect.

This commit adds a new ApplicationListener,
ServletContextApplicationListener, that initialises the configurable
web environment’s property sources using the servlet context. It’s
ordered with higher precedence than ConfigFileApplicationListener to
ensure that any properties defined in the servlet context are available
when loading the application’s configuration.

Closes gh-6801
2016-09-15 13:28:23 +01:00
Andy Wilkinson 56cf49665f Add some tests for ServletContextApplicationContextInitializer 2016-09-15 13:14:02 +01:00
Stephane Nicoll 8470ecb4d0 Polish 2016-09-15 09:37:23 +02:00
Phillip Webb 0606428609 Allow default profile to also be set in properties
Update `ConfigFileApplicationListener` so that active profiles set in
properties files that overlap with `spring.profiles.default` can still
be set.

Prior to this commit if `spring.profiles.active` happened to specify
a profile name that was also in `spring.profiles.default` it would
not get applied.

Fixes gh-6833
2016-09-14 17:49:59 -07:00
Andy Wilkinson a68cf77386 Upgrade to Tomcat 8.5.5
As part of the upgrade, Tomcat now requires a keystore to contain
an X.509 certificate. The two stores used in our tests have been
updated by exporting their private keys and adding them as
certificates. For example:

$ keytool -exportcert -keystore test.jks -alias tomcat > exported
$ keytool -importcert -keystore test.jks -file exported

Closes gh-6703
Closes gh-6657
2016-09-14 14:59:53 +01:00
Phillip Webb 07b2fe1d67 Support relaxed binding to 'mixedCASE' names
Update relaxed binding so that names of the form `initSQL` can now
be bound against properties of the form `init-s-q-l`.

Fixes gh-6803
2016-09-09 15:36:38 -07:00
Phillip Webb 56544c8dd5 Polish 2016-09-09 10:27:44 -07:00
Stephane Nicoll b450fece2e Add NoSuchBeanDefinitionException failure analyzer
Add a `FailureAnalyzer` that handles the case where the context does
not start because no candidate bean was found for an `InjectionPoint`.

The implementation inspects the auto-configuration report for beans
that are candidate and output the condition(s) that lead to such beans
to be discarded on startup. If a whole auto-configuration class is
disabled (or excluded), its beans are inspected and candidates are
extracted in a similar way.

This works for both injection by type and by name.

Closes gh-6612
2016-09-07 16:50:25 -07:00
Phillip Webb 41dc53f5dd Polish 2016-09-07 08:34:45 -07:00
Phillip Webb 951f051df9 Polish 2016-09-01 14:39:29 +01:00
Stephane Nicoll 08fbe87290 Fix ClassPathScanningCandidateComponentProvider init
Closes gh-6780
2016-09-01 14:23:17 +02:00
Andy Wilkinson 1c294dd562 Deprecate DefaultProfileDocumentMatcher
Closes gh-6798
2016-08-31 17:00:45 +01:00
Andy Wilkinson 3a887151e6 Remove use of regular expressions in Spring profile-based doc matching
Closes gh-1309
2016-08-31 16:56:13 +01:00
Andy Wilkinson fff280470a Realign default compressable MIME types with Tomcat's defaults
Closes gh-3592
2016-08-31 14:57:06 +01:00