1f9515cd31
Merge branch '1.1.x'
2014-10-01 20:35:17 +01:00
f8477bd60e
Add jar file that should have been included in bcd4c8ee
2014-10-01 20:34:57 +01:00
f2812afb19
Merge branch '1.1.x'
2014-10-01 19:20:28 +01:00
bcd4c8eee2
Produce a single library for multiple file dependencies on the same file
...
Previously, the Gradle plugin’s ProjectLibraries produced a new library
for every file dependency, even if the dependencies where on the same
file. This would lead to a repackaging failure due to multiple
libraries having the same name.
This commit updates ProjectLibraries to treat file dependencies on the
same file as a single library, thereby resolving the name clash.
Fixes gh-1646
2014-10-01 19:20:04 +01:00
c601c09ecc
Upgrade to Hibernate Validator 5.1.2.Final
...
Closes gh-1595
2014-10-01 17:28:29 +01:00
da90e5bc6b
Merge branch '1.1.x'
2014-10-01 16:24:16 +01:00
8349148bbf
Remove details of how to switch off RemoteIpValve: it's off by default
...
See gh-1631
2014-10-01 16:23:00 +01:00
2f4b89d19b
Merge branch '1.1.x'
2014-10-01 16:12:28 +01:00
c3d1241e71
Allow override of pidfile location
...
The file name can now be overridden at runtime with a System property or
environment variable named "PIDFILE" (or "pidfile").
Fixes gh-1579
2014-10-01 16:11:11 +01:00
04c2e25a27
Merge branch '1.1.x'
2014-10-01 15:51:59 +01:00
0ff511d978
Catch Throwable instead of Exception in Spring Application
...
...so that application startup that fails because of an Error (for
instance NoClassDefFoundError) won't be swallowed.
Fixes gh-1645
2014-10-01 15:50:49 +01:00
0b72b9814f
Merge 1.1.x and resolve minor conflict
2014-10-01 15:48:11 +01:00
26a528ce95
Change config for git commit plugin in starter parent
...
Fixes gh-1489
2014-10-01 15:46:01 +01:00
06fa2a9f78
Merge branch '1.1.x'
2014-10-01 15:44:16 +01:00
1b8f579da2
Clarify activation of RemoteIpValve
...
Fixes gh-1631
2014-10-01 15:43:41 +01:00
104d625785
Merge branch '1.1.x'
2014-10-01 15:36:22 +01:00
034362b6e5
Explicit example for spring.jpa.properties.hibernate.*
...
Fixes gh-1636
2014-10-01 15:35:52 +01:00
ef8472a951
Log all configured connectors when Tomcat is initialized
...
Previously, Tomcat initialization would only log the port of the
primary connector and would omit the scheme, whereas once Tomcat was
started the port of every connector and their schemes would be logged.
This commit makes things symmetrical by updating the logging performed
at initialization to include every connector's port and scheme.
During initialization the port number that the connector the has
been configured with is logged. This means that, if the connector has
been configured to bind to an free port, 0 will be logged. Once
Tomcat has started, the number of the port that the connector has
bound to is logged.
Closes gh-1601
2014-10-01 14:46:35 +01:00
7434d53369
Merge branch '1.1.x'
2014-10-01 14:29:19 +01:00
45a168a47b
Use correct version when linking to Spring and Spring Security docs
...
Closes gh-1621
2014-10-01 14:29:08 +01:00
31e6044e70
Merge branch '1.1.x'
2014-10-01 13:50:14 +01:00
e47435f1b1
Include code source location in message for competing LoggerFactory impl
...
To make it easier to identify the source of the competing LoggerFactory
implementation, this commit updates the exception message to include
the code source location of the offending class.
Closes gh-1630
2014-10-01 13:49:55 +01:00
316e5f78f9
Merge branch '1.1.x'
2014-10-01 10:12:19 +01:00
f7d1f968b9
Improve error message when JarFile encounters a compressed nested jar
...
Closes gh-1643
2014-10-01 10:09:30 +01:00
dd8db93781
Merge branch '1.1.x'
2014-10-01 08:26:58 +01:00
79deed7ec5
Remove extra trailing '-' in metric name
2014-10-01 08:26:51 +01:00
bfb387bc02
Default prefix for redis keys doesn't need period
2014-09-30 15:09:22 +01:00
8d5f26f6bd
Fix missing resource exception if spring-cloud not on classpath
2014-09-30 15:08:58 +01:00
e070d55491
Make Jackson date format and property naming strategy configurable
...
Allow the environment to be used to configure Jackson's date format
and property naming strategy
Closes gh-1628
2014-09-30 11:07:29 +01:00
fcd855cd5e
Merge branch '1.1.x'
2014-09-30 10:30:08 +01:00
8fcf355d71
Merge branch 'gh-1627' into 1.1.x
2014-09-30 10:29:57 +01:00
61e90f5b6e
Add tests to Data REST sample for search operations
...
Closes gh-1627
2014-09-30 10:29:38 +01:00
b798d001d7
Add missing @Param annotations to CityRepository in Data REST sample
...
Without the @Param annotations, using either of the search URIs would
resulted in a 400 response and an error describing the lack of @Param
annotation.
See gh-1627
2014-09-30 10:18:26 +01:00
8b0d64522c
Merge pull request #1633 from johnktims/master
...
* pull1633:
Fix typo in javadoc
2014-09-29 10:00:05 +02:00
bebbe92fef
Fix typo in javadoc
2014-09-28 09:52:48 -04:00
d1c5c90ca9
Merge pull request #1609 from hekonsek/spring-boot-amq-version-upgrade
...
* spring-boot-amq-version-upgrade:
Upgraded ActiveMQ version to 5.10.0
2014-09-26 13:09:16 -07:00
7f20f5d4f8
Upgraded ActiveMQ version to 5.10.0
...
Fixes gh-1609
2014-09-26 13:08:03 -07:00
32641abae4
Merge pull request #1618 from mkanev/master
...
* pull1618:
Add UTF-8 charset element to logback base.xml
2014-09-26 13:05:57 -07:00
6b5de38fef
Add UTF-8 charset element to logback base.xml
...
Update base logback configuration to include a UTF-8 charset element
which helps with multilanguage support.
Fixes gh-1618
2014-09-26 11:46:45 -07:00
a7a337a14f
Merge branch '1.1.x'
2014-09-25 22:04:23 -07:00
d0990c06a6
Fix typo in HttpMessageConverters auto-conf Tests
2014-09-25 22:03:30 -07:00
e156e1a7f6
Merge branch '1.1.x'
...
Conflicts:
all pom.xml files
2014-09-25 21:38:54 -07:00
4f9258a345
Fixup version numbers following release
2014-09-25 21:37:40 -07:00
edb4b7ed7d
Next development version
2014-09-25 21:02:37 -07:00
b9edf3c500
Merge branch '1.1.x'
2014-09-25 20:16:04 -07:00
fa02c01727
Polish
2014-09-25 20:15:49 -07:00
08f2522eba
Add missing @since tag
2014-09-25 20:09:49 -07:00
1ed90df630
Merge branch '1.1.x'
2014-09-25 13:06:54 -07:00
bff39e954e
Add `server.tomcat.port-header` support
...
Update Tomcat ServerProperties to support the RemoteIpValve portHeader
property.
Fixes gh-1616
2014-09-25 13:04:12 -07:00
0dc46a2fe7
Drop protocolHeader and remoteIpHeader defaults
...
The `protocolHeader` and `remoteIpHeader` no longer have default values
and must be opt-in.
Fixes gh-1624
2014-09-25 12:58:23 -07:00
Andy Wilkinson
Dave Syer
Marcel Overdijk
bangsen.yin
Stephane Nicoll
John Tims
Phillip Webb
Henryk Konsek
Maksim Kanev
Spring Buildmaster