Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-15 01:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,820 Commits 20 Branches 316 Tags 253 MiB
1.5.x
Commit Graph

2007 Commits

Author SHA1 Message Date
Andy Wilkinson
2ba2bddc76 Add note to docs about configuration of Log4j 2's JDK logging adapter 
Closes gh-11660
 2018-01-29 16:04:16 +00:00
Stephane Nicoll
cbefc7bf83 Polish doc 
Closes gh-11635
 2018-01-15 12:11:33 +01:00
Stephane Nicoll
7b3bedc468 Fix detection of dot-based resource bundle basenames 
This commit makes sure that properties-based resource bundle location
with a dot is detected. It also harmonizes the description of the
configuration key as our support is not stricly matching the convention.

Closes gh-10092
 2018-01-09 13:18:48 +01:00
Stephane Nicoll
b9f4fd0b65 Fix exclude filter to not exclude MediaType 
This commit removes MediaType from the list of exclude types as it looks
like an error: MediaType has a constructor taking a `String` and binding
works fine with it.

This has the effect of properly generating the metadata for the only key
that Spring Boot exposes with a MediaType type:
spring.data.rest.default-media-type.

Closes gh-11568
 2018-01-08 17:44:32 +01:00
Stephane Nicoll
e187aac93d Mention that a custom starter must bring the core starter 
Closes gh-11455
 2018-01-02 15:56:46 +01:00
Raja Kolli
e6eca2b2c9 Update copyright header 
Closes gh-11456
 2018-01-01 08:29:14 +01:00
Stephane Nicoll
9c4e6f247c Fix table formatting issue 
Closes gh-11434
 2017-12-27 16:34:24 +01:00
Madhura Bhave
98f577e62c Remove duplicate ID values from howto doc 2017-12-14 13:42:46 -08:00
Stephane Nicoll
61ca4ab562 Polish 2017-12-14 09:33:34 +01:00
Stephane Nicoll
dbae4fc1c3 Make it easier to use jOOQ with several data sources 
Closes gh-11324
 2017-12-14 09:33:10 +01:00
Stephane Nicoll
b7baf6d381 Fix broken link 
Closes gh-11244
 2017-12-02 08:57:28 +01:00
Spring Buildmaster
df2ae7aa19 Next Development Version 2017-11-28 09:55:46 +00:00
Johnny Lim
8b917abeab Fix broken Asciidoctor syntax 
Closes gh-11108
 2017-11-23 10:44:37 +01:00
Stephane Nicoll
9e051e72e2 Add reference to @EntityScan for MongoDB 
Closes gh-10947
 2017-11-12 12:36:10 +01:00
Stephane Nicoll
fc3d25d705 Properly document spring.data.neo4j.open-in-view's default value 
Closes gh-10826
 2017-10-30 16:22:10 +01:00
Roland Weisleder
feb842c487 Remove static Boot version from documentation 
Closes gh-10774
 2017-10-28 07:53:06 +02:00
Stephane Nicoll
33ff2407e4 Add a note about env variables and Microsoft Windows 
Closes gh-10727
 2017-10-25 13:22:52 +02:00
Stephane Nicoll
e7097844dc Polish 2017-10-20 17:31:28 +02:00
Andy Wilkinson
9e6e200d8d Describe how to handle application events from descendant contexts 
Closes gh-8899
 2017-10-20 10:29:06 +01:00
Stephane Nicoll
c88559e073 Add a section on user configuration and slicing 
Closes gh-7999
 2017-10-20 11:03:35 +02:00
Stephane Nicoll
42fe8c1f38 Document effect of user configuration on slicing 
Closes gh-10709
 2017-10-20 08:41:47 +02:00
Stephane Nicoll
53335c069c Fix typo 
Closes gh-10687
 2017-10-18 21:11:00 +02:00
Spring Buildmaster
c0f9f64776 Next Development Version 2017-10-16 12:36:43 +00:00
Janne Valkealahti
ac2bbea091 Fix typo in documentation 
- As error handling sample is using `CustomErrorType`, fix
  description which mentions `CustomerErrorType`.
 2017-10-13 16:28:39 +01:00
