Commit Graph

7880 Commits

Author SHA1 Message Date
Phillip Webb 29900b48ea Polish docs 2016-04-12 21:23:22 -07:00
Phillip Webb 2d71b08eef Fix copy/paste error in documentation 2016-04-12 20:06:35 -07:00
Phillip Webb dacf0f9826 Merge pull request #5667 from oembedler/master
* pull5667:
  Fix potential NPE in RedisAutoConfiguration
2016-04-12 14:52:57 -07:00
oEmbedler Inc af39d558ff Fix potential NPE in RedisAutoConfiguration
Closes gh-5667
2016-04-12 14:51:18 -07:00
Phillip Webb 6eeda76af7 Merge branch '1.3.x' 2016-04-12 14:50:14 -07:00
Phillip Webb a2f482b7f3 Merge pull request #5053 from spauk/master
* pull5053:
  Make UserInfoTokenServices.getPrincipal protected
2016-04-12 14:41:07 -07:00
Sergey Pauk 8542f4f481 Make UserInfoTokenServices.getPrincipal protected
Update UserInfoTokenServices.getPrincipal() so that it can be overridden
by subclasses to allow a custom authenticated principal to be returned
from the authorized request parameters.

Fixes gh-5053
2016-04-12 14:40:37 -07:00
Phillip Webb b1656be3d0 Fix possible binder IndexOutOfBoundsException
Update RelaxedDataBinder.extendCollectionIfNecessary to use the current
index when checking if the path node is an array.

Fixes gh-5635
2016-04-12 14:36:36 -07:00
Phillip Webb caaf8e96b9 Reduce churn when parsing Jar files
Update CentralDirectoryParser to reduce the number of objects created
when parsing the central directory. A single CentralDirectoryFileHeader
object is now reused as entries are parsed.

Fixes gh-5260
2016-04-12 13:25:04 -07:00
Phillip Webb 5bc274ca09 Polish 2016-04-12 13:23:43 -07:00
Phillip Webb 0968d411e6 Fix reference to non-final field 2016-04-12 13:23:42 -07:00
Phillip Webb fa18d2ccbf Attempt to prevent BindExceptions in tests
Update tests that use `doWithBlockedPort` so that the port is obtained
and bound early to ensure that something else doesn't grab it.
2016-04-12 12:54:57 -07:00
Andy Wilkinson 22e1a23d38 Work around bug in crash.shell pom that causes crash.cli to go AWOL
When spring-boot-docs is built on Windows, Maven logs a warning:

[WARNING] The POM for org.crashub:crash.shell🫙1.3.2 is invalid,
transitive dependencies (if any) will not be available, enable debug
logging for more details

The build then fails as a class in crash.cli, a dependency of
crash.shell, is unavailable. The failure’s due to a hardcoded path
in the pom that Maven needs to be absolute and isn’t on Windows. See
https://jira.exoplatform.org/browse/CRASH-247 for details.

This commit works around the problem by explicitly declaring
crash.shell’s one dependency directly. The warning is still logged but
it’s now benign.

Closes gh-5633
2016-04-12 16:27:50 +01:00
Andy Wilkinson 43d30cc5bc Merge branch '1.3.x' 2016-04-12 14:06:06 +01:00
Andy Wilkinson 1412eaa0e0 Handle relative URLs in jar's Class-Path when getting changeable URLs
5e0ba6ea added support for reading a jar manifest's Class-Path
attribute when resolving changeable URLs from a URLClassLoader,
however it did not handle relative URLs, i.e. URLs without a protocol,
correctly.

This commit updates ChangeableUrls so that it uses the URL of the
JAR that contains the manifest as the base for any new URLs that
are created. When the Class-Path entry is relative, this base will
be used. When the Class-Path entry is absolutee, URL's constructor
will ignore the supplied base.

Closes gh-5665
2016-04-12 13:47:58 +01:00
Andy Wilkinson a192970fb3 Merge pull request #5324 from Henri Kerola
* gh-5324:
  Polish "Allow Jetty's ThreadPool to be customized" (gh-5324)
  Allow Jetty's ThreadPool to be customized
