ef7b511b0e
Polish
2016-04-28 09:29:49 -07:00
34b6915607
Consider meta-annotations when creating an AnnotationsPropertySource
...
Previously, meta-annotations were not considered when looking for
annotations that may have property mappings but were considered when
looking for a `@PropertyMapping` annotation. This led to three
problems:
1. Properties that should have been included in the property source
were not included
2. Properties that were included may have had the wrong name
3. Properties were included when they should not have been
`@DataJpaTests` provided a concrete example of all three problems:
1. The `replace` and `connection` attributes from
`@AutoConfigureTestDatabase` were not included in the property
source
2. The `showSql` attribute from `@DataJpaTest` was mapped as
`spring.test.database.spring.jpa.show-sql`
3. The `useDefaultFilters` attribute from `@DataJpaTest` was included
in the property source.
This commit updates AnnotationsPropertySource to consider
meta-annotations when looking for attributes that should be mapped.
This addresses the first problem. Furthermore,
AnnotationsPropertySource has been updated to no longer consider
meta-annotations when looking for a type-level property mapping.
This addresses the second and third problems.
Closes gh-5794
2016-04-28 14:12:03 +01:00
ebb0ff8638
Merge remote-tracking branch 'origin/1.3.x'
2016-04-28 10:31:14 +01:00
9c0679b1f4
Add support for spring.rabbitmq.ssl.algorithm
...
Rabbit client 3.6.* uses TLSv1.1 as the default algorithm which
many brokers are deisabling these days. Spring AMQP supports
changing the algorithm by name, so this is just a pass thru for
that.
2016-04-28 10:27:51 +01:00
c85948ac0c
Fix cache sample README
...
Closes gh-5800
2016-04-28 09:30:31 +02:00
4c877a67a2
Fix cache sample README
...
Closes gh-5807
2016-04-28 09:16:17 +02:00
b8df4d454b
Merge pull request #5806 from eddumelendez/gh-5800
...
* pr/5806:
Fix spring-boot-sample-cache Infinispan example
2016-04-27 13:34:06 -07:00
81bf3867e3
Fix spring-boot-sample-cache Infinispan example
...
Closes gh-5800
Closes gh-5806
2016-04-27 13:32:47 -07:00
628cbcda5b
Merge pull request #5807 from eddumelendez/polish-cache-sample
...
* pr/5807:
Polish spring-boot-sample-cache README
2016-04-27 13:29:53 -07:00
7b9844f5de
Polish spring-boot-sample-cache README
...
Closes gh-5807
2016-04-27 13:29:19 -07:00
a2357e9050
Merge pull request #5809 from Shredder121/ansi-colors-test-move
...
* pr/5809:
Move AnsiColorsTests to `src/test/java`
2016-04-27 13:28:41 -07:00
36c0ceb92a
Move AnsiColorsTests to `src/test/java`
...
Closes gh-5809
2016-04-27 13:27:53 -07:00
5df935a251
Merge pull request #5812 from fabriziocucci/patch-2
...
* pr/5812:
Fix spring-boot-sample-data-neo4j description
2016-04-27 13:27:26 -07:00
c51efda2dc
Fix spring-boot-sample-data-neo4j description
...
Replace "Redis" with "Neo4j".
Closes gh-5812
2016-04-27 13:26:38 -07:00
aee3833351
Merge branch '1.3.x'
2016-04-27 09:28:14 +01:00
71fddc51df
Upgrade to Spring Batch 3.0.7.RELEASE
...
Closes gh-5166
2016-04-27 09:27:16 +01:00
2cd68284fd
Add reference to ff4j starter
2016-04-27 05:05:52 +02:00
93c495f69a
Remove pid file
...
This shouldn't have been committed.
2016-04-27 05:00:49 +02:00
53d9aa60e1
Merge pull request #4836 from joshiste/issue-4255
...
* pr/4836:
Add external-file-property to LogFileMvcEndpoint
2016-04-26 18:29:56 -07:00
49ef93602e
Add external-file-property to LogFileMvcEndpoint
...
Add an additional property to LogFileMvcEndpoint to allow log files to
be read from an external location. This is helpful when a launch.script
is used to start the boot-application and the logfile is written by a
redirect of stdout/stderr.
Fixes gh-4255
Closes gh-4836
2016-04-26 18:23:31 -07:00
79c163c64e
Merge pull request #5453 from cjstehno/master
...
* pr/5453:
Fix remote shell to support custom banners
2016-04-26 17:05:29 -07:00
309f8484a7
Fix remote shell to support custom banners
...
Update the remote shell to use the `Banner` interface when possible.
Fixes gh-3988
Closes gh-5453
2016-04-26 17:05:19 -07:00
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
2679a6f0c6
Polish
2016-04-26 15:02:39 -07:00
ad5674cbb0
Merge branch '1.3.x'
2016-04-26 09:27:46 +02:00
ac8e87d79f
Polish contribution
...
Closes gh-5782
2016-04-26 09:24:37 +02:00
d5554e0aa1
Use static-locations properties to locate favicon
...
Closes gh-5751
2016-04-26 09:09:19 +02:00
1ef3327441
Move multipart.* properties to spring.http.multipart.*
...
Closes gh-3044
2016-04-26 08:59:41 +02:00
5f41e82a89
Merge branch '1.3.x'
2016-04-26 08:29:38 +02:00
247685e992
Add missing `@Documented`
...
Closes gh-5786
2016-04-26 08:29:20 +02:00
4cc559ae85
Merge pull request #5798 from izeye/polish-20160426
...
* pr/5798:
Polish
2016-04-26 08:17:29 +02:00
db2092e27d
Polish
...
Closes gh-5798
2016-04-26 08:17:13 +02:00
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
6be4ec2af5
Upgrade to Spring Integration 4.3.0.M2
...
Closes gh-5797
2016-04-26 08:14:08 +02:00
23f669f8f5
Polish
...
See gh-5791
2016-04-26 08:11:33 +02:00
f83cacdcd3
Merge pull request #5747 from mbenson/notprofilesyamlbugfix
...
* pr/5747:
Fix SpringProfileDocumentMatcher negation bug
2016-04-25 14:39:53 -07:00
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
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
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
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
a3469c5e26
Update docs with Servlet property load ordering
...
Fixes gh-5752
Closes gh-5752
2016-04-25 14:20:20 -07:00
cf28f55e98
Merge pull request #5784 from venilnoronha/issue-5726-fix
...
* pr/5784:
Extract ApplicationContextHeaderFilter
2016-04-25 14:18:36 -07:00
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
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
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
229d1fa315
Merge pull request #5791 from garyrussell/GH-685
...
* pr/5791:
Add RabbitMQ Connection Timeout Property
2016-04-25 12:14:04 -07:00
12b9f0262b
Add RabbitMQ Connection Timeout Property
...
Fixes gh-685
Closes gh-5791
2016-04-25 12:13:11 -07:00
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
21914ec154
Fix STS link in CONTRIBUTING.adoc
...
Closes gh-5796
2016-04-25 12:03:13 -07:00
745a581552
Remove trailing whitespace
2016-04-25 11:56:48 -07:00
Phillip Webb
Andy Wilkinson
Dave Syer
Stephane Nicoll
Eddú Meléndez
Ruben Dijkstra
Fabrizio Cucci
Johannes Edmeier
cjstehno
Venil Noronha
Johnny Lim
Artem Bilan
Matt Benson
Dustin Schultz
Gary Russell
Chris Bailey