Stephane Nicoll
7e08e47b75 Clarify datasource initializer scope 
This commit clarifies the scope of the datasource initializr. In
particular, it is not possible to create the schema with that facility
and let Hibernate creates additional tables.

Closes gh-9048
 2017-10-03 15:23:58 +02:00
Johnny Lim
bfa291f671 Polish 2017-10-02 15:07:03 +01:00
Andy Wilkinson
b602b1da2e Document expected format for commit time in git.properties 
Closes gh-10392
 2017-09-25 16:53:07 +01:00
Stephane Nicoll
d490b99473 Clarify scope of spring.datasource.platform 
Closes gh-10416
 2017-09-25 10:04:37 +02:00
dreis2211
681921fd87 Typo in external config documentation 
Closes gh-10411
 2017-09-24 17:10:35 +02:00
Stephane Nicoll
d93e0fee35 Polish "Fix a dead link" 
Closes gh-10314
 2017-09-19 14:00:03 +02:00
Kyle Anderson
e86d0f38e4 Document default value change for proxy-target-class 
This commit documents the change to the default value for
spring.aop.proxy-target-class by clarifying when the default is true vs
false.

See gh-10134
 2017-09-16 06:45:56 +02:00
Stephane Nicoll
fbb6b88155 Document default prefix/suffix values 
Closes gh-10290
 2017-09-15 12:47:46 +02:00
Spring Buildmaster
30eb937a83 Next Development Version 2017-09-12 10:54:22 +00:00
Alexander Constantin
281a93a0c4 Use underline instead of dash in tomcat properties 
Closes gh-10256
 2017-09-11 18:20:55 +02:00
Andy Wilkinson
5b1a4a0430 Note that management.context-path is relative to server.context-path 
Closes gh-10200
 2017-09-11 12:10:42 +01:00
Madhura Bhave
64ffcfc83f Document JWK property 
Closes gh-10022
 2017-08-29 12:51:14 -07:00
Stephane Nicoll
36722510c5 Clarify that only production resources are filtered by Maven 
See gh-10088
 2017-08-29 10:14:13 +02:00
Johnny Lim
2c897385d9 Document default values for compression properties 
Closes gh-10050
 2017-08-21 18:12:27 +02:00
Stephane Nicoll
cabd798353 Polish NestedConfigurationProperty documentation 
Closes gh-9895
 2017-08-14 16:13:54 +02:00
pulsation
c9faefc562 Clarify docs on effect RANDOM_PORT or DEFINED_PORT has on transactions 
Previously, when read too quickly, the current note may lead a user to
think that RANDOM_PORT or DEFINED_PORT directly affect transaction
management. This is not the case.

This commit attempts to clarify that the difference in transaction
behaviour is due to transactions being bound to a particular thread
and separate threads being used for the client and server when
tests are making HTTP requests.

Closes gh-9965
 2017-08-09 11:57:34 +01:00
Johnny Lim
56f47e1a50 Polish 
Closes gh-9938
 2017-08-03 21:17:10 +01:00
Spring Buildmaster
17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00
Johnny Lim
fe1eb8b5f3 Polish 
See gh-9855
 2017-07-26 13:39:00 +02:00
Spring Buildmaster
41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
Stephane Nicoll
9fd94720f1 Better customization of the auto-configured ActiveMQConnectionFactory 
This commit exposes additional properties and a callback interface to
further tune the auto-configured ActiveMQConnectionFactory.

Closes gh-9667
 2017-07-24 15:27:17 +02:00
Stephane Nicoll
9a34d952e9 Provide an alternative to spring.activemq.pool.configuration 
This commit expands the support of PooledConnectionFactory so that
binding the third party object is no longer necessary. All 3rd party
properties are now deprecated in favour of our explicit support.

The main reason behind this change is that a `connection-factory` and
`properties` property were exposed. The former is used to set the
`ConnectionFactory` and makes no sense as a key. The latter is
rebuilding the underlying `ActiveMQConnectionFactory` at each call
without reusing any existing settings.