2016-04-12 10:06:35 +01:00
Andy Wilkinson acda000975 Polish "Allow Jetty's ThreadPool to be customized" (gh-5324) 2016-04-12 10:04:37 +01:00
Henri Kerola 6f094243bb Allow Jetty's ThreadPool to be customized
This commit enhances JettyEmbeddedServletContainerFactory to allow
Jetty to be created with a custom ThreadPool via a new
setThreadPool(ThreadPool) method.

Closes gh-5324
2016-04-12 09:56:56 +01:00
Stephane Nicoll 2da7799325 Merge pull request #5661 from izeye/polish-20160412
* pr/5661:
  Polish
2016-04-12 07:41:26 +02:00
Johnny Lim 030096c490 Polish
Closes gh-5661
2016-04-12 07:41:09 +02:00
Stephane Nicoll 3156b17f8a Polish 2016-04-12 07:34:29 +02:00
Andy Wilkinson 5677b222d2 Document using @TestConfiguration to customize app's primary config
Closes gh-5566
2016-04-11 21:15:06 +01:00
Andy Wilkinson 69499bf329 Make configuration of acceptors and selectors compatible with Jetty 8
The ServerConnector class doesn’t exist in Jetty 8 so we have to
resort to reflection to create and configure a SelectChannelConnector
instead.

Closes gh-5649
See gh-5380
2016-04-11 21:03:06 +01:00
Phillip Webb fa142d929a Restore Jetty 8 compatibility
Acceptors and Selectors aren't supported with Jetty 8.

See gh-5380
2016-04-11 12:17:43 -07:00
Phillip Webb c79ecc29c6 Polish 2016-04-11 11:51:09 -07:00
Phillip Webb 7956e68224 Fix warnings 2016-04-11 11:41:38 -07:00
Phillip Webb ee629a84fa Merge pull request #5649 from venilnoronha/issue-5380-fix
* issue-5380-fix:
  Add Jetty `acceptors` and `selectors` support
2016-04-11 11:31:02 -07:00
Venil Noronha 1def64e49e Add Jetty `acceptors` and `selectors` support
Add support for Jetty `acceptors` and `selectors` configuration, either
directly on the `JettyEmbeddedServletContainerFactory` or via
`server.jetty.acceptors`/`server.jetty.selectors` server properties.

Fixes gh-5380
Closes gh-5649
2016-04-11 11:30:55 -07:00
Phillip Webb 1bf10f2926 Fix accidental banner regression
Fix accidental regression introduced when I tweaked the updated
banner support (commit aaed87d1).

See gh-5636
2016-04-11 11:30:13 -07:00
Phillip Webb 944a49bd58 Tweak Elasticsearch sample timeout 2016-04-11 11:07:37 -07:00
Phillip Webb caf9bd9be2 Merge pull request #5636 from michael-simons/add_banner_bean
* add_banner_bean:
  Register printed banner in ApplicationContext
2016-04-11 10:56:46 -07:00
Michael J. Simons aaed87d176 Register printed banner in ApplicationContext
Update SpringApplication to store the banner that was actually printed
as a bean named `springBootBanner`.

Closes gh-5636
2016-04-11 10:54:22 -07:00
Andy Wilkinson e14329c77b Upgrade to Spring Web Services 2.3.0.RELEASE 2016-04-11 18:05:59 +01:00
Phillip Webb b00d97e764 Upgrade to AssertJ 2.4.1
Fixes gh-5647
2016-04-11 10:00:18 -07:00
Phillip Webb 2d992c1324 Polish 2016-04-11 09:59:16 -07:00
Andy Wilkinson f87defe15a Document FlywayMigrationStrategy
Closes gh-5656
2016-04-11 17:30:49 +01:00
Stephane Nicoll 99ae6dac53 Customize Couchbase's socket connect timeout
Our Windows build is failing currently because the couchbase server does
not handle a socket connection within a second (the default). This commit
adds a property to customize this option and set it to 10 sec in the
sample.

While investigating this issue, it turns out that while
`CouchbaseConfiguration` is public, it is not really possible to extend
it in user's configuration. This commit fixes this problem and add a test
that demonstrates how it can be used.

