Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,613 Commits 23 Branches 0 Tags
38d96aabef94debe6ae5647802e61b9510d88a67
Commit Graph

50613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wilkinson
e02de48c59 Merge branch '1.5.x' 2016-10-13 09:23:22 +01:00
Andy Wilkinson
a286d61acd Start building against Spring Retry 1.2.0 snapshots 
See gh-7136
 2016-10-13 09:22:10 +01:00
Andy Wilkinson
4922975e00 Start building against Spring AMQP 1.6.4 snapshots 
1.6.4 snapshots are required for compatibility with Spring Retry 1.2

See gh-7158
 2016-10-13 09:22:10 +01:00
Phillip Webb
277d01ab53 Merge branch '1.5.x' 2016-10-12 13:35:21 -07:00
Madhura Bhave
7352d8e303 Improve EndpointHandlerMapping subclassing support 
Update EndpointHandlerMapping so that it can be subclasses easily.
Subclasses can override the `path` that is used to map the endpoint,
allowing different mapping strategies to be used.

See gh-7108
 2016-10-12 13:32:39 -07:00
Madhura Bhave
0be8a30276 Add EndpointHandlerMapping.getEndpoints(Class) 
Add an additional method to EndpointHandlerMapping which allows
endpoints of a specific type to be returned.

See gh-7108
 2016-10-12 13:32:38 -07:00
Madhura Bhave
7f1ff968a1 Support NamedMvcEndpoints 
Introduce a new NamedMvcEndpoint interface which can be used when an
MvcEndpoint also has a logical name. Existing MvcEndpoints have been
reworked to implement the NamedMvcEndpoint interface.

Fixes gh-7156
 2016-10-12 13:32:38 -07:00
Madhura Bhave
90722a9bca Add @ConditionalOnCloudPlatform 
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.

Fixes gh-7155
 2016-10-12 13:32:37 -07:00
Madhura Bhave
0f5007d69d Drop superfluous disabled check 
Remove EndpointWebMvcManagementContextConfiguration `disabled` logic
since the configuration should even be processed when the management
port is `-1`.

Closes gh-7154
 2016-10-12 12:19:35 -07:00
Madhura Bhave
84d0e8acd8 Fix EndpointHandlerMappingTests path references 
Fix the TestEndpoint constructor to use an ID parameter rather than
path.
 2016-10-12 12:19:35 -07:00
Stephane Nicoll
d65a843856 Merge branch '1.5.x' 2016-10-12 10:37:38 +02:00
Stephane Nicoll
2d995661f4 Merge branch '1.4.x' into 1.5.x 2016-10-12 10:37:26 +02:00
Stephane Nicoll
00a10bcf61 Restore checkstyle 
Rather than disabling checkstyle altogether, this commit enables it
again, relaxing the javadoc requirement only.

See gh-7142
 2016-10-12 10:37:15 +02:00
Stephane Nicoll
d5c3a8ac76 Merge branch '1.5.x' 2016-10-12 10:30:37 +02:00
Stephane Nicoll
c6f23000be Merge branch '1.4.x' into 1.5.x 2016-10-12 10:30:19 +02:00
Stephane Nicoll
11cad9e0cb Fix sample in ref doc 
Closes gh-7142
 2016-10-12 10:27:51 +02:00
Stephane Nicoll
b0cbe1fdc7 Merge branch '1.5.x' 2016-10-12 10:04:15 +02:00
Stephane Nicoll
f254e1227f Merge branch '1.4.x' into 1.5.x 2016-10-12 10:03:59 +02:00
Stephane Nicoll
0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll
bd2956c3f0 Fix metricsFilter reference in doc 
Closes gh-7147
 2016-10-12 10:03:23 +02:00
Phillip Webb
01900c8342 Merge branch '1.5.x' 2016-10-11 23:42:14 -07:00
Phillip Webb
d818a09ed8 Polish 2016-10-11 23:38:14 -07:00
Phillip Webb
d3e06c4627 Merge branch '1.4.x' into 1.5.x 2016-10-11 21:46:06 -07:00
Phillip Webb
db3f488d5a Polish 2016-10-11 17:54:00 -07:00
Stephane Nicoll
264d8442da Fix build 2016-10-11 18:33:54 +02:00
Stephane Nicoll
c5cc626d48 Remove remote shell support 
See gh-7044
 2016-10-11 17:59:25 +02:00
