Commit Graph

7142 Commits

Author SHA1 Message Date
Spring Buildmaster
819a9574a6 Next Development Version 2016-05-10 05:28:34 +00:00
Stephane Nicoll
2cacc19c91 Polish
See gh-5901
2016-05-09 17:49:55 +02:00
Stephane Nicoll
a4ba8f61c9 Backport 6dd8415
While working on gh-5309, a regression was introduced and fixed right the
way on master. Unfortunately, the fix wasn't applied to `1.3.x` as it
should have been.

This commit applies 6dd8415 to `1.3.x`

Closes gh-5901
2016-05-09 17:49:16 +02:00
Vedran Pavic
3891b242a3 Update launch script integration tests
- Use the latest Docker image for Ubuntu 14.04 LTS based tests
- Add Ubuntu 16.04 LTS based tests

Closes gh-5868
2016-05-09 11:37:38 +01:00
Stephane Nicoll
4b93a230b7 Merge pull request #5887 from garyrussell/amqp-update13
* pr/5887:
  Upgrade to Spring AMQP 1.5.6
2016-05-07 17:15:08 +02:00
Gary Russell
e66947735d Upgrade to Spring AMQP 1.5.6
Closes gh-5887
2016-05-07 17:14:51 +02:00
Andy Wilkinson
d77d3ff236 Use a SHA256 checksum in the Homebrew formula
Closes gh-5885
2016-05-06 15:58:57 +01:00
Stephane Nicoll
72c2454218 Fixup version numbers following release 2016-05-06 14:06:51 +02:00
Spring Buildmaster
376bbe68d8 Next Development Version 2016-05-06 11:23:57 +00:00
Stephane Nicoll
3567e57ff6 Upgrade to Spring Framework 4.2.6.RELEASE
Closes gh-5322
2016-05-06 11:57:06 +02:00
Stephane Nicoll
daf0b081e7 Revert "Add support for UTF-8 in application.properties"
This reverts commit d6a424f94c.

Closes gh-5361

# Conflicts:
#	spring-boot/src/test/resources/org/springframework/boot/env/test-encoded.properties
2016-05-06 11:10:36 +02:00
Andy Wilkinson
5f6be0152b Upgrade to Spring Loaded 1.2.6.RELEASE
Closes gh-5874
2016-05-05 17:59:08 +01:00
Andy Wilkinson
a079868965 Upgrade to EhCache 2.10.2
Closes gh-5873
2016-05-05 17:58:37 +01:00
Andy Wilkinson
f1793bbe31 Upgrade to Reactor 2.0.8.RELEASE
Closes gh-5872
2016-05-05 17:58:08 +01:00
Andy Wilkinson
5f20504d3b Upgrade to Embedded Mongo 1.50.3
Closes gh-5871
2016-05-05 17:56:52 +01:00
Andy Wilkinson
71f7cf581b Upgrade to Undertow 1.3.22.Final
Closes gh-5858
2016-05-05 17:56:13 +01:00
Andy Wilkinson
34420a8768 Allow @ConditionalOnProperty to be used as a meta-annotation
Closes gh-5819
2016-05-05 17:33:18 +01:00
Andy Wilkinson
147956a7b2 Avoid creating multiple BeanNameViewResolver beans
ErrorMvcAutoConfiguration creates a BeanNameViewResolver bean in case
the user has used @EnabledWebMvc and disabled WebMvcAutoConfiguration.
If the user hasn’t used @EnabledWebMvc, WebMvcAutoConfiguration will
creates its BeanNameViewResolver and override the one that’s already
been defined by ErrorMvcAutoConfiguration.

This commit makes WebMvcAutoConfiguration’s BeanNameViewResolver
definition conditional on there being no existing BeanNameViewResolver
bean definition.

Closes gh-5354
2016-05-05 16:10:36 +01:00
Andy Wilkinson
ca15de459c Start building against Spring Framework 4.2.6 snapshots
See gh-5322
2016-05-05 09:13:30 +01:00
Dave Syer
905451f92e That BaseConfiguration thing didn't work out after all
It seems like a base class that defines `@Beans` just doesn't
define any beans. Oh well, time to copy-paste.
2016-05-04 21:01:40 +01:00
Dave Syer
1babdd5c2e Remove log config for non boot things 2016-05-04 14:22:41 +01:00
Dave Syer
e98264debf Move base configuration class to a separate file
to stop it from being included in the enclosing @Configuration.

