Commit Graph

21208 Commits

Author SHA1 Message Date
Phillip Webb
b567959482 Add support for dynamic SSL key stores
Add a SslStoreProvider interface that can be used to load key and trust
stores from non file locations.

Fixes gh-5208
2016-04-26 15:03:00 -07:00
Phillip Webb
2679a6f0c6 Polish 2016-04-26 15:02:39 -07:00
Stephane Nicoll
ad5674cbb0 Merge branch '1.3.x' 2016-04-26 09:27:46 +02:00
Stephane Nicoll
ac8e87d79f Polish contribution
Closes gh-5782
2016-04-26 09:24:37 +02:00
Venil Noronha
d5554e0aa1 Use static-locations properties to locate favicon
Closes gh-5751
2016-04-26 09:09:19 +02:00
Stephane Nicoll
1ef3327441 Move multipart.* properties to spring.http.multipart.*
Closes gh-3044
2016-04-26 08:59:41 +02:00
Stephane Nicoll
5f41e82a89 Merge branch '1.3.x' 2016-04-26 08:29:38 +02:00
Stephane Nicoll
247685e992 Add missing @Documented
Closes gh-5786
2016-04-26 08:29:20 +02:00
Stephane Nicoll
4cc559ae85 Merge pull request #5798 from izeye/polish-20160426
* pr/5798:
  Polish
2016-04-26 08:17:29 +02:00
Johnny Lim
db2092e27d Polish
Closes gh-5798
2016-04-26 08:17:13 +02:00
Stephane Nicoll
34e3e3c820 Merge pull request #5797 from artembilan/SI-4.3.0.M2
* pr/5797:
  Upgrade to Spring Integration 4.3.0.M2
2016-04-26 08:14:24 +02:00
Artem Bilan
6be4ec2af5 Upgrade to Spring Integration 4.3.0.M2
Closes gh-5797
2016-04-26 08:14:08 +02:00
Stephane Nicoll
23f669f8f5 Polish
See gh-5791
2016-04-26 08:11:33 +02:00
Phillip Webb
f83cacdcd3 Merge pull request #5747 from mbenson/notprofilesyamlbugfix
* pr/5747:
  Fix SpringProfileDocumentMatcher negation bug
2016-04-25 14:39:53 -07:00
Matt Benson
15d6662c0d Fix SpringProfileDocumentMatcher negation bug
Prior to this commit SpringProfileDocumentMatcher was returning 'found'
anytime a negated profile was not found, even if there were positive
profile matches required and unsatisfied.

Closes gh-5747
See gh-4953
2016-04-25 14:38:20 -07:00
Phillip Webb
56146f0ea0 Merge pull request #5779 from fabriziocucci/patch-1
* pr/5779:
  Fix typo in Servlet auto-configuration Javadoc
2016-04-25 14:23:37 -07:00
Fabrizio Cucci
7859438538 Fix typo in Servlet auto-configuration Javadoc
Removed misplaced "for" in javadoc for Tomcat nested configuration.

Closes gh-5779
2016-04-25 14:22:13 -07:00
Phillip Webb
dee8a20e6f Merge pull request #5780 from dustinschultz/master
* pr/5780:
  Update docs with Servlet property load ordering
2016-04-25 14:21:26 -07:00
Dustin Schultz
a3469c5e26 Update docs with Servlet property load ordering
Fixes gh-5752
Closes gh-5752
2016-04-25 14:20:20 -07:00
Phillip Webb
cf28f55e98 Merge pull request #5784 from venilnoronha/issue-5726-fix
* pr/5784:
  Extract ApplicationContextHeaderFilter
2016-04-25 14:18:36 -07:00
Venil Noronha
0d47abbac4 Extract ApplicationContextHeaderFilter
Extract ApplicationContextHeaderFilter to a top-level class from
EndpointWebMvcAutoConfiguration and make the header field public.

Fixes gh-5726
Closes gh-5784
2016-04-25 14:16:08 -07:00
Phillip Webb
78639fffd0 Merge pull request #5788 from eddumelendez/gh-5402
* pr/5788:
  Support different schema/data DB script users
2016-04-25 12:44:28 -07:00
Eddú Meléndez
99b830ebe7 Support different schema/data DB script users
Allow data and/or schema scripts to be run by different database users.

Fixes gh-5402
Closes gh-5788
2016-04-25 12:37:36 -07:00
Phillip Webb
229d1fa315 Merge pull request #5791 from garyrussell/GH-685
* pr/5791:
  Add RabbitMQ Connection Timeout Property
2016-04-25 12:14:04 -07:00
Gary Russell
12b9f0262b Add RabbitMQ Connection Timeout Property
Fixes gh-685
Closes gh-5791
2016-04-25 12:13:11 -07:00
Phillip Webb
719a57dcfa Merge pull request #5796 from chris-bailey/nonexistent-link
* pr/5796:
  Fix STS link in CONTRIBUTING.adoc
