Commit Graph

16512 Commits

Author SHA1 Message Date
Andy Wilkinson c271f8ef8b Merge branch '1.5.x' into 2.0.x 2018-05-17 11:39:08 +01:00
Andy Wilkinson 64158ebaf5 Reinstate use of ConversionService for String -> File conversion
Prior to 3db5c70b, RelaxedDataBinder would use a ConversionService
to convert a String into a File via its ObjectToObjectConverter.
3db5c70b changed the configuration of the data binder such that a
FileEditor was registered. Property editors take precedence over any
conversion service so the FileEditor was used instead. This caused a
regression as the FileEditor uses slightly unusual logic for a String
to File conversion. Specifically, when given a value of ".", it will
locate a ClassPathResource for the root of the classpath and use the
result of calling getFile() on that resource. This fails when the
root of the classpath is in a jar file and also provides a different
result when the root of the classpath is not the current directory.

This commit updates RelaxedDataBinder to suppress the registration
of an editor for File. This restores the behaviour prior to 3db5c70b
by allowing the ConversionService to be used instead.

Closes gh-12786
2018-05-17 11:38:48 +01:00
Stephane Nicoll 1d2edc1d37 Fix wrong reference to WebApplicationType
Closes gh-13195
2018-05-17 09:35:07 +02:00
Andy Wilkinson ce3bd32629 Merge branch '1.5.x' into 2.0.x 2018-05-17 08:30:27 +01:00
Andy Wilkinson 700faabc56 Start building against Spring Security 4.2.7 snapshots
See gh-13196
2018-05-17 08:29:48 +01:00
Stephane Nicoll 7b7e802129 Merge branch '1.5.x' into 2.0.x 2018-05-16 13:16:54 +02:00
Stephane Nicoll 38051d98fd Merge pull request #13175 from kesslerj
* pr/13175:
  Polish "Respect lombok.AccessLevel attributes"
  Respect lombok.AccessLevel attributes
2018-05-16 13:13:54 +02:00
Stephane Nicoll 563d7d70a2 Polish "Respect lombok.AccessLevel attributes"
Closes gh-13175
2018-05-16 13:12:16 +02:00
Jonas Keßler 3699132cf0 Respect lombok.AccessLevel attributes
See gh-13175
2018-05-16 09:54:50 +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
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
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 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 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 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 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 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 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 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
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 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 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
Johnny Lim 3dd2f5bb05 Polish
See gh-13148
2018-05-14 08:19:10 +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 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
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
Andy Wilkinson 45f4e8795e Merge branch '1.5.x' into 2.0.x 2018-05-11 13:32:08 +01:00
Andy Wilkinson a9645a3d07 Polish 2018-05-11 13:29:04 +01:00
Stephane Nicoll 065f357e79 Merge pull request #13137 from vpavic:update-gitignore
* pr/13137:
  Add .gitignore for Gradle Plugin module
2018-05-11 14:28:21 +02:00
Vedran Pavic a08fa27c39 Add .gitignore for Gradle Plugin module
Closes gh-13137
2018-05-11 14:28:02 +02:00
Stephane Nicoll 846e43ff85 Merge pull request #13144 from dreis2211:remove-unnecessary-semicolons
* pr/13144:
  Remove unnecessary semicolons
2018-05-11 14:24:01 +02:00
dreis2211 e6a23fa3ff Remove unnecessary semicolons
Closes gh-13144
2018-05-11 14:23:47 +02:00
Andy Wilkinson 972d952716 Merge branch '1.5.x' into 2.0.x 2018-05-11 11:54:12 +01:00