Closes gh-9837
 2017-07-24 13:48:53 +02:00
Phillip Webb
68910f2b8f Polish 2017-07-19 10:21:06 -07:00
Stephane Nicoll
9c28637185 Move code snippet to regular source file 
Closes gh-9740
 2017-07-19 18:29:39 +02:00
Andy Wilkinson
144d987cb8 Polish 2017-07-19 14:41:32 +01:00
Andy Wilkinson
29f1bd9953 Make it clearer that default config locations are always used 
Closes gh-4062
 2017-07-19 14:39:27 +01:00
Stephane Nicoll
e2880ee2c3 Polish "Improve ExitCodeGenerator doc" 
Closes gh-9740
 2017-07-13 09:21:36 +02:00
Tom Hombergs
cf2ebbcb25 Improve ExitCodeGenerator doc 
See gh-9740
 2017-07-13 09:12:48 +02:00
Phillip Webb
aa57ca7e18 Polish 2017-07-06 16:53:04 -07:00
Madhura Bhave
a064a52f0b Document health aggregation strategy and default status mappings 
Closes gh-9580
 2017-06-29 11:31:40 -07:00
Madhura Bhave
528e334e1c Document @EnableWebSecurity behavior when management security disabled 
Closes gh-9270
 2017-06-29 10:45:17 -07:00
Stephane Nicoll
90112559bf Expand doc on @MockBean usage 
Closes gh-9609
 2017-06-27 16:59:16 +02:00
Stephane Nicoll
d8d156bd1b Improve documentation on EnvironmentPostProcessor 
Closes gh-9617
 2017-06-27 16:49:14 +02:00
Dave Syer
21f616f853 Add short docs on using Google App Engine 
Now that Google actually supports arbitrary docker container
execution in app engine, we can provide some more guidance
on how to use it in the "deployment" section.

Closes gh-9585
 2017-06-27 08:53:22 +02:00
Stephane Nicoll
b037d7a4cb Polish 2017-06-22 09:29:47 +02:00
Johnny Lim
8ca70a7efd Polish 
See gh-9570
 2017-06-22 09:28:49 +02:00
Stephane Nicoll
61eda3e6b0 Polish 
See gh-9438
 2017-06-09 08:53:49 +03:00
Spring Buildmaster
05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Spring Buildmaster
88e43c8421 Next Development Version 2017-06-08 09:52:43 +00:00
Stephane Nicoll
bddf9232a8 Polish 2017-06-07 18:48:24 +03:00
Stephane Nicoll
c2aca4d7f5 Document SpringPhysicalNamingStrategy 
Closes gh-9084
 2017-06-07 18:43:20 +03:00
Andy Wilkinson
223b694d3a Sort the table of starter modules alphabetically 
Closes gh-9422
 2017-06-07 13:45:02 +01:00
Stephane Nicoll
cbdab9edb3 Add support for custom ProtocolResolver with Devtools 
Prior to this commit, custom `ProtocolResolvers` set on the
`ApplicationContext` were lost when Devtools is used as the customized
`ResourceLoader` did not copy any customization made to the default
resource loader.

This commit makes sure to copy any `ProtocolResolver` set on the context.

Closes gh-9331
 2017-06-06 16:04:12 +02:00
Andy Wilkinson
5be5b13775 Clarify need for Apache HTTP Client to disable redirects in TestRestTemplate 
Closes gh-9410
 2017-06-06 11:14:15 +01:00
Andy Wilkinson
a666919acf Increase prominence of warning about fully-executable jar compatibility 
Closes gh-8927
 2017-06-06 10:42:30 +01:00
Stephane Nicoll
e94f21356d Fix typo 2017-06-02 14:56:10 +02:00
Stephane Nicoll
c736a1698b Clarify default value of ConditionalOnMissingBean on bean methods 
Closes gh-9387
 2017-06-02 14:55:58 +02:00
Stephane Nicoll
544d516563 Merge branch '1.4.x' into 1.5.x 2017-05-29 10:26:52 +02:00
Stephane Nicoll
250d5f9a52 Deprecate Atomikos console logs properties 
Those properties are no longer honoured with Atomikos 3.8 and we're
using 3.9 by default.

