Commit Graph

21208 Commits

Author SHA1 Message Date
Stephane Nicoll
6635b6aa99 Merge branch '1.5.x' 2017-10-03 15:24:20 +02:00
Stephane Nicoll
7e08e47b75 Clarify datasource initializer scope
This commit clarifies the scope of the datasource initializr. In
particular, it is not possible to create the schema with that facility
and let Hibernate creates additional tables.

Closes gh-9048
2017-10-03 15:23:58 +02:00
Stephane Nicoll
bd02edf2ce Configure JPA only if a single datasource is available
This commit changes HibernateJpaAutoConfiguration to back off if no
single datasource candidate is available in the context.

Closes gh-5541
2017-10-03 14:52:11 +02:00
Stephane Nicoll
8656512bbe Move DataSourceInitializer lifecycle
This commit separates the lifecycle of the datasource initialization
from DataSourceInitializer itself. It also makes sure that a @Primary
data source is no longer required.

Closes gh-10502
2017-10-03 14:52:11 +02:00
Andy Wilkinson
89992ea4cc Upgrade to Spring Session Data Mongodb 2.0.0.M4
Closes gh-10501
2017-10-03 13:32:19 +01:00
Stephane Nicoll
bccf9464aa Polish 2017-10-03 13:36:36 +02:00
Stephane Nicoll
1fd184f7db Fix javadoc generation 2017-10-03 11:19:29 +02:00
Stephane Nicoll
7aa6219cd2 Merge pull request #10498 from shakuzen:patch-14
* pr/10498:
  Upgrade to Maven Compiler Plugin 3.7.0
2017-10-03 10:23:16 +02:00
Tommy Ludwig
43086c0708 Upgrade to Maven Compiler Plugin 3.7.0
Closes gh-10498
2017-10-03 10:22:54 +02:00
Stephane Nicoll
bf945cc156 Polish 2017-10-03 09:08:41 +02:00
Madhura Bhave
dbe1d9608d Add auto-config for spring-security-oauth2-client
Closes gh-10497
2017-10-02 14:36:35 -07:00
Andy Wilkinson
494b79c439 Merge pull request #10495 from Johnny Lim
* gh-10495:
  Remove BeansEndpoint.BeansEndpointResponse
2017-10-02 20:16:40 +01:00
Johnny Lim
454e8eaf71 Remove BeansEndpoint.BeansEndpointResponse
Closes gh-10495
2017-10-02 20:16:20 +01:00
Andy Wilkinson
4e87f8163e Merge branch '1.5.x' 2017-10-02 20:07:38 +01:00
Andy Wilkinson
71c15cb65e Avoid possible livelock when stopping FileSystemWatcher in parallel
Previously, if the file watcher thread tried to stop the
FileSystemWatcher when another thread was already stopping it a
livelock could occur. The livelock occurred because the file watcher
thread would attempt to lock a monitor that was being held by a thread
that had joined the file watcher thread and was waiting for it to die.

This commit avoid the livelock by narrowing the synchronization that's
used when stopping the FileSystemWatcher. The monitor is used to
obtain a reference to the file watcher thread in a thread-safe manner,
but it is released prior to joining the file watcher thread and
waiting for it to die. This will allow a parallel attempt by the
file watcher thread to stop itself to succeed.

Closes gh-10496
2017-10-02 20:03:17 +01:00
Stephane Nicoll
fd478be5c3 Polish 2017-10-02 18:44:58 +02:00
Andy Wilkinson
114379e97a Merge branch '1.5.x' 2017-10-02 16:06:35 +01:00
Andy Wilkinson
205c25bf0f Polish 2017-10-02 15:56:52 +01:00
Andy Wilkinson
08f8434155 Upgrade to Spring Restdocs 1.2.2.RELEASE
Closes gh-10492
2017-10-02 15:47:04 +01:00
Andy Wilkinson
6ef3ab1805 Upgrade to Selenium 3.6.0
Closes gh-10491
2017-10-02 15:47:03 +01:00
Andy Wilkinson
f42ebdceea Upgrade to Neo4j Ogm 3.0.0
Closes gh-10490
2017-10-02 15:47:02 +01:00
Andy Wilkinson
46eb98f1dc Upgrade to Mariadb 2.1.2
Closes gh-10489
2017-10-02 15:47:01 +01:00
Andy Wilkinson
edcf753983 Upgrade to Jooq 3.10.0
Closes gh-10488
2017-10-02 15:47:01 +01:00
Andy Wilkinson
46aa3acc0b Upgrade to Narayana 5.7.0.Final
Closes gh-10487
2017-10-02 15:47:00 +01:00
Andy Wilkinson
7f013a9241 Upgrade to Rest Assured 3.0.3
Closes gh-10486
2017-10-02 15:46:59 +01:00
Andy Wilkinson
fd2945f2c1 Upgrade to Netty 4.1.16.Final
Closes gh-10485
2017-10-02 15:46:59 +01:00
Andy Wilkinson
f763533805 Merge branch '1.5.x' 2017-10-02 15:39:37 +01:00
Stephane Nicoll
b37d3e1153 Merge pull request #10380 from eddumelendez:gh-10376
* pr/10380:
  Polish "Auto-configure Kafka MessageConverter"
  Auto-configure Kafka MessageConverter
