spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-24 10:19:03 +00:00
Code Issues Projects Releases Wiki Activity
16,725 Commits 28 Branches 395 Tags
08a12e7964337d319bde2f649d2cce747e33da78
Commit Graph
16725 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stephane Nicoll c8dc885cc5 Add missing note 
See gh-12933
 2018-05-14 13:30:40 +02:00
Stephane Nicoll 602f52fffc Add support for configuring common tags declaratively 
Closes gh-12933
 2018-05-14 13:26:01 +02:00
Andy Wilkinson 8e4f4317f6 Merge branch '2.0.x' 2018-05-14 11:49:08 +01:00
Andy Wilkinson 285203d272 Provide dependency management for Hibernate's JPA API module 
Closes gh-13154
 2018-05-14 11:43:31 +01:00
Stephane Nicoll 93c45cb6ec Move server.servlet.path to spring.mvc.servlet.path 
Closes gh-12971
 2018-05-14 12:24:38 +02:00
Stephane Nicoll 406192741e Upgrade to Maven Exec Plugin 1.6.0 
Closes gh-13101
 2018-05-14 11:19:46 +02:00
Stephane Nicoll 37324785fc Merge branch '2.0.x' 2018-05-14 11:09:15 +02:00
Stephane Nicoll caa271dcc1 Merge branch '1.5.x' into 2.0.x 2018-05-14 11:08:59 +02:00
Stephane Nicoll 22642dd2eb Upgrade to Ehcache 2.10.5 
Closes gh-13056
 2018-05-14 11:06:12 +02:00
Stephane Nicoll 9b379b43ae Merge branch '2.0.x' 2018-05-14 09:33:16 +02:00
Stephane Nicoll 8f53c2e2bb Support for custom comment prefix 
Some Quartz initialization scripts have comments in a different format.

This commit introduces a `comment-prefix` property that should be set by
the user if their target database has a script that contains those
unusual comments.

Closes gh-13041
 2018-05-14 09:32:42 +02:00
Stephane Nicoll 7391d56b0b Merge pull request #13148 from izeye:polish-20180512 
* pr/13148:
  Polish
 2018-05-14 08:24:43 +02:00
Johnny Lim fb2ab67f4f Polish 
Closes gh-13148
 2018-05-14 08:24:01 +02:00
Stephane Nicoll b17c58b114 Merge branch '2.0.x' 2018-05-14 08:23:36 +02:00
Johnny Lim 3dd2f5bb05 Polish 
See gh-13148
 2018-05-14 08:19:10 +02:00
Stephane Nicoll 15edd02e1d Merge branch '2.0.x' 2018-05-14 08:13:40 +02:00
Stephane Nicoll d96724077c Merge pull request #13036 from izeye:polish-ddl-auto 
* pr/13036:
  Polish JpaProperties.determineDdlAuto()
 2018-05-14 08:13:29 +02:00