Closes gh-9292
 2017-05-29 10:18:35 +02:00
Stephane Nicoll
b5709fd618 Polish 
See gh-9330
 2017-05-28 17:44:58 +02:00
Stephane Nicoll
b61b1f0e08 Make sure Atomikos default are applied consistently 
This commit makes sure to apply Atomikos defaults also adds a test that
validates Atomikos defaults are consistent.

As a side effect of that, `threadedTwoPhaseCommit` is now `false` (which
is effectively what users got with no customization anyway since that
default was changed in Atomikos 3.7

Closes gh-9141
 2017-05-22 15:43:12 +02:00
Madhura Bhave
57dfbd50a7 Fix documentation for health endpoint security 
Fixes gh-9273
 2017-05-19 16:22:25 -07:00
Stephane Nicoll
f8de022f0a Fix typo 
Closes gh-9257
 2017-05-18 13:27:43 +02:00
Stephane Nicoll
f707582570 Add missing custom status in example 
Closes gh-9256
 2017-05-18 13:26:39 +02:00
Stephane Nicoll
cdf5f6e0ee Add support for deprecation level in manual metadata 
This commit allows to specify a deprecation level to a manual metadata
entry. The purpose of that new attribute is to distinguish cases where
the property is still bound (default) from cases where the property no
longer exists and won't be bound.

This gives the opportunity to IDEs to still show the property as an
error and offer documentation and an action to rename it if a
replacement exists.

Closes gh-9074
 2017-05-15 12:39:15 +03:00
Stephane Nicoll
e236b71615 Move RabbitMQ Simple listener support to dedicated namespace 
Move `spring.rabbitmq.listener.*` to `spring.rabbitmq.listener.simple.*`
in preparation for Spring AMQP 2.0 that supports different container
types.

Closes gh-9108
See gh-9055
 2017-05-05 10:03:47 +02:00
Stephane Nicoll
81e3b392c3 Merge branch '1.4.x' into 1.5.x 2017-05-04 10:42:03 +02:00
Stephane Nicoll
e8f99dc01c Fix typo 
Closes gh-9082
 2017-05-04 10:41:21 +02:00
Stephane Nicoll
54a8dc5b33 Merge branch '1.4.x' into 1.5.x 2017-05-03 09:11:37 +02:00
Stephane Nicoll
e2b209e409 Polish "Clarify and re-organize docs on caching" 
Closes gh-9065
 2017-05-03 09:10:47 +02:00
Dave Syer
11feb75752 Clarify and re-organize docs on caching 
See gh-9065
 2017-05-03 09:01:45 +02:00
Stephane Nicoll
652a5e7baa Merge branch '1.4.x' into 1.5.x 2017-05-02 12:13:44 +02:00
Stephane Nicoll
f060922350 Fix cache example in the doc 
Closes gh-8983
 2017-05-02 11:58:50 +02:00
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Dave Syer
14638e67bc Extended PropertiesLauncher class location logic 
Update `PropertiesLauncher` so that classes can be loaded outside of
`BOOT-INF/classes`. You can use a subdirectory, or the root directory
of an external jar (but not the parent archive to avoid issues
with agents and awkward delegation models).

Fixes gh-8480
Closes gh-8486
 2017-04-19 22:18:12 -07:00
Madhura Bhave
2a7fd5011d Clarify docs on actuator security 
Closes gh-8646
 2017-04-19 15:32:02 -07:00
Stephane Nicoll
8c21e16cf1 Add reference to Infinispan starter 
Closes gh-8592
 2017-04-14 13:57:47 +02:00
Stephane Nicoll
b3c8511fb6 Merge branch '1.4.x' into 1.5.x 2017-04-13 10:24:07 +02:00
Stephane Nicoll
4fd9a8c468 Add missing spring.datasource.xa properties in the appendix 
Closes gh-8895
 2017-04-13 10:23:44 +02:00
Stephane Nicoll
584b61ecc1 Remove deprecated property 2017-04-12 16:16:19 +02:00
Stephane Nicoll
f4ab574ea1 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:46:43 +02:00
Stephane Nicoll
072160863a Add a note about transactional tests and webEnvironment 
Closes gh-8232
 2017-04-12 11:46:06 +02:00
Stephane Nicoll
68c90b24c2 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:15:51 +02:00
Stephane Nicoll
40f4c89602 Document list merge restrictions with YAML 
Closes gh-6911
 2017-04-12 11:15:24 +02:00
Phillip Webb
d301d0f4c3 Merge branch '1.4.x' into 1.5.x 2017-04-11 20:42:48 -07:00
Phillip Webb
758ddcd420 Polish 2017-04-11 20:17:23 -07:00
Stephane Nicoll
2ef318c00d Polish "Add the ability to disable the trace filter" 
Closes gh-8650
 2017-04-11 14:46:57 +02:00
Stephane Nicoll
3f883f1898 Merge branch '1.4.x' into 1.5.x 2017-04-11 09:38:11 +02:00
Stephane Nicoll
404bb2d171 Polish 
See gh-8879
 2017-04-11 09:37:22 +02:00
Stephane Nicoll
a132bd141f Merge branch '1.4.x' into 1.5.x 2017-04-10 16:13:53 +02:00
Stephane Nicoll
0a55e3e736 Polish "Clarify edge case docs on ConditionalOnClass" 
Closes gh-8185
 2017-04-10 16:12:11 +02:00
Phillip Verheyden
08f8219248 Clarify edge case docs on ConditionalOnClass 
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.

See gh-8185
 2017-04-10 15:58:17 +02:00
Stephane Nicoll
2d930fd653 Merge branch '1.4.x' into 1.5.x 2017-04-10 15:54:34 +02:00
Stephane Nicoll
a8860ba7e9 Clarify use of @TestConfiguration 
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.

Closes gh-8421
 2017-04-10 15:54:08 +02:00
Stephane Nicoll
d8d36255af Merge branch '1.4.x' into 1.5.x 2017-04-10 14:02:51 +02:00
Stephane Nicoll
fd53945fe0 Polish "Document HTTP response format of health endpoint" 
Closes gh-8703
 2017-04-10 14:01:50 +02:00
Luis Fernando Pollo
1fa1ed2b28 Document HTTP response format of health endpoint 
Add HTTP response format details for health endpoint, including default
status codes and sample responses.

See gh-8703
 2017-04-10 13:51:07 +02:00
Stephane Nicoll
fffb53ccf5 Fix neo4j embedded documentation 
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.

Closes gh-8567
 2017-04-07 10:04:41 +02:00
Phillip Webb
ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Phillip Webb
ddcb5ee328 Polish 2017-04-04 09:36:27 -07:00
Andy Wilkinson
df6167dd71 Merge branch '1.4.x' into 1.5.x 2017-04-04 17:02:58 +01:00
Andy Wilkinson
9374020b0e Stop -> from being replaced with → as the latter renders as # in PDF 
Closes gh-8575
 2017-04-04 17:00:16 +01:00
Stephane Nicoll
d8e90af3bf Merge branch '1.4.x' into 1.5.x 2017-03-28 10:27:14 +02:00
Dániel Zelei
cc30adf0df Fix propdeps-plugin url in doc 
Closes gh-8678
 2017-03-28 10:15:43 +02:00
Stephane Nicoll
49b8d8c482 Polish 
See gh-8698
 2017-03-28 10:05:33 +02:00
Madhura Bhave
aa25bfb0e0 Clarify the effect that management.context-path has on endpoint paths 
Fixes gh-8586
 2017-03-23 16:12:48 -07:00
Madhura Bhave
cb38546d8a Document default trace includes 
Closes gh-8654
 2017-03-23 15:36:27 -07:00
Sola
ddd8d03a2a Fix typo in doc 
Closes gh-8658
 2017-03-18 07:39:16 +01:00
Stephane Nicoll
84dea5264f Merge branch '1.4.x' into 1.5.x 2017-03-17 09:57:52 +01:00
Stephane Nicoll
0ca07fbdc3 Polish contribution 
Closes gh-8594
 2017-03-17 09:56:45 +01:00
lexandro
36b28540ee Fix invalid security example in doc 
Closes gh-8580
 2017-03-17 09:51:08 +01:00
Stephane Nicoll
cc79f6d83d Merge branch '1.4.x' into 1.5.x 2017-03-15 14:52:19 +01:00
Stephane Nicoll
f72e0c08df Add a note to ActiveMQ pooling in the doc 
Closes gh-8598
 2017-03-15 14:51:55 +01:00
Stephane Nicoll
cd8684499d Polish 
See gh-8621
 2017-03-15 08:57:24 +01:00
Stephane Nicoll
6be2cc30d3 Merge branch '1.4.x' into 1.5.x 2017-03-15 08:54:21 +01:00
Stephane Nicoll
bc157d5b4f Polish 
See gh-8621
 2017-03-15 08:50:50 +01:00
Stephane Nicoll
6a137260c1 Merge branch '1.4.x' into 1.5.x 2017-03-12 08:44:18 +01:00
Stephane Nicoll
4158a6d50f Fix typo 
Closes gh-8574
 2017-03-12 08:43:51 +01:00
Stephane Nicoll
f8bf05b91f Polish contribution 
Closes gh-8474
 2017-03-10 10:20:48 +01:00
srichard
0ddaca57fb Add Tomcat Access Log's fileDateFormat property 
Closes gh-8396
 2017-03-10 09:57:00 +01:00
Stephane Nicoll
feb1ab375f Merge branch '1.4.x' into 1.5.x 2017-03-10 09:36:55 +01:00
Eddú Meléndez
251090b1e5 Add missing spring-data-cassandra metadata 
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.

Closes gh-8562
 2017-03-10 09:34:19 +01:00
Stephane Nicoll
544c73841d Merge branch '1.4.x' into 1.5.x 2017-03-10 09:22:32 +01:00
Stephane Nicoll
633e75dce2 Fix typo 
Closes gh-8563
 2017-03-10 09:22:00 +01:00
Stephane Nicoll
207ab3ecb4 Merge branch '1.4.x' into 1.5.x 2017-03-09 18:21:40 +01:00
Stephane Nicoll
07c56c60ba Make sure Hazelcast bootstraps before any JCache setup 
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.

Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).