2017-10-02 16:37:24 +02:00
Stephane Nicoll
2537a0a753 Polish "Auto-configure Kafka MessageConverter"
Closes gh-10380
2017-10-02 16:36:56 +02:00
Eddú Meléndez
d7bc93f278 Auto-configure Kafka MessageConverter
See gh-10380
2017-10-02 16:36:56 +02:00
Andy Wilkinson
c1092f77f5 Upgrade to Jooq 3.9.6
Closes gh-10484
2017-10-02 15:36:13 +01:00
Andy Wilkinson
e9749765ab Upgrade to Aspectj 1.8.11
Closes gh-10483
2017-10-02 15:36:13 +01:00
Andy Wilkinson
a0fa782237 Upgrade to Tomcat 8.5.23
Closes gh-10482
2017-10-02 15:36:12 +01:00
Andy Wilkinson
f32531b4e4 Upgrade to Appengine Sdk 1.9.57
Closes gh-10481
2017-10-02 15:36:11 +01:00
Andy Wilkinson
5c0ce4e514 Remove dependency management for non-existent dependencies
See gh-10475
See gh-10473
2017-10-02 15:31:04 +01:00
Andy Wilkinson
41424e4529 Merge branch '1.5.x'
Closes gh-10457
2017-10-02 15:24:12 +01:00
Andy Wilkinson
d94f545b4d Merge pull request #10457 from Johnny Lim
* gh-10457:
  Polish
2017-10-02 15:14:48 +01:00
Johnny Lim
bfa291f671 Polish 2017-10-02 15:07:03 +01:00
Stephane Nicoll
ec6659db2e Merge pull request #10466 from kedar-joshi:master
* pr/10466:
  Polish
  Polish "Adds support for useCodeAsDefaultMessage"
  Adds support for useCodeAsDefaultMessage
2017-10-02 15:56:35 +02:00
Stephane Nicoll
d778173089 Polish 2017-10-02 15:56:09 +02:00
Stephane Nicoll
6c826ef0b6 Polish "Adds support for useCodeAsDefaultMessage"
Closes gh-10466
2017-10-02 15:43:27 +02:00
Kedar Joshi
a68ec76bb6 Adds support for useCodeAsDefaultMessage
See gh-10466
2017-10-02 15:37:43 +02:00
Andy Wilkinson
9102eb32d1 Polish 2017-10-02 13:34:32 +01:00
Andy Wilkinson
9ba20cc380 Merge branch '1.5.x' 2017-10-02 12:56:14 +01:00
Andy Wilkinson
bcbf7b5511 Update ChangeableUrlsTests to cope with URL-like Windows file paths
Closes gh-10268
2017-10-02 12:53:25 +01:00
Andy Wilkinson
30727ab145 Merge branch '1.5.x' 2017-10-02 12:49:13 +01:00
Andy Wilkinson
858b092a87 Make servlet context property source available before refresh
Previously, when deploying a Spring Boot application to a container,
the servlet context property source was not fully initialised until
the context was refreshed. This led to a problem where a value from a
property source with lower precedence would be seen during the early
stages of the application starting. Once the servlet context property
source had been initialized, its value for the property would then
become visible effectively making it appear as if the property's
value had changed during startup. This led to a specific problem
with determining active profiles.

If spring.profiles.active was set both in JNDI and via the servlet
context both profiles would end up being active, rather than the
more intuitive behaviour of the profiles made active via the servlet
context overriding those made active via JNDI.

This commit updates SpringBootServletInitializer so that it explicitly
creates the StandardServletEnvironment and initializes its property
sources using the servlet context. This is done before the application
is created and run, thereby ensuring that the servlet context
property source is available throughout the application's startup.

Closes gh-9972
2017-10-02 12:38:59 +01:00
Andy Wilkinson
a7ce9546a2 Upgrade to Spring Data Kay-RELEASE
Closes gh-10329
2017-10-02 12:16:14 +01:00
Andy Wilkinson
1b40e90411 Merge branch '1.5.x' 2017-10-02 11:44:25 +01:00
Andy Wilkinson
71dbbc0d66 Provide more complete dependency management for Solr
Closes gh-10476
2017-10-02 11:40:26 +01:00