Commit Graph

7540 Commits

Author SHA1 Message Date
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
Phillip Webb
65a41d2f5b Merge pull request #5339 from anandshah123/feature/gh-5333
* feature/gh-5333:
  Remove SolrAutoConfiguration @PreDestroy
2016-04-10 22:23:51 -07:00
Anand Shah
4d667970c4 Remove SolrAutoConfiguration @PreDestroy
Remove @PreDestroy from SolrAutoConfiguration since the container will
call the close method anyway.

Fixes gh-5333
Closes gh-5339
2016-04-10 22:23:41 -07:00
Phillip Webb
f500d67eaa Merge pull request #5648 from izeye/polish-20160411
* polish-20160411:
  Polish
2016-04-10 22:19:11 -07:00
Johnny Lim
a0c8d1f5b5 Polish 2016-04-10 22:18:28 -07:00
Phillip Webb
cc140b2c34 Reinstate escape hatch for findResource()
Reinstate the defensive call of super.findResource() in
LaunchedURLClassLoader.

Closes gh-5650
See gh-486
2016-04-10 21:29:20 -07:00
Phillip Webb
6d23ce2ada Polish 2016-04-10 21:27:32 -07:00
Phillip Webb
7709352c2d Tweak timings for Windows build 2016-04-10 14:35:39 -07:00
Phillip Webb
07fc6fd5f8 Fix Windows test issues 2016-04-10 13:33:53 -07:00
Phillip Webb
1815bb5b66 Fix Windows test failures 2016-04-10 13:08:34 -07:00
Phillip Webb
61b7e6f3b3 Merge branch '1.3.x' 2016-04-10 12:13:28 -07:00
Phillip Webb
af2483816b Fix JarFileTests to work on Windows
See gh-5287
2016-04-10 12:12:19 -07:00
Phillip Webb
58417ebca5 Delete accidentally committed file
Remove accidentally committed SizeThreshold class.
2016-04-10 11:19:52 -07:00
Phillip Webb
ef01720ff2 Merge pull request #5640 from Shredder121/windows-build-fixes
* windows-build-fixes:
  Fix some Windows build issues
2016-04-10 10:36:34 -07:00
Ruben Dijkstra
94d5c714a9 Fix some Windows build issues
Closes gh-5640
2016-04-10 10:36:04 -07:00
Phillip Webb
fc149dcc05 Merge pull request #5641 from venilnoronha/issue-5637-fix
* issue-5637-fix:
  Polish contribution
  Support max-http-header-size & max-http-post-size
2016-04-10 10:27:07 -07:00
Phillip Webb
ea44ae6a35 Polish contribution 2016-04-10 10:27:06 -07:00
Venil Noronha
6d2f88ed9b Support max-http-header-size & max-http-post-size
Add `server.max-http-header-size` and `server.max-http-post-size`
properties and deprecate `server.tomcat.max-http-header-size`.

Fixes gh-5637
Closes gh-5641
2016-04-10 10:27:06 -07:00
Stephane Nicoll
3d9ac6ea57 Polish 2016-04-10 18:06:15 +02:00
Phillip Webb
2861c7651d Polish 2016-04-10 07:55:59 -07:00
Phillip Webb
e992d389e7 Merge pull request #5644 from venilnoronha/issue-5631-fix
* issue-5631-fix:
  Polish contribution
  Support ActiveMQ trusted packages
2016-04-10 07:48:41 -07:00
Phillip Webb
0c0be1e626 Polish contribution 2016-04-10 07:48:31 -07:00
Venil Noronha
d0ccea1b26 Support ActiveMQ trusted packages
Ass support for white-listing specific packages or trusting all packages
when using ActiveMQ.

Fixes gh-5631
Closes gh-5644
2016-04-10 07:34:09 -07:00
Phillip Webb
bdd9d510eb Upgrade TomEE Tests to 1.7.4 2016-04-10 00:15:22 -07:00
Phillip Webb
84e091676b Fixup merge problem 2016-04-10 00:05:28 -07:00
Phillip Webb
ae249f7568 Merge branch '1.3.x' 2016-04-09 23:53:26 -07:00
Phillip Webb
a1284bce61 Configure ChildManagementContext container type
Ensure any ChildManagementContext created to start a management server
on a different port uses the same EmbeddedServletContainerFactory type.

Fixes gh-5474
2016-04-09 23:32:39 -07:00
Phillip Webb
d7e56abdf3 Don't apply null ServerProperties from customize
Update ServerProperties so that `null` values are not applied when
customizing the EmbeddedServletContainerFactory. Primarily changed to
stop `server.undertow.accesslog.enabled` from being blindly applied.

Fixes gh-5515
2016-04-09 23:32:39 -07:00
Phillip Webb
3ca365cff0 Export MessageChannel metric writer
Update the auto-configured MessageChannelMetricWriter with
@ExportMetricWriter so that metrics are actually exported.

Fixes gh-5517
2016-04-09 23:32:38 -07:00
Phillip Webb
02764b8ff3 Support Jetty error page handling of PUT requests
Update JettyEmbeddedServletContainerFactory so that requests other than
just GET, POST and HEAD are handled by the ErrorHandler.

Fixes gh-5367
2016-04-09 23:32:38 -07:00
Phillip Webb
084b288947 Polish 2016-04-09 21:43:15 -07:00
Stephane Nicoll
725ae2c834 Fix typo 2016-04-09 19:59:15 +02:00
Phillip Webb
2364bcc117 Polish 2016-04-08 20:34:28 -07:00
Stephane Nicoll
fbe53be6c1 Polish Hibernate 5 support
Closes gh-2763
2016-04-08 14:13:23 +02:00
Stephane Nicoll
99dae09f84 Improve caching documentation
Add a note regarding the use of `@EnableCaching(proxyTargetClass=true)`
for beans that are not interface based.

Closes gh-5527
2016-04-08 13:01:50 +02:00
Stephane Nicoll
4e4ea4b51f Polish 2016-04-08 09:23:30 +02:00
Phillip Webb
d3f1d126f3 Merge pull request #4647 from craigburke/image-banner
* image-banner:
  Add image banner documentation
  Rework ImageBanner Support
  Add ImageBanner color distance calculation
  Support image based banners
2016-04-07 23:52:19 -07:00
Phillip Webb
d058ddbe3b Add image banner documentation
Closes gh-4647
2016-04-07 23:21:18 -07:00
Phillip Webb
43d1d92611 Rework ImageBanner Support
Refactor several aspects of the ImageBanner:

- Extract a few new classes and methods from the previous code
- Directly encode ANSI rather than using `${}` properties
- Rework the scaling algorithm to prefer a fixed width
- Allow ImageBanner and TextBanner to be used together
- Rename several of the `banner.image` properties
- Add support for a left hand margin
- Add property meta-data

See gh-4647
2016-04-07 23:21:17 -07:00
Ruben Dijkstra
60500aef9b Add ImageBanner color distance calculation
Support CIE94 color distance calculations for improved ImageBanner
rendering. Based on code originally developed by Michael Simons and
added with his permission.

See gh-4647
2016-04-07 22:27:23 -07:00
Craig Burke
58d77ec961 Support image based banners
Add ImageBanner class that generates color ASCII art based on an image
file (banner.gif, banner.jpg or banner.png).

See gh-4647
2016-04-07 22:25:50 -07:00