Stephane Nicoll
9ea4fce03e
Merge branch '2.0.x'
2018-05-16 09:29:02 +02:00
Stephane Nicoll
ba2e9cccf7
Merge pull request #13174 from izeye:render-error-view
...
* pr/13174:
Polish DefaultErrorWebExceptionHandler.renderErrorView()
2018-05-16 09:28:49 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Andy Wilkinson
1f551e9e9c
Merge branch 'lovelace-upgrade'
2018-05-15 17:55:27 +01:00
Andy Wilkinson
38b491018c
Upgrade to Solr 7.2.1
...
Closes gh-13182
2018-05-15 17:22:27 +01:00
Andy Wilkinson
b5185fbe10
Upgrade to Lettuce 5.1.0.M1
...
Closes gh-13181
2018-05-15 17:22:26 +01:00
Andy Wilkinson
148997fd43
Upgrade to Elasticsearch 6.2.4
...
Closes gh-13178
2018-05-15 17:11:28 +01:00
Andy Wilkinson
795ff45a65
Upgrade to Cassandra Java Driver 3.5.0
...
Closes gh-13177
2018-05-15 16:57:51 +01:00
Andy Wilkinson
150a19523c
Start building against Spring Data Lovelace M3 snapshots
...
See gh-13169
2018-05-15 16:57:51 +01:00
Andy Wilkinson
33fadda4d9
Upgrade to Mongo Driver Reactive Streams 1.9.0-beta1
...
Closes gh-13180
2018-05-15 16:57:50 +01:00
Andy Wilkinson
3dfacaa1e3
Upgrade to MongoDB 3.8.0-beta2
...
Closes gh-13179
2018-05-15 16:57:50 +01:00
Stephane Nicoll
e5ac3bc391
Merge branch '2.0.x'
2018-05-15 15:10:04 +02:00
Stephane Nicoll
be2234a8f0
Merge pull request #13171 from izeye:set-key-value
...
* pr/13171:
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
2018-05-15 15:09:55 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
d84cb44b1e
Merge pull request #11061 from axtavt:gh-7659
...
* pr/11061:
Polish "Allow repackage maven goal to take a source classifier"
Allow repackage maven goal to take a source classifier
2018-05-15 15:02:46 +02:00
Stephane Nicoll
ed02d02d19
Polish "Allow repackage maven goal to take a source classifier"
...
Closes gh-11061
2018-05-15 15:02:22 +02:00
Björn
3c8e012411
Allow repackage maven goal to take a source classifier
...
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.
This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.
If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.
See gh-11061
2018-05-15 15:02:22 +02:00
Andy Wilkinson
08a12e7964
Merge branch '2.0.x'
2018-05-15 10:28:56 +01:00
Andy Wilkinson
be0b8eb871
Merge branch '1.5.x' into 2.0.x
2018-05-15 10:28:46 +01:00
Andy Wilkinson
0c55c54cb7
Document how to use Jersey with Spring Security's method security
...
Closes gh-12995
2018-05-15 10:10:19 +01:00
Andy Wilkinson
72b45584eb
Merge branch '2.0.x'
2018-05-15 09:18:06 +01:00
Andy Wilkinson
8b028e30d3
Merge branch '1.5.x' into 2.0.x
2018-05-15 09:18:01 +01:00
Andy Wilkinson
e52b721d23
Update the link that's used for Jetty's javadoc
...
Closes gh-13167
2018-05-15 09:16:23 +01:00
Andy Wilkinson
46855ab8eb
Merge branch '2.0.x'
2018-05-14 20:07:57 +01:00
Andy Wilkinson
73e525a280
Merge branch '1.5.x' into 2.0.x
2018-05-14 20:07:46 +01:00
Andy Wilkinson
339fd74810
Call ServletContextListener.contextDestroyed() when Undertow is stopped
...
Previously, when the embedded Undertow container was stopped, the
servlet deployment was stopped but it was not undeployed. This meant
that contextDestroyed() callback of any registered
ServletContextListeners was not called.
This commit updates UndertowEmbeddedServletContainer to call undeploy
on the deployment manager in addition to the existing call to stop.
Undeploying the servlet deployment calls Undertow to drive the
contextDestroyed callback on any registered ServletContextListeners.
Closes gh-13134
2018-05-14 19:56:08 +01:00
Andy Wilkinson
9bdfc414e5
Merge branch '2.0.x'
2018-05-14 18:02:53 +01:00
Andy Wilkinson
1ffc8a564a
Merge branch '1.5.x' into 2.0.x
2018-05-14 18:02:46 +01:00
Andy Wilkinson
f07daf898b
Merge pull request #12071 from imgx64
...
* gh-12071:
Polish "Suppress debug log output during Logback initialization"
Suppress debug log output during Logback initialization
2018-05-14 18:02:12 +01:00
Andy Wilkinson
1fc2eba98b
Polish "Suppress debug log output during Logback initialization"
...
See gh-12071
2018-05-14 18:01:12 +01:00
imgx64
8f44bb9d42
Suppress debug log output during Logback initialization
...
Closes gh-12071
2018-05-14 17:57:12 +01:00
Andy Wilkinson
16457ad988
Merge branch '2.0.x'
2018-05-14 17:54:50 +01:00
Andy Wilkinson
cddc2b4483
Merge branch '1.5.x' into 2.0.x
2018-05-14 17:54:31 +01:00
Andy Wilkinson
b559cadda9
Provide dependency management for spring-xml
...
Closes gh-13150
2018-05-14 17:52:29 +01:00
Stephane Nicoll
497aebe010
Merge branch '2.0.x'
2018-05-14 18:21:33 +02:00
Stephane Nicoll
eab05e8845
Merge pull request #12541 from andreysaksonov:spring-boot-cli_scoop_install
...
* pr/12541:
Polish "Add CLI manifest for Scoop"
Add CLI manifest for Scoop
2018-05-14 18:21:21 +02:00
Stephane Nicoll
a3a6a2b291
Polish "Add CLI manifest for Scoop"
...
Closes gh-12541
2018-05-14 18:20:57 +02:00
Andrey Saksonov
daccdbb18d
Add CLI manifest for Scoop
...
See gh-12541
2018-05-14 18:00:32 +02:00
Stephane Nicoll
24024b00da
Merge branch '2.0.x'
2018-05-14 17:42:15 +02:00
Stephane Nicoll
f934e00e7e
Merge pull request #12209 from Dav1dde:bugfix-12088
...
* pr/12209:
Polish "Set classloader for JMX endpoints to application classloader"
Set classloader for JMX endpoints to application classloader
2018-05-14 17:42:00 +02:00
Stephane Nicoll
2be1c8f527
Polish "Set classloader for JMX endpoints to application classloader"
...
Closes gh-12209
2018-05-14 17:41:47 +02:00
David Herberth
e44c81672f
Set classloader for JMX endpoints to application classloader
...
See gh-12209
2018-05-14 17:41:31 +02:00
Stephane Nicoll
a8767a0123
Merge pull request #12890 from fpavageau:mockito-junit5
...
* pr/12890:
Manage the Mockito/JUnit 5 dependency
2018-05-14 17:02:31 +02:00
Frank Pavageau
ab7f6654d8
Manage the Mockito/JUnit 5 dependency
...
This requires an updated Mockito dependency as well, since it was
introduced in Mockito 2.17.0 but really works starting with 2.18.0.
Closes gh-12890
2018-05-14 16:21:23 +02:00
Stephane Nicoll
33addf1a12
Merge pull request #13159 from vkiriushkin:master
...
* pr/13159:
Polish "Add liquibase test rollback on update property"
Add liquibase test rollback on update property
2018-05-14 16:14:27 +02:00
Stephane Nicoll
c7eec5c45e
Polish "Add liquibase test rollback on update property"
...
Closes gh-13159
2018-05-14 16:14:11 +02:00
Vladyslav Kiriushkin
08279c889c
Add liquibase test rollback on update property
...
See gh-13159
2018-05-14 16:06:08 +02:00
Stephane Nicoll
b839c98de9
Merge branch '2.0.x'
2018-05-14 16:04:30 +02:00
Stephane Nicoll
c14b3a376e
Merge pull request #13161 from sdeleuze:kotlin-tuto
...
* pr/13161:
Update Kotlin refdoc with the new tutorial
2018-05-14 16:04:16 +02:00
Sebastien Deleuze
d747d43b23
Update Kotlin refdoc with the new tutorial
...
Closes gh-13161
2018-05-14 16:03:46 +02:00