Commit Graph

50613 Commits

Author SHA1 Message Date
Stephane Nicoll
9fc8d61107 Merge branch '1.4.x' into 1.5.x 2016-10-31 16:08:10 +01:00
Stephane Nicoll
49b244b121 Upgrade to H2 1.4.193
Closes gh-7256
2016-10-31 16:07:55 +01:00
Stephane Nicoll
d6239b1202 Merge branch '1.5.x' 2016-10-31 16:04:01 +01:00
Stephane Nicoll
9100897dcb Automatically exclude auto-configurations from component scan
Previously, if an auto-configuration class was (wrongly) located in a
candidate package for component scanning, the class was silently loaded
as an app configuration (i.e. with the wrong lifecycle).

This commit adds an `AutoConfigurationExcludeFilter` to
`@SpringBootApplication` so that such classes are automatically
filtered. Since they are registered in `spring.factories`, we can
silently ignore them since we know they'll be loaded later on.

Closes gh-7168
2016-10-31 15:13:58 +01:00
Stephane Nicoll
236f03c4bb Merge branch '1.5.x' 2016-10-31 11:38:54 +01:00
Stephane Nicoll
dc25478000 Merge pull request #7253 from izeye:typo-20161031
* pr/7253:
  Fix typo
2016-10-31 11:38:35 +01:00
Johnny Lim
7bb63238ab Fix typo
Closes gh-7253
2016-10-31 11:37:52 +01:00
Stephane Nicoll
d27ffd289a Merge branch '1.5.x' 2016-10-31 10:38:06 +01:00
Stephane Nicoll
974ec92ad6 Fix broken build 2016-10-31 10:37:57 +01:00
Stephane Nicoll
713f4dd723 Merge branch '1.5.x' 2016-10-31 10:18:51 +01:00
Stephane Nicoll
4f06e52d7e Allow adding additional tld skip patterns
This commit improves `TomcatEmbeddedServletContainerFactory` so that tld
skip patterns can be set or added to an existing set. An additional
`server.tomcat.additional-tld-skip-patterns` is now being exposed to
easily add patterns via configuration.

Closes gh-5010
2016-10-31 10:15:16 +01:00
Dave Syer
5f5e3bf6c3 Merge branch '1.5.x' 2016-10-30 11:24:52 +00:00
Dave Syer
537e0c12c2 Support for custom layout types to change loader classes
A layout can
also optionally change the loader jar that is unpacked in the root
of the repackaged archive by implementing a new method in Layout.
2016-10-30 11:24:29 +00:00
Dave Syer
500a3df6e9 Add LayoutFactory in spring.factories
Instead of a fixed enum of layout types, user can provide custom
layouts via implementations of LayoutFactory in spring.factories.
2016-10-30 11:24:29 +00:00
Stephane Nicoll
468a466100 Merge branch '1.5.x' 2016-10-30 11:24:57 +01:00
Stephane Nicoll
94da9ad6e6 Merge branch '1.4.x' into 1.5.x 2016-10-30 11:24:46 +01:00
Stephane Nicoll
1a6ab90255 Polish test 2016-10-30 11:24:33 +01:00
Stephane Nicoll
99af8ca414 Merge branch '1.5.x' 2016-10-30 10:59:22 +01:00
Stephane Nicoll
c4d8fb1c09 Merge branch '1.4.x' into 1.5.x 2016-10-30 10:59:02 +01:00
Stephane Nicoll
88d95260d3 Merge pull request #7215 from izeye:actuator-hypermedia
* pr/7215:
  Polish contribution
  Update documentation on Actuator hypermedia support
2016-10-30 10:58:44 +01:00
Stephane Nicoll
6d50e26b70 Polish contribution
Closes gh-7215
2016-10-30 10:57:58 +01:00
Johnny Lim
1546cd4072 Update documentation on Actuator hypermedia support
Spring Boot Actuator hypermedia support has been disabled by default via
c7c685f, but its documentation wasn't updated.

This commit updates the documentation related to the change.

See gh-7215
2016-10-30 10:57:27 +01:00
Stephane Nicoll
1448902c14 Merge branch '1.5.x' 2016-10-28 13:31:56 +02:00
Stephane Nicoll
f6959ccbcd Merge branch '1.4.x' into 1.5.x 2016-10-28 13:31:38 +02:00
Stephane Nicoll
7f8849c62b Merge branch '1.3.x' into 1.4.x 2016-10-28 13:31:19 +02:00
Stephane Nicoll
5863e6f78c Fix class name in generated meta-data
Previously, the algorithm that computes the String representation of a
class reference and a property type was shared. This lead to generic
information for group's `type` and `sourceType` property.