Closes gh-8484
 2017-03-09 17:59:20 +01:00
Spring Buildmaster
d23fa24340 Next Development Version 2017-03-03 16:18:26 +00:00
Spring Buildmaster
2a83e80a9b Next Development Version 2017-03-03 14:39:21 +00:00
Stephane Nicoll
bb8800a625 Deprecate spring.cache.hazelcast.config 
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5

See gh-8470
 2017-03-03 10:30:06 +01:00
Andy Wilkinson
6673d8eebc Polish "Allow loader.path to refer to nested jars" 
Closes gh-8334
Closes gh-8465
 2017-03-02 17:29:45 +00:00
Andy Wilkinson
b36c8a7c24 Polish "Tighten up PropertiesLauncher's contract" 
See gh-8346
Closes gh-7221
 2017-03-02 11:19:48 +00:00
Dave Syer
e4c807b884 Tighten up PropertiesLauncher's contract 
The main changes are:

- Switch to `loader.properties` instead of `application.properties`
- Search for `loader.properties` in `loader.home` as well as in
  the classpath
- Placeholder replacements in MANIFEST.MF (using `loader.properties`
  or system/env vars)

See gh-7221
Closes gh-8346
 2017-03-02 11:19:48 +00:00
Stephane Nicoll
b5b69cca03 Merge branch '1.4.x' into 1.5.x 2017-03-02 09:55:29 +01:00
Stephane Nicoll
09205a8fc8 Fix indentation 
Closes gh-8143
 2017-03-02 09:54:34 +01:00
Michael J. Simons
f50a0f9707 Clarify usage of @ImportResource in doc 
See gh-8143
 2017-03-02 09:54:26 +01:00