Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
10,162 Commits 23 Branches 0 Tags
85f176da08091b5da9034be9c800d245bbbeff83
Commit Graph

10162 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
85f176da08 Merge branch '1.5.x' 2017-01-03 11:39:33 +01:00
Stephane Nicoll
ce9beefc9a Merge pull request #7796 from eddumelendez:gh-7708 
* pr/7796:
  Polish contribution
  Autodetect spring.jpa.database from spring.datasource.url
 2017-01-03 11:35:22 +01:00
Stephane Nicoll
fe89af5e82 Polish contribution 
Closes gh-7796
 2017-01-03 11:33:57 +01:00
Eddú Meléndez
24c83d12da Autodetect spring.jpa.database from spring.datasource.url 
Previously, property `spring.jpa.database` should be provided. This
commit allows to detect the database when `spring.datasource.url` is
provided.

Closes gh-7708
 2017-01-03 11:24:58 +01:00
Phillip Webb
a5b22e2858 Merge branch '1.5.x' 2017-01-02 19:59:24 -08:00
Phillip Webb
f4f1a7f929 Revert "Upgrade to Spring HATEOAS 0.22.0" 
This reverts commit fb4099dfb1.
 2017-01-02 19:58:22 -08:00
Phillip Webb
4026fa563f Merge branch '1.5.x' 2017-01-02 19:54:26 -08:00
Phillip Webb
69bf76b5ee Merge pull request #7807 from candrews/patch-3 
* pr/7807:
  Upgrade to Spring HATEOAS 0.22.0
 2017-01-02 19:50:45 -08:00
Craig Andrews
fb4099dfb1 Upgrade to Spring HATEOAS 0.22.0 
Closes gh-7807
 2017-01-02 19:49:56 -08:00
Phillip Webb
41b83085a6 Restore kill -9 to launch.script force-stop 
Restore the `-9` flag to the send `kill` call which was inadvertently
lost in commit a35a1022c2.

Closes gh-6223
 2017-01-02 19:47:54 -08:00
Phillip Webb
6adab91fd1 Merge pull request #6579 from vpavic/audit-endpoint 
* pr/6579:
  Polish audit event endpoint support
  Improve MBean without backing Endpoint support
  Add MVC and JMX endpoints to retrieve audit events
  Add JMX without backing `Endpoint` support
 2017-01-02 19:45:43 -08:00
Phillip Webb
51762642b2 Polish audit event endpoint support 
Closes gh-6579
 2017-01-02 19:43:26 -08:00
Phillip Webb
5b40eb48e0 Improve MBean without backing Endpoint support 
Improve support for MBeans without a backing endpoint by introducing
a `JmxEndpoint` interface. The `JmxEndpoint` is intentionally
similar in design to the `MvcEndpoint` from the `mvc` package and
allows for completely custom JMX beans that are not backed by any
real actuator `Endpoint`.

The `AuditEventsMBean` has been refactored to use the new interface and
has been renamed to `AuditEventsJmxEndpoint`.

See gh-6579
 2017-01-02 19:43:14 -08:00
Vedran Pavic
2f1e4f0c02 Add MVC and JMX endpoints to retrieve audit events 
Add MVC and JMX specific endpoints that allow audit events to be
retrieved.

See gh-6579
 2017-01-02 19:20:35 -08:00
Vedran Pavic
a6d18f714f Add JMX without backing Endpoint support 
Decompose `EndpointMBean` to improve support for JMX endpoints without
a backing `Endpoint`.

See gh-6579
 2017-01-02 19:19:04 -08:00
Phillip Webb
e1eb48e8b4 Fix warnings 2016-12-30 17:26:25 -08:00
Phillip Webb
6496ea78d4 Merge branch '1.5.x' 2016-12-30 14:07:15 -08:00
Phillip Webb
a167db7b37 Allow OPTIONS requests in interceptors 
Update `MvcEndpointSecurityInterceptor` and
`CloudFoundrySecurityInterceptor` to allow OPTIONS requests to be
processed.

Fixes gh-7720
 2016-12-30 14:05:29 -08:00
Phillip Webb
a90bad37bd Merge branch '1.5.x' 2016-12-30 13:29:18 -08:00
Phillip Webb
a35a1022c2 Update force-stop to respect STOP_WAIT_TIME 
Closes gh-6223
 2016-12-30 13:23:47 -08:00
Phillip Webb
89569db75a Merge pull request #7787 from kazuki43zoo/polish-gh-6223 
* pr/7787:
  Add force-stop to launch.script usage
 2016-12-30 13:20:04 -08:00
Kazuki Shimizu
40691d07f8 Add force-stop to launch.script usage 
See gh-6223
Closes gh-7787
 2016-12-30 13:19:36 -08:00