This commit separates that logic in two: `getQualifiedName` is now
responsible to generate a fully qualified class name while the existing
`getType` is solely responsible to generate a type representation for the
property. Only the latter has generic information.

Closes gh-7236
2016-10-28 13:23:47 +02:00
Dave Syer
a02fd93d18 Merge branch '1.5.x' 2016-10-28 10:40:01 +01:00
Dave Syer
e97b703a20 Additionally make package method public 2016-10-28 10:39:55 +01:00
Dave Syer
13a02a6e55 Merge branch '1.5.x' 2016-10-28 10:33:06 +01:00
Dave Syer
f62abade90 Make DependencyResolutionContext empty by default
It's more useful as a building block for other tools that way,
and it's easy to add the spring boot dependencies using public
methods.
2016-10-28 10:32:20 +01:00
Andy Wilkinson
f2c7e22731 Merge branch '1.5.x' 2016-10-26 12:13:38 +01:00
Andy Wilkinson
6b3eede59f Merge branch '1.4.x' into 1.5.x 2016-10-26 12:13:26 +01:00
Andy Wilkinson
6a68c8f7e0 Restore Handler logic that was changed during its merge
This commit restores the logic in Handler that was changed when
d20ac56a was merged, while leaving the structural improvements intact.

In addition to a couple of changes where a typo meant the wrong
variable was being referenced, some logic branches now return false
rather than called super. This realigns our Handler's behaviour with
that of the JDK's.

Some more tests have also been added to try to catch the problems that
were introduced during the merge.

Closes gh-7021
2016-10-26 11:10:38 +01:00
Stephane Nicoll
bbea134e1c Merge branch '1.5.x' 2016-10-26 11:32:53 +02:00
Stephane Nicoll
97b68b3f84 Merge pull request #7225 from mouminoux:1.5.x
* pr/7225:
  Polish contribution
  Allow to configure Tomcat's rotatable property
2016-10-26 11:32:40 +02:00
Stephane Nicoll
ed7de8eb60 Polish contribution
Also add rotate attribute to Undertow

Closes gh-7225
2016-10-26 11:31:17 +02:00
Matthieu Mouminoux
1d95219c4b Allow to configure Tomcat's rotatable property
See gh-7225
2016-10-26 10:28:06 +02:00
Stephane Nicoll
547a3554dd Merge branch '1.5.x' 2016-10-26 09:22:17 +02:00
Stephane Nicoll
b37b3f7c59 Merge pull request #7224 from ajayk:adoc-indentation
* pr/7224:
  Fix indentation for spring.jms.template.* keys
2016-10-26 09:21:58 +02:00
ajk
548190673c Fix indentation for spring.jms.template.* keys
Closes gh-7224
2016-10-26 09:21:24 +02:00
Phillip Webb
57fb3888ac Merge branch '1.5.x' 2016-10-25 20:18:47 -07:00
Phillip Webb
3c5328924c Merge branch '1.4.x' into 1.5.x 2016-10-25 20:17:55 -07:00
Andy Wilkinson
d20ac56afd Align our jar URL stream handler with the JDK's
Previously our handler didn't override parseURL or sameFile which
resulted in behaviour that differed from that of the JDK's handler.
Crucially, this would result in our JarURLConnection being passed
a spec that didn't contain a "!/". A knock-on effect of this was
that the connection would point to the root of the jar rather than
the intended entry.

Closes gh-7021
2016-10-25 20:16:32 -07:00
Andy Wilkinson
f0798253a3 Merge branch '1.5.x' 2016-10-24 22:16:34 +01:00
Andy Wilkinson
5b9eaab6c0 Merge branch '1.4.x' into 1.5.x 2016-10-24 22:16:23 +01:00
Andy Wilkinson
ee7141cf63 Allow PropertyLauncher loader.path to be configured using manifest
Closes gh-7178
2016-10-24 22:14:56 +01:00
Madhura Bhave
08229899b1 Merge branch '1.5.x' 2016-10-24 10:39:38 -07:00
Madhura Bhave
9bde1e89cb Move some tests to AbstractEndpointHandlerMapping
See gh-7108
2016-10-24 10:38:53 -07:00
Phillip Webb
2e4edf1804 Merge branch '1.5.x' 2016-10-24 10:26:40 -07:00
Phillip Webb
5fc58b45ff Merge pull request #7086 from nebhale/logger-actuator
* pr/7086:
  Polish `/loggers` actuator endpoint
  Add `/loggers` actuator endpoint
2016-10-24 10:25:51 -07:00