Closes gh-5657
2016-04-11 18:23:27 +02:00
Andy Wilkinson d8dc76bbb0 Complete dependency management for Spring Session
Spring Session 1.2 has introduced two new modules. This commit
expands Boot's dependency management to cover them.

Closes gh-5634
2016-04-11 17:19:02 +01:00
Andy Wilkinson 0c78b2fd3d Handle fully-qualified Windows paths correctly in the CLI
Previously, the CLI would always use the class loader to try to locate
a source file. This was contrary to the SourceOptions javadoc which
states that the class loader is “used to try and load files that are
not found in the local filesystem”. This provide to be problematic on
Windows when a fully-qualified source file was supplied. The driver
letter colon slash (e.g. c:/) at the start of the path is considered
invalid for a class path resource by URLClassPath.Loader resulting in an
IllegalArgumentException being thrown.

A workaround for this URLClassPath behaviour was added in a71c9b5d. It
was removed as part of reworking LaunchedURLClassLoader to use a
conventional delegation model in 87fe0b2a. It was then reinstated in
cc140b2c. This work around is undesirable as it causes
LaunchedURLClassLoader’s behaviour to diverge from URLClassLoader’s
behaviour (this is contrary to the comments in the test added in
a71c9b5d which incorrectly tests the two class loader with different
class paths. If the two class loaders are created with the same class
path then their behaviour is the same).

This commit updates SourceOptions to make its behaviour match its
javadoc so that a search of the class path is only performed if the
filename doesn’t exist on the filesystem. Furthermore, when running on
Windows, if the filename is an absolute path no further searching is
performed as the path cannot reliably be used to search the class path
due to the behaviour of URLClassPath.Loader when given a path that
is an absolute file path on Windows. This ensures that the user is
presented with an error message indicating that the file could not be
found.

Closes gh-5650
2016-04-11 16:27:50 +01:00
Stephane Nicoll c38bb9657d Polish 2016-04-11 16:11:51 +02:00
Stephane Nicoll 82207ffce5 Attempt to fix Windows build
The couchbase instance in our windows infra seems super slow. Trying to
workaround that issue by increasing the connect timeout from 5 to 10 sec.

See gh-5651
2016-04-11 15:18:08 +02:00
Andy Wilkinson 2e86f0f890 Update instructions in the the README for building reference docs
The instructions should have been updated as part of the work on
gh-5267 so that the zip of all of the starter poms is available to
the documentation's build. With that fixed, the current instructions
still fail as the javadoc fails to generated as a result of
org.springframework.boot:spring-boot:test-jar:tests being unavailable.
This can be avoid by simply not trying to build the javadoc, i.e.
by running generate-resources rather than install.

Closes gh-5633
2016-04-11 09:53:59 +01:00
Stephane Nicoll b374c288fa Fix configuration location 2016-04-11 10:52:23 +02:00
Andy Wilkinson bdaf857e44 Merge pull request #5652 from Johnny Lim
* gh-5652:
  Use the passed parameter in BuildInfo.coerceToStringValues()
2016-04-11 09:25:04 +01:00
Johnny Lim b5f92611aa Use the passed parameter in BuildInfo.coerceToStringValues()
Closes gh-5652
2016-04-11 09:24:52 +01:00
Phillip Webb abe8c2ec17 Fix checkstyle error 2016-04-10 23:37:35 -07:00
Phillip Webb 8514064d5c Tweak FileSystemWatcherTests timing for Windows 2016-04-10 23:28:37 -07:00
Phillip Webb 35bec96180 Merge pull request #4953 from mbenson/notprofilesyaml
* notprofilesyaml:
  Polish profile negation in YAML sub-documents
  Support profile negation in YAML sub-documents
2016-04-10 23:24:33 -07:00
Phillip Webb a39d351eed Polish profile negation in YAML sub-documents
Closes gh-4953
2016-04-10 23:23:59 -07:00
Matt Benson bd010494c9 Support profile negation in YAML sub-documents
See gh-4953
2016-04-10 23:22:31 -07:00