That way, if the app is not a web app, then there really is a
client_credentials OAuth2 resource (as claimed in the user guide).

Fixes gh-5735
2016-05-04 14:02:00 +01:00
Stephane Nicoll
42af5ebc2c Fix class name
Closes gh-5823
2016-05-02 14:17:48 +02:00
Stephane Nicoll
248bad34dc Fix RedisProperties link in the doc
Closes gh-5811
2016-05-02 14:15:55 +02:00
Stephane Nicoll
4ccc7dc554 Ignore invalid accessors
Previously, if a void method with a single argument was named "set", the
annotation processor wrongly considered it was a setter candidate. This
commit updates the condition to ignore it.

Closes gh-5826
2016-05-02 10:38:19 +02:00
Cristian Greco
5d55d57f78 Fix doc about running native commands
Closes gh-5829
2016-04-30 10:21:41 +02:00
Phillip Webb
ef7b511b0e Polish 2016-04-28 09:29:49 -07:00
Dave Syer
9c0679b1f4 Add support for spring.rabbitmq.ssl.algorithm
Rabbit client 3.6.* uses TLSv1.1 as the default algorithm which
many brokers are deisabling these days. Spring AMQP supports
changing the algorithm by name, so this is just a pass thru for
that.
2016-04-28 10:27:51 +01:00
Andy Wilkinson
71fddc51df Upgrade to Spring Batch 3.0.7.RELEASE
Closes gh-5166
2016-04-27 09:27:16 +01:00
Stephane Nicoll
ac8e87d79f Polish contribution
Closes gh-5782
2016-04-26 09:24:37 +02:00
Venil Noronha
d5554e0aa1 Use static-locations properties to locate favicon
Closes gh-5751
2016-04-26 09:09:19 +02:00
Stephane Nicoll
247685e992 Add missing @Documented
Closes gh-5786
2016-04-26 08:29:20 +02:00
Dave Syer
568d716c99 Move OAuth2ClientContextFilter back before the main security filter
It sometimes has to catch an exception from the security filter so
it needs to be before, and somehow this hasn't been a problem up to
now, but probably only by some fluke.

Fixes gh-5792
2016-04-25 16:44:43 +01:00
Dave Syer
b9db4742ac Add metric flusher to export remaining metrics on shutdown
Before this change the app context closes and metrics that have not
yet been exported ccan be orphaned. The design of this feature is simple:
use Closeable where possible, so that it will be called automatically
by Spring on shutdown.

Fixes gh-5771
2016-04-22 09:33:18 +01:00
Dave Syer
de0f0ecce4 Align counter behaviour between metric exporters
The MetricCopyExporter has had the capability for a while to keep
track of counters internally. This change aligns that with the
PrefixMetricGroupExporter.

Fixes gh-5762
2016-04-21 14:02:29 +01:00
Andy Wilkinson
97934aaf82 Upgrade to Jetty 9.2.16.v20160414
Closes gh-5757
2016-04-21 09:55:46 +01:00
Andy Wilkinson
125483e7aa Add a note in the docs that default launch script only works on Linux
Closes gh-5446
2016-04-20 17:46:36 +01:00
Andy Wilkinson
7709543e67 Set web application context on ServletContext in plain web app tests
Previously, the web application context was only set on the
ServletContext in a full-blown integration test or when MockMvc was
used.

This commit updates SpringApplicationContextLoader so that the context
is also set on the context in a plain web application test (one where
MockMvc is not being used). The change is a partial backport of commit
7dffb702.

Closes gh-4370
2016-04-20 10:39:42 +01:00
Andy Wilkinson
a19eeaf91d DevTools should only shut down single, auto-configured DataSource
Previously, there were two problems with DevTools’ DataSource
auto-configuration:

