Commit Graph

10971 Commits

Author SHA1 Message Date
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
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
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
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
e97b703a20 Additionally make package method public 2016-10-28 10:39:55 +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
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
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
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
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
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
9bde1e89cb Move some tests to AbstractEndpointHandlerMapping
See gh-7108
2016-10-24 10:38:53 -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
Phillip Webb
a448183681 Polish /loggers actuator endpoint
See gh-7086
2016-10-24 10:24:36 -07:00
Ben Hale
06cb4fcca5 Add /loggers actuator endpoint
Add `LoggersEndpoint` that can enables listing and configuration of log
levels. This actuator builds on top of the `LoggingSystem` abstraction
and implements support for Logback, Log4J2, and JUL.  The LoggingSystem
interface is modified to require each implementation to list the
configuration of all loggers as well as an individual logger by name.

The MVC endpoint exposes these behaviors at `GET /loggers` and
`GET /loggers/{name}` (much like the metrics actuator).

In addition `POST /loggers/{name}` allows users to modify the level for a given
logger. This modification is passed to the logging implementation, which
then decides, as an internal implementation detail, what the final outcome
of the modification is (e.g. changing all unconfigured children). Users
are then expected to request the listing of all loggers to see what has
changed internally to the logging system.

Closes gh-7086
2016-10-24 10:24:36 -07:00
Stephane Nicoll
ae4dd0d17e Merge branch '1.4.x' into 1.5.x 2016-10-24 18:08:23 +02:00
Stephane Nicoll
a638dcd51b Remove unnecessary use of System.out.println 2016-10-24 18:07:40 +02:00
Andy Wilkinson
a56bf44b39 Merge branch '1.4.x' into 1.5.x 2016-10-24 14:37:20 +01:00
Andy Wilkinson
8150cbd0d1 Remove commentary on Neo4j's licence
Closes gh-7214
2016-10-24 14:36:35 +01:00
Andy Wilkinson
92462a06ad Merge branch '1.4.x' into 1.5.x 2016-10-24 14:11:25 +01:00
Andy Wilkinson
2b46a4876f Start building against Spring Framework 4.3.4 snapshots
Closes gh-7174
See gh-7213
2016-10-24 14:10:12 +01:00
Andy Wilkinson
9abafb839b Merge branch '1.4.x' into 1.5.x 2016-10-24 12:20:23 +01:00
Andy Wilkinson
be597d7ce9 Fix handling of cyrillic characters in AsciiBytes hashCode method
Closes gh-7202
2016-10-24 12:19:57 +01:00
Stephane Nicoll
eddb10e4c9 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:39:26 +02:00
Stephane Nicoll
713fd51f9c Merge pull request #6954 from vpavic:update-docs
* pr/6954:
  Improve systemd service documentation
2016-10-24 11:39:14 +02:00
Vedran Pavic
469a4e3444 Improve systemd service documentation
Closes gh-6954
2016-10-24 11:37:53 +02:00
Stephane Nicoll
4603d8259a Make MockitoTestExecutionListener public
Closes gh-7016
2016-10-24 11:37:20 +02:00
Stephane Nicoll
beb3074998 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:19:18 +02:00
Stephane Nicoll
2ad3a7f8a3 Merge pull request #7043 from kazuki43zoo:standard-travis-ci
* pr/7043:
  Speed up Travis build
2016-10-24 11:19:05 +02:00
Kazuki Shimizu
7c1f9eb1b9 Speed up Travis build
Modify to use standard mode and directory cache for Travis CI build.

Closes gh-7043
2016-10-24 11:18:12 +02:00
Stephane Nicoll
4855bfb152 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:11:56 +02:00
Stephane Nicoll
4ec77d4420 Merge pull request #7193 from izeye:patch-22
* pr/7193:
  Polish contribution
  Add a missing return
2016-10-24 11:11:38 +02:00
Stephane Nicoll
a03ce0a9d1 Polish contribution
Add missing test

Closes gh-7193
2016-10-24 11:11:15 +02:00
Johnny Lim
0b5fbbedf4 Add a missing return
This commit adds a missing`return` in `getDataSourceBeanDefinition()`.

See gh-7193
2016-10-24 10:41:20 +02:00
Stephane Nicoll
74d3a6616b Upgrade to liquibase 3.5.3
Closes gh-7208
2016-10-24 10:36:16 +02:00
Stephane Nicoll
aec85787d2 Merge branch '1.4.x' into 1.5.x 2016-10-24 10:08:06 +02:00
Stephane Nicoll
f3c43e5e1a Merge pull request #6966 from izeye:unused-20160921
* pr/6966:
  Remove unused
2016-10-24 10:07:48 +02:00