fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll 2017-07-26 13:39:25 +02:00
commit 75fc0c38c8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-docs/src/main/asciidoc/deployment.adoc
View File

@ -333,7 +333,7 @@ the actual application, running on port 5000. To configure it, add the following
===== Best practices ===== Best practices
====== Uploading binaries instead of sources ====== Uploading binaries instead of sources
By default Elastic Beanstalk uploads sources and compile them in AWS. To upload the By default Elastic Beanstalk uploads sources and compiles them in AWS. To upload the
binaries instead, add the following to your `.elasticbeanstalk/config.yml` file: binaries instead, add the following to your `.elasticbeanstalk/config.yml` file:
@ -361,7 +361,7 @@ command:
==== Summary ==== Summary
This is one of the easiest way to get to AWS, but there are more things This is one of the easiest ways to get to AWS, but there are more things
to cover, e.g.: how to integrate Elastic Beanstalk into any CI / CD tool, using the to cover, e.g.: how to integrate Elastic Beanstalk into any CI / CD tool, using the
Elastic Beanstalk maven plugin instead of the CLI, etc. There is a Elastic Beanstalk maven plugin instead of the CLI, etc. There is a
https://exampledriven.wordpress.com/2017/01/09/spring-boot-aws-elastic-beanstalk-example/[blog] https://exampledriven.wordpress.com/2017/01/09/spring-boot-aws-elastic-beanstalk-example/[blog]

2
spring-boot-docs/src/main/java/org/springframework/boot/jdbc/ConfigurableDataSourceExample.java
View File

@ -34,7 +34,7 @@ import org.springframework.context.annotation.Primary;
public class ConfigurableDataSourceExample { public class ConfigurableDataSourceExample {
/** /**
* A configuration that define dedicated settings and reuse * A configuration that defines dedicated settings and reuses
* {@link DataSourceProperties}. * {@link DataSourceProperties}.
*/ */
@Configuration @Configuration

2
spring-boot-samples/spring-boot-sample-cache/README.adoc
View File

@ -84,7 +84,7 @@ TIP: Run sample cache application using Hazelcast with
=== Infinispan === Infinispan
Add the `org.infinispan:infinispan-spring4-embedded` dependency to enable support for Add the `org.infinispan:infinispan-spring4-embedded` dependency to enable support for
Infinispan. There is no default location that Infinispan uses to look for a config Infinispan. There is no default location that Infinispan uses to look for a config
file so this sample is configured to use a the provider `infinispan.xml` configuration file so this sample is configured to use the provider `infinispan.xml` configuration
file specified via the `spring.cache.infinispan.config` property. file specified via the `spring.cache.infinispan.config` property.
TIP: Run sample cache application using Infinispan with TIP: Run sample cache application using Infinispan with

2
spring-boot/src/main/java/org/springframework/boot/context/annotation/DeterminableImports.java
View File

@ -29,7 +29,7 @@ import org.springframework.core.type.AnnotationMetadata;
* {@link ImportBeanDefinitionRegistrar} implementations when they can determine imports * {@link ImportBeanDefinitionRegistrar} implementations when they can determine imports
* early. The {@link ImportSelector} and {@link ImportBeanDefinitionRegistrar} interfaces * early. The {@link ImportSelector} and {@link ImportBeanDefinitionRegistrar} interfaces
* are quite flexible which can make it hard to tell exactly what bean definitions they * are quite flexible which can make it hard to tell exactly what bean definitions they
* will add. This interface should be used when an implementation consistently result in * will add. This interface should be used when an implementation consistently results in
* the same imports, given the same source. * the same imports, given the same source.
* <p> * <p>
* Using {@link DeterminableImports} is particularly useful when working with Spring's * Using {@link DeterminableImports} is particularly useful when working with Spring's