1. It did not tolerate a context with multiple DataSources
2. It would attempt to shut down a DataSource that had not been created
   by DataSourceAutoConfiguration and, therefore, where we could not be
   sure of its configuration.

This commit updates DevToolsDataSourceAutoConfiguration so that it backs
off unless the context contains DataSourceProperties and a single
DataSource created by DataSourceAutoConfiguration. This ensures that it
can safely use DataSourceProperties to get the DataSource’s
driver class name and accurately determine if it’s an in-memory or
external database. Shutdown is only called for an in-memory database.

Closes gh-5540
2016-04-19 11:41:21 +01:00
Andy Wilkinson
432969e61e Correct documented spring.factories key for management context config
Closes gh-5664
2016-04-18 17:41:44 +01:00
Andy Wilkinson
a4d7a77547 Apply spring.thymeleaf.cache to auto-configured ThymeleafViewResolver
Previously, spring.thymeleaf.cache was only applied to auto-configured
TemplateResolver. This commit also applies the propery to the
auto-configured ThymeleafViewResolver.

Closes gh-5395
2016-04-18 17:26:13 +01:00
Andy Wilkinson
9210029109 Record trace with response status of 500 following unhandled exception
Previously, if the filter chain threw an unhandled exception,
WebRequestTraceFilter would record a trace with a response status of
200. This occurred because response.getStatus() would return 200 as
the container had not yet caught the exception and mapped it to an
error response.

This commit updates WebRequestTraceFilter to align its behaviour with
MetricsFilter. It now assumes that the response status will be a 500
and only updates that to the status of the response if the call to the
filter chain returns successfully.

To avoid making a breaking change to the signature of the protected
enhanceTrace method, an HttpServletResponseWrapper is used to include
the correct status in the trace.

Closes gh-5331
2016-04-18 16:56:54 +01:00
Andy Wilkinson
2e54078083 Tolerate possible null Flyway MigrationVersion when using Flyway 4.0
Flyway 4.0 provides support for repeatable migrations that do not
have a version. When such a migration has been performed,
MigrationInfo.getMigrationVersion() will return null and, previously,
FlywayEndpoint would fail with an NPE.

This commit updates FlywayEndpoint to use null as the version when
MigrationInfo.getMigrationVersion() returns null.

Closes gh-5700
2016-04-18 15:30:23 +01:00
Andy Wilkinson
b554894bb4 Polishing 2016-04-15 17:27:19 +01:00
Andy Wilkinson
1fbd43bdf0 Tolerate jar files with no manifest in ChangeableUrls
Closes gh-5704
2016-04-15 17:18:00 +01:00
Phillip Webb
a2f482b7f3 Merge pull request #5053 from spauk/master
* pull5053:
  Make UserInfoTokenServices.getPrincipal protected
2016-04-12 14:41:07 -07:00
Sergey Pauk
8542f4f481 Make UserInfoTokenServices.getPrincipal protected
Update UserInfoTokenServices.getPrincipal() so that it can be overridden
by subclasses to allow a custom authenticated principal to be returned
from the authorized request parameters.

Fixes gh-5053
2016-04-12 14:40:37 -07:00
Phillip Webb
b1656be3d0 Fix possible binder IndexOutOfBoundsException
Update RelaxedDataBinder.extendCollectionIfNecessary to use the current
index when checking if the path node is an array.

Fixes gh-5635
2016-04-12 14:36:36 -07:00
Andy Wilkinson
1412eaa0e0 Handle relative URLs in jar's Class-Path when getting changeable URLs
5e0ba6ea added support for reading a jar manifest's Class-Path
attribute when resolving changeable URLs from a URLClassLoader,
however it did not handle relative URLs, i.e. URLs without a protocol,
correctly.

This commit updates ChangeableUrls so that it uses the URL of the
JAR that contains the manifest as the base for any new URLs that
are created. When the Class-Path entry is relative, this base will
be used. When the Class-Path entry is absolutee, URL's constructor
will ignore the supplied base.

Closes gh-5665
2016-04-12 13:47:58 +01:00
Phillip Webb
af2483816b Fix JarFileTests to work on Windows
See gh-5287
2016-04-10 12:12:19 -07:00