2016-04-25 12:04:08 -07:00
Chris Bailey
21914ec154 Fix STS link in CONTRIBUTING.adoc
Closes gh-5796
2016-04-25 12:03:13 -07:00
Phillip Webb
745a581552 Remove trailing whitespace 2016-04-25 11:56:48 -07:00
Dave Syer
568d716c99 Move OAuth2ClientContextFilter back before the main security filter
It sometimes has to catch an exception from the security filter so
it needs to be before, and somehow this hasn't been a problem up to
now, but probably only by some fluke.

Fixes gh-5792
2016-04-25 16:44:43 +01:00
Stephane Nicoll
8778b53b32 Merge pull request #5790 from jangalinski/patch-1
* pr/5790:
  Add camunda bpm starter
2016-04-25 17:08:30 +02:00
Jan Galinski
b99ef3a435 Add camunda bpm starter
Closes gh-5790
2016-04-25 17:08:08 +02:00
Phillip Webb
93382648ab Formatting 2016-04-24 22:54:27 -07:00
Phillip Webb
79922360e1 Polish 2016-04-24 22:49:41 -07:00
Stephane Nicoll
d10d819ca5 Add reference to Mule ESB starter
Closes gh-2488
2016-04-24 06:46:57 +02:00
Stephane Nicoll
11f763ef89 Polish doc
Closes gh-789
2016-04-24 05:46:26 +02:00
Stephane Nicoll
eda7819d8b Fix typo 2016-04-24 05:42:11 +02:00
Stephane Nicoll
892c1a52f7 Merge pull request #5773 from fabriziocucci/patch-1
* pr/5773:
  Polish
  Removed redundant override of the configure method
2016-04-23 16:15:25 +02:00
Stephane Nicoll
f71a207a81 Polish 2016-04-23 16:15:17 +02:00
Fabrizio Cucci
3c901fef42 Removed redundant override of the configure method
Since the `SampleJerseyApplication` class is already passed in the
`SpringApplicationBuilder` constructor, there is no need to override the
configure method of the `SpringBootServletInitializer` class.

Closes gh-5773
2016-04-23 16:13:34 +02:00
Dave Syer
014883253a Merge remote-tracking branch 'origin/1.3.x' 2016-04-22 09:40:12 +01:00
Dave Syer
b9db4742ac Add metric flusher to export remaining metrics on shutdown
Before this change the app context closes and metrics that have not
yet been exported ccan be orphaned. The design of this feature is simple:
use Closeable where possible, so that it will be called automatically
by Spring on shutdown.

Fixes gh-5771
2016-04-22 09:33:18 +01:00
Dave Syer
de2c22efee Merge remote-tracking branch 'origin/1.3.x' 2016-04-21 14:09:59 +01:00
Dave Syer
de0f0ecce4 Align counter behaviour between metric exporters
The MetricCopyExporter has had the capability for a while to keep
track of counters internally. This change aligns that with the
PrefixMetricGroupExporter.

Fixes gh-5762
2016-04-21 14:02:29 +01:00
Andy Wilkinson
71e665ba87 Update the spring-boot-samples README
Closes gh-5748
2016-04-21 13:56:39 +01:00
Andy Wilkinson
266793458d Update issue template to describe what to do for different issue types
Closes gh-5519
2016-04-21 12:36:39 +01:00
Stephane Nicoll
8d1c93112b Merge pull request #5745 from mbenson/notprofilesyamldocfix
* pr/5745:
  Polish
2016-04-21 12:54:15 +02:00
Matt Benson
b9aee3678d Polish
See gh-4953
Closes gh-5745
2016-04-21 12:53:43 +02:00
Andy Wilkinson
3bfc6b1a4b Avoid packaging two versions of same dependency in Gradle repackaging
Previously, the Gradle plugin would include all of the dependencies
from both the compile and runtime configurations in the repackaged
jar. In the unlikely event that the compile and runtime configurations
contained different versions of the same dependency, this would lead
to both versions of the dependency being packaged in the jar file.

The runtime configuration extends the compile configuration so, in
normal circumstances, it will contain a superset of the compile
configuration's dependencies. In the situation described above where
the two configurations contain different versions of the same
dependency the runtime configuration will only contain whichever
version of the two dependencies has "won". By default, this will
be the dependency with the higher version.

This commit updates the Gradle plugin to only include the runtime
configuration's resolved dependencies during repackaging. As explained
above, the runtime configuration extends the compile configuration so
any compile dependencies will still be included, with the added
benefit that duplicate versions of the same dependency will have been
resolved to a single, preferred version.

Closes gh-5749
2016-04-21 11:37:40 +01:00
Andy Wilkinson
a6bcc6f573 Update Liquibase and Flyway docs and test other changelog formats
Closes gh-5741
2016-04-21 10:22:59 +01:00
Andy Wilkinson
b159bb8af8 Merge branch '1.3.x' 2016-04-21 09:57:35 +01:00