Stephane Nicoll
66a3df454f Merge branch '1.5.x' 2016-10-11 17:42:53 +02:00
Stephane Nicoll
cfee9bab81 Deprecate remote shell support 
Closes gh-7044
 2016-10-11 17:39:28 +02:00
Stephane Nicoll
7f2806bd19 Merge branch '1.5.x' 2016-10-11 17:06:04 +02:00
Stephane Nicoll
5976d44f6c Merge pull request #6666 from maciejwalkowiak:spring-amqp-idle-event-interval-property 
* pr/6666:
  Polish contribution
  Add Rabbit idleEventInterval property
 2016-10-11 17:03:59 +02:00
Stephane Nicoll
6fb53f90e5 Polish contribution 
Closes gh-6666
 2016-10-11 17:03:10 +02:00
Maciej Walkowiak
47ec8630c8 Add Rabbit idleEventInterval property 
This commit adds a property to configure how often idle container events
should be published.

See gh-6666
 2016-10-11 15:49:10 +02:00
Stephane Nicoll
c50a352999 Merge branch '1.5.x' 2016-10-11 15:37:07 +02:00
Stephane Nicoll
ea3deae010 Merge pull request #6645 from plamentotev:maven-run-work-dir 
* pr/6645:
  Polish contribution
  Add workingDirectory option for Maven plugin run/start
 2016-10-11 15:36:51 +02:00
Stephane Nicoll
28ed59ca6e Polish contribution 
Closes gh-6645
 2016-10-11 15:36:35 +02:00
Plamen Totev
3cccc732df Add workingDirectory option for Maven plugin run/start 
Add configuration option that specifies the working directory to use to
run/start the application via the Maven plugin.

Closes gh-6243
 2016-10-11 15:36:27 +02:00
Andy Wilkinson
58770e0c73 Merge branch '1.5.x' 2016-10-11 13:05:10 +01:00
Andy Wilkinson
f0b235cbc5 Merge branch '1.4.x' into 1.5.x 2016-10-11 13:04:59 +01:00
Andy Wilkinson
0333416952 Update WelcomePageHandlerMapping to handle reqs with no Accept header 
Closes gh-7138
 2016-10-11 13:02:36 +01:00
Stephane Nicoll
92db3b4803 Merge branch '1.5.x' 2016-10-11 08:33:46 +02:00
Stephane Nicoll
18c3d42f45 Merge branch '1.4.x' into 1.5.x 2016-10-11 08:32:43 +02:00
Stephane Nicoll
b1d2552ede Merge pull request #7137 from michael-simons:polish_application-properties-docs 
* pr/7137:
  Add missing parentheses
 2016-10-11 08:31:59 +02:00
Michael J. Simons
e87cf937e1 Add missing parentheses 
Closes gh-7137
 2016-10-11 08:31:44 +02:00
Stephane Nicoll
98f14f2ee9 Polish documentation 
Closes gh-2642
 2016-10-11 08:30:18 +02:00
Stephane Nicoll
097c64a91b Merge branch '1.5.x' 2016-10-10 11:37:51 +02:00
Stephane Nicoll
0c9015fdb7 Merge pull request #6571 from herau:master 
* pr/6571:
  Polish contribution
  Manage Tomcat queued connections
 2016-10-10 11:37:38 +02:00
Stephane Nicoll
ab2a2579c8 Polish contribution 
Closes gh-6571
 2016-10-10 11:37:21 +02:00
Aurélien Leboulanger
7efdb91641 Manage Tomcat queued connections 
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections

Closes gh-6433
 2016-10-10 11:37:12 +02:00
Stephane Nicoll
97774afebf Merge branch '1.5.x' 2016-10-10 10:43:40 +02:00
Stephane Nicoll
d5b2f67b5f Merge pull request #6543 from vpavic:database-initializers 
* pr/6543:
  Polish contribution
  Improve database initializers
 2016-10-10 10:43:29 +02:00