Phillip Webb
c66da65e23
Refine ApplicationHome detection logic
...
Update the detection logic used in ApplicationHome to:
- Deal with `!/` elements in URLs so that `BOOT-INF/classes` packaging
works as expected.
- Use the `start-class` when no explicit source class is provided to
prevent accidentally picking a home next to a `spring-boot.jar` that
happens to be on the classpath.
- Ignore search logic when running from a unit test.
Fixes gh-6129
2016-06-09 20:45:37 -07:00
Stephane Nicoll
17dfec7c4e
Resume building against Spring Data Hopper snapshots
...
See gh-6132
2016-06-09 15:54:32 +02:00
Stephane Nicoll
40ff3f420a
Upgrade to Spring HATEOAS 0.20.RELEASE
...
Closes gh-5759
2016-06-09 15:50:09 +02:00
Stephane Nicoll
8ea5524d6a
Polish
2016-06-09 15:30:28 +02:00
Stephane Nicoll
72e4064230
Merge branch '1.3.x'
2016-06-09 14:17:49 +02:00
Stephane Nicoll
ec4c8bf50d
Merge pull request #6125 from vpavic:gh-6124
...
* pr/6125:
Update DataSourceBuilder aliases
2016-06-09 14:17:24 +02:00
Vedran Pavic
6dde498b87
Update DataSourceBuilder aliases
...
This commit adds a `user` alias for the `username` property which permits
the use of `OracleDataSource`.
Closes gh-6124, gh-6027, gh-6125
2016-06-09 14:16:21 +02:00
Brian Clozel
091664078f
Split up DispatcherServletConfiguration condition
...
Prior to this commit, defining a custom `DispatcherServlet` and/or a
`ServletRegistrationBean` with the default name would turn off
completely the `DispatcherServletAutoConfiguration`.
This commit splits this auto-configuration in two parts:
- First, a `DispatcherServlet` is automatically registered if no
instance is already defined with the default name.
- Then, a `ServletRegistrationBean` is registered is registered if a
`DispatcherServlet` instance exists with the default name *and* no
`ServletRegistrationBean` exists with the default name
This allows developers to register manually a `ServletRegistrationBean`
or a `DispatcherServlet` without having to redefine the whole
auto-configuration.
Fixes gh-4893
Closes gh-6108
2016-06-08 14:10:53 -07:00
Phillip Webb
d87287fe72
Polish
2016-06-08 09:54:36 -07:00
Phillip Webb
5ab072be9c
Polish
2016-06-08 09:27:40 -07:00
Stephane Nicoll
6a291777da
Merge pull request #6066 from izeye:polish-20160530
...
* pr/6066:
Polish
2016-06-07 08:41:19 -04:00
Johnny Lim
8704e4869d
Polish
...
Closes gh-6066
2016-06-07 08:40:47 -04:00
Phillip Webb
0fa4d2e260
Make SocialAutoConfigurerAdapter/Properties public
...
Fixes gh-6078
2016-06-06 19:39:46 -07:00
Phillip Webb
454d8581d0
Use defined Locale for BindFailureAnalyzerTests
...
Update BindFailureAnalyzerTests so that localized messages are not used.
Fixes gh-6106
2016-06-06 18:07:14 -07:00
Dave Syer
6712de586b
Merge remote-tracking branch 'origin/1.3.x'
2016-06-03 13:56:03 +01:00
Dave Syer
31fc1cc6f2
Update Spring OAuth to 2.0.10
2016-06-03 13:50:07 +01:00
Stephane Nicoll
483da2615b
Merge pull request #6114 from izeye:typo-20160603
...
* pr/6114:
Fix typos
2016-06-03 07:20:59 -04:00
Johnny Lim
5de9516255
Fix typos
...
Closes gh-6114
2016-06-03 07:20:39 -04:00
Andy Wilkinson
ce68fdf515
Merge branch '1.3.x'
2016-06-01 18:14:00 +01:00
Andy Wilkinson
1037239efc
Upgrade to Dependency Management Plugin 0.5.7.RELEASE
...
Closes gh-6105
2016-06-01 18:13:25 +01:00
Andy Wilkinson
277ceb7425
Merge branch '1.3.x'
2016-06-01 18:10:44 +01:00
Andy Wilkinson
9bbdbae178
Merge pull request #6056 from Martin Lippert
...
* gh-6056:
Check factory method metadata to avoid NPE in devtools condition
2016-06-01 18:09:02 +01:00
Martin Lippert
efd541d26b
Check factory method metadata to avoid NPE in devtools condition
...
Closes gh-6056
2016-06-01 18:08:17 +01:00
Andy Wilkinson
a3f4b3c704
Merge branch '1.3.x'
2016-06-01 17:14:51 +01:00
Andy Wilkinson
f3e9f1e6e3
Polish FileSystemWatcher and improve its thread safety
...
- Limit shared state between FileSystemWatcher and the watching thread
- Use a private monitor rather than synchronizing on this
- Use a Runnable implementation rather than subclassing Thread
- Synchronize consistently when reading and writing state
Closes gh-6039
2016-06-01 17:13:04 +01:00
Andy Wilkinson
436b58acbf
Merge branch '1.3.x'
2016-06-01 15:41:36 +01:00
Andy Wilkinson
3772d9f937
Update JarURLConnection to only require file read permission
...
Previously, JarURLConnection didn't override getPermission(). This
meant that it required all permissions. This was at odds with the
Oracle JVM's concrete sun.net.www.protocol.jar.JarURLConnection which
overrides getPermission to return a FilePermission with the read
action for the path of the underlying jar.
This commit updates our JarURLConnection to align its behaviour with
sun.net.www.protocol.jar.JarURLConnection.
Closes gh-5411
2016-06-01 15:33:36 +01:00
Andy Wilkinson
ac5696e13c
Upgrade to Spring AMQP 1.6.0.RELEASE
...
Closes gh-6099
2016-06-01 14:54:00 +01:00
Andy Wilkinson
9bb1151178
Upgrade to MariaDB Java Client 1.4.5
...
Closes gh-6098
2016-06-01 14:54:00 +01:00
Andy Wilkinson
cde06444e0
Upgrade to Infinispan 8.2.2.Final
...
closes gh-6097
2016-06-01 14:54:00 +01:00
Andy Wilkinson
9f2a482f91
Upgrade to Jersey 2.23
...
Closes gh-6096
2016-06-01 14:54:00 +01:00
Andy Wilkinson
bd15d41500
Upgrade to Log4j2 2.6
...
Closes gh-6095
2016-06-01 14:53:59 +01:00
Andy Wilkinson
dfaf02b220
Upgrade to Joda Time 2.9.4
...
Closes gh-6093
2016-06-01 14:53:59 +01:00
Andy Wilkinson
68587f466e
Upgrade to Hazelcast 3.6.3
...
Closes gh-6092
2016-06-01 14:53:59 +01:00
Andy Wilkinson
fdd76869ec
Upgrade to App Engine API 1.9.38
...
Closes gh-6091
2016-06-01 14:53:59 +01:00
Andy Wilkinson
54c68f5597
Upgrade to Spring REST Docs 1.1.0.RELEASE
...
Closes gh-6077
2016-06-01 14:53:59 +01:00
Andy Wilkinson
53061fb8d7
Upgrade to jOOQ 3.8.2
...
Closes gh-6064
2016-06-01 14:53:58 +01:00
Andy Wilkinson
0dd0cef054
Upgrade to HTMLUnit 2.21
...
Closes gh-5954
2016-06-01 14:53:58 +01:00
Andy Wilkinson
455aa05bc6
Provide dependency management for xml-apis:xml-apis
...
Closes gh-6102
2016-06-01 14:53:58 +01:00
Andy Wilkinson
202552b9fb
Merge branch '1.3.x'
2016-06-01 14:18:06 +01:00
Andy Wilkinson
28bd6d60c8
Revert "Upgrade to Tomcat 8.0.35"
...
This reverts commit 66e093ed0d
. There's
a regression [1] in Tomcat 8.0.35 that causes it to throw an NPE when
it scans a jar file without a manifest. It's already been fixed [2].
See gh-6087
[1] https://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?annotate=1742274#l369
[2] https://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/scan/StandardJarScanner.java?annotate=1744197#l369
2016-06-01 14:13:21 +01:00
Andy Wilkinson
84b7b25076
Merge branch '1.3.x'
2016-06-01 13:21:46 +01:00
Andy Wilkinson
9ec4e5c74a
Upgrade to Spring REST Docs 1.0.2.RELEASE
...
Closes gh-6090
2016-06-01 13:16:40 +01:00
Andy Wilkinson
d0df8cbe51
Upgrade to HSQLDB 2.3.4
...
Closes gh-6089
2016-06-01 13:16:14 +01:00
Andy Wilkinson
055c318506
Upgrade to Jetty 9.2.17.v20160517
...
Closes gh-6088
2016-06-01 13:15:52 +01:00
Andy Wilkinson
66e093ed0d
Upgrade to Tomcat 8.0.35
...
Closes gh-6087
2016-06-01 13:15:05 +01:00
Andy Wilkinson
b2413850c4
Upgrade to Embedded Mongo 1.50.5
...
Closes gh-6086
2016-06-01 13:14:39 +01:00
Andy Wilkinson
a5fdc05d82
Upgrade to H2 1.4.192
...
Closes gh-6085
2016-06-01 13:14:12 +01:00
Phillip Webb
433f5e7930
Configure TestRestTemplate using builder
...
Update SpringBootTestContextCustomizer to create the TestRestTemplate
using the RestTemplateBuilder whenever possible.
Fixes gh-5509
2016-05-31 18:01:55 -07:00
Phillip Webb
e1d74627f5
Make test auto-configuration classes public
...
Make test auto-configuration classes public so that they can be used
by others with @AutoConfigureBefore/@AutoConfigureAfter.
Fixes gh-6073
2016-05-31 13:30:18 -07:00