Phillip Webb
b27f4e23be Ignore @ImportAutoConfiguration exclude errors 
Update `ImportAutoConfigurationImportSelector` to ignore excludes for
classes that aren't loaded. Since the import classes for tests tend to
be much more limited, the exception isn't really helpful.

Closes gh-6809
 2016-12-30 12:53:59 -08:00
Phillip Webb
b76978ff7e Try to prevent Travis build failures 
Update LiveReloadServerTests which seems to be failing intermittently
on Travis.
 2016-12-30 12:22:37 -08:00
Phillip Webb
53f1df86a2 Merge branch '1.5.x' 2016-12-30 12:17:28 -08:00
Phillip Webb
aacf5d660f Update copyright year for changed files 2016-12-30 11:53:51 -08:00
Phillip Webb
be3fe12cf0 Polish 2016-12-30 11:46:24 -08:00
Phillip Webb
273beaa3ce Polish 2016-12-30 11:10:44 -08:00
Phillip Webb
f8acaae115 Merge branch '1.4.x' into 1.5.x 2016-12-30 11:00:06 -08:00
Phillip Webb
9ccf47398e Formatting 2016-12-30 10:56:44 -08:00
Stephane Nicoll
4604bb7e8a Merge branch '1.5.x' 2016-12-30 18:01:59 +01:00
Stephane Nicoll
c903ff46a7 Polish samples 2016-12-30 17:57:14 +01:00
Stephane Nicoll
a19a28062f Fix actuator security in samples 
Closes gh-7637
 2016-12-30 17:56:19 +01:00
Stephane Nicoll
22a384ac28 Merge branch '1.5.x' 2016-12-30 16:11:13 +01:00
Stephane Nicoll
1f3de10101 Merge pull request #7793 from kazuki43zoo:polishing-log-message 
* pr/7793:
  Polishing log message and comment
 2016-12-30 16:05:27 +01:00
Kazuki Shimizu
85503fcbca Polishing log message and comment 
Closes gh-7793
 2016-12-30 16:04:38 +01:00
Stephane Nicoll
a90a73d1ac Merge branch '1.4.x' into 1.5.x 2016-12-30 16:04:00 +01:00
Stephane Nicoll
7b494cf319 Polish 
See gh-7793
 2016-12-30 15:59:17 +01:00
Stephane Nicoll
9dfaf4de06 Merge branch '1.5.x' 2016-12-30 15:53:16 +01:00
Stephane Nicoll
3ed5a723bb Polish log4j2 sample 2016-12-30 15:50:45 +01:00
Stephane Nicoll
0b67a89bc6 Merge branch '1.5.x' 2016-12-30 15:16:31 +01:00
Stephane Nicoll
c230a21a8c Polish CacheManagerCustomizers 
Closes gh-7792
 2016-12-30 15:16:13 +01:00
Stephane Nicoll
2f3571f173 Defend against lambda transaction customizers 
Update `CacheManagerCustomizers` to deal directly with
`ClassCastException` assuming that they are because a customizer is
implemented using a lambda.

Closes gh-7788
 2016-12-30 15:16:13 +01:00
Stephane Nicoll
1fa8b1ac91 Defend against lambda transaction customizers 
Update `CacheManagerCustomizers` to deal directly with
`ClassCastException` assuming that they are because a customizer is
implemented using a lambda.

Closes gh-7788
 2016-12-30 14:19:03 +01:00
Phillip Webb
86a42e4e44 Merge branch '1.5.x' 2016-12-30 00:32:00 -08:00
Phillip Webb
54aeff47a2 Add exclude support to @ImportAutoConfiguration 
Update `@ImportAutoConfiguration` with support for an exclude attribute
that works in a similar way to `@EnableAutoConfiguration`.

Also update existing `@Test...` annotation with exclude attribute
aliases.

Fixes gh-6809
 2016-12-30 00:31:30 -08:00
Phillip Webb
4d73f3d2e9 Merge branch '1.5.x' 2016-12-29 22:22:04 -08:00
Phillip Webb
75186d42da Merge pull request #6223 from gauravbrills/patch-1 
* pr/6223:
  Add `force-stop` support to launch script
 2016-12-29 22:21:26 -08:00
Gaurav Rawat
509be7474d Add force-stop support to launch script 
Update the embedded launch script to support `force-stop`.

Closes gh-6223
 2016-12-29 22:20:05 -08:00
Phillip Webb
3c930347c5 Defend against lambda transaction customizers 
Update `TransactionManagerCustomizers` to deal directly with
`ClassCastExceptions` assuming that they are because a customizer is
implemented using a lambda.

See gh-7561
 2016-12-29 16:37:13 -08:00