Commit Graph

7003 Commits

Author SHA1 Message Date
Andy Wilkinson
ae89cb0355 Upgrade to Spring Integration 4.2.6.RELEASE
Closes gh-5949
2016-05-13 11:59:07 +01:00
Andy Wilkinson
b07fa75664 Upgrade to jOOQ 3.7.4
Closes gh-5947
2016-05-13 11:58:40 +01:00
Andy Wilkinson
1b8ffe8f74 Upgrade to MySQL Java Connector 5.1.39
Closes gh-5946
2016-05-13 11:58:03 +01:00
Andy Wilkinson
5484000651 Upgrade to HikariCP 2.4.6
Closes gh-5945
2016-05-13 11:57:35 +01:00
Andy Wilkinson
4c65e5e704 Always handle quoted arguments correctly in the launch script
Previously, arguments passed to the script were handled in one way
if a service was being started using start-stop-daemon and in another
way if start-stop-daemon wasn’t available or the application is being
launched in run mode. This meant that quoted arguments were only 
handled correctly when the application was being started using
start-stop-daemon.

This commit updates the launch script so that argument handling is
the same across all three different way that the application can be
launched.

Closes gh-5942
2016-05-13 11:13:54 +01:00
Andy Wilkinson
e561cc1997 Don't use a separate thread in the launcher to call app's main method
Using a separate thread to call the application's main method is
unnecessary – the context class loader of the current thread can be
updated instead – and makes exception and exit code handling more
complicated than it needs to be.

This commit updates the Launcher so that it calls the main method
runner using the current (main) thread. As a result, any exception
that's thrown will be caught by the JVM and result in a non-zero exit
code being returned from the process.

Closes gh-5922
2016-05-12 16:57:16 +01:00
Phillip Webb
7fb545d26c Polish 2016-05-10 09:35:10 -07:00
Andy Wilkinson
aab65c8fcc Merge pull request #5884 from tfeiner
* gh-5884:
  Add tests for JooqExceptionTranslator
  Use JOOQ's Spring DB name during exception translation
2016-05-10 13:28:51 +01:00
Andy Wilkinson
1ab835a0f7 Add tests for JooqExceptionTranslator
See gh-5884
2016-05-10 13:21:59 +01:00
tfeiner
61cb18a69c Use JOOQ's Spring DB name during exception translation
The name of a JOOQ SQLDialect does not always match the name defined
in sql-error-codes.xml. For example, the Postgres translator was not
initialized correctly because in JOOQ the dialect is named
SQLDialect.POSTGRES, but in sql-error-codes.xml the bean is named
"PostgreSQL".

This commit updates the translator to use the dialects third-party
springDbName which ensures that it maps correctly to the entries in
sql-error-codes.xml.

Closes gh-5884
2016-05-10 13:21:59 +01:00
Stephane Nicoll
8cbbb577a0 Fixup version numbers following release 2016-05-10 08:04:41 +02:00
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