root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
17,162 Commits 24 Branches 353 Tags 291 MiB
Commit Graph

17162 Commits

Author SHA1 Message Date
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
Johnny Lim aa60d60b8a Polish JpaProperties.determineDdlAuto() 
Closes gh-13036
 2018-05-14 08:13:06 +02:00
Andy Wilkinson fccfa97ba3 Merge branch '2.0.x' 2018-05-12 09:54:22 +01:00
Andy Wilkinson b4258ea908 Merge branch '1.5.x' into 2.0.x 2018-05-12 09:54:11 +01:00
Andy Wilkinson 83a6f02ec4 Polish 2018-05-12 09:53:55 +01:00
Stephane Nicoll 70f492afd4 Merge pull request #13143 from vpavic:improve-ldap-condition 
* pr/13143:
  Polish "Improve LDAP auto-configuration conditions"
  Improve LDAP auto-configuration conditions
 2018-05-11 17:59:26 +02:00
Stephane Nicoll 8e9a873787 Polish "Improve LDAP auto-configuration conditions" 
Closes gh-13143
 2018-05-11 17:59:21 +02:00
Vedran Pavic dfceede0bc Improve LDAP auto-configuration conditions 
At present, auto-configuration of `LdapContextSource` is conditional on
presence of a `ContextSource` bean. However, there are valid use cases
which require multiple `ContextSource` bean, for instance
`PooledContextSource`. With the current arrangement, the
auto-configuration of `LdapContextSource` will back off if user provides
a `PooledContextSource` bean, while it would still be reasonable to
reuse the auto-configured `LdapContextSource`.

This commit improves `LdapContextSource` factory method return value and
condition to back off only if users actually provide a
`LdapContextSource` bean themselves.

See gh-13143
 2018-05-11 17:59:21 +02:00
Andy Wilkinson efda5ef3ac Merge branch '2.0.x' 2018-05-11 16:52:29 +01:00
Andy Wilkinson 3992dacdc8 Bind empty string to empty collection or array of rich types 
Previously, when an empty String was bound to a collection or
array of rich types it would fail as there was no converter capable
of creating a Collection<RichType> or RichType[] from the String.

This commit updates IndexedElementsBinder to apply special treatment
to empty String values. Now, when such a value is being processed,
an empty Collection or array is the result.

Closes gh-12965
 2018-05-11 16:41:37 +01:00
Stephane Nicoll 1afab3a886 Merge pull request #13136 from vpavic:improve-ldap-autoconfig 
* pr/13136:
  Polish "Improve LDAP auto-configuration"
  Improve LDAP auto-configuration
 2018-05-11 14:44:17 +02:00
Stephane Nicoll a0a0bea427 Polish "Improve LDAP auto-configuration" 
Closes gh-13136
 2018-05-11 14:37:32 +02:00
Vedran Pavic f81f50c119 Improve LDAP auto-configuration 
Auto-configuration of LDAP's `LdapTemplate` is currently a part of
`LdapDataAutoConfiguration` which is conditional of presence of
`LdapRepository` (i.e. Spring Data LDAP). This arrangement isn't ideal
since the `LdapTemplate` is a part of Spring LDAP project, and therefore
should not be tied to Spring Data LDAP.

This commit improves and simplifies LDAP auto-configuration by moving
`LdapTemplate` configuration to `LdapAutoConfiguration`. Consequently,
`LdapDataAutoConfiguration` is not needed anymore and is removed.

See gh-13136
 2018-05-11 14:37:13 +02:00
Andy Wilkinson 2df156bd52 Merge branch '2.0.x' 2018-05-11 13:32:22 +01:00