Merge branch 'master' into spring-projectsgh-7659

Conflicts:
	spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/RepackageMojo.java

Author: axtavt

.gitignore

@@ -1,36 +1,38 @@
-.gradle
-*.sw?
-.#*
 *#
+*.iml
+*.ipr
+*.iws
+*.jar
+*.sw?
 *~
-/build
-/code
+.#*
+.*.md.html
+.DS_Store
 .classpath
-.project
-.settings
-.metadata
 .factorypath
+.gradle
+.idea
+.metadata
+.project
 .recommenders
+.settings
+.springBeans
+/build
+/code
+MANIFEST.MF
+_site/
+activemq-data
 bin
 build
-lib/
-target
-.springBeans
-interpolated*.xml
-dependency-reduced-pom.xml
 build.log
-_site/
-.*.md.html
+dependency-reduced-pom.xml
+dump.rdb
+interpolated*.xml
+lib/
 manifest.yml
-MANIFEST.MF
-settings.xml
-activemq-data
 overridedb.*
-*.iml
-*.ipr
-*.iws
-.idea
-*.jar
-.DS_Store
-dump.rdb
+settings.xml
+target
 transaction-logs
+.flattened-pom.xml
+secrets.yml

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip

.travis.yml

@@ -105,7 +105,7 @@ some compilations for Spring Boot as we include a maven plugin and use it within
 samples. The standard build works around this restriction by launching the samples via
 the `maven-invoker-plugin` so that they are not part of the reactor. This works fine
 most of the time, however, sometimes it's useful to run a build that includes all modules
-(for example when using `maven-versions-plugin`. We use the full build on our CI servers
+(for example when using `maven-versions-plugin`). We use the full build on our CI servers
 and during the release process.
 
 Running a full build is a two phase process.
@@ -115,7 +115,7 @@ Running a full build is a two phase process.
 Preparing the build will compile and install the `spring-boot-maven-plugin` so that it
 can be referenced during the full build. It also generates a `settings.xml` file that
 enables a `snapshot`, `milestone` or `release` profiles based on the version being
-build. To prepare the build, from the root directory use:
+built. To prepare the build, from the root directory use:
 
 [indent=0]
 ----

CONTRIBUTING.adoc

@@ -179,15 +179,15 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
       file or class name and description of purpose be included on the
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright {yyyy} {name of copyright owner}
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -199,4 +199,4 @@
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.

LICENSE.txt

@@ -1,4 +1,4 @@
-= Spring Boot image:https://build.spring.io/plugins/servlet/buildStatusImage/BOOT-PUB["Build Status", link="https://build.spring.io/browse/BOOT-PUB"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
+= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot?groups=Build"] image:https://badges.gitter.im/Join Chat.svg["Chat",link="https://gitter.im/spring-projects/spring-boot?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge"]
 :docs: http://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
 
 Spring Boot makes it easy to create Spring-powered, production-grade applications and
@@ -95,8 +95,7 @@ requests. If you want to raise an issue, please follow the recommendations below
 You don't need to build from source to use Spring Boot (binaries in
 http://repo.spring.io[repo.spring.io]), but if you want to try out the latest and
 greatest, Spring Boot can be easily built with the
-https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8 (although
-Boot applications can run on Java 1.6).
+https://github.com/takari/maven-wrapper[maven wrapper]. You also need JDK 1.8.
 
 [indent=0]
 ----
@@ -116,35 +115,42 @@ is automatically set if you use the maven wrapper.
 _Also see link:CONTRIBUTING.adoc[CONTRIBUTING.adoc] if you wish to submit pull requests,
 and in particular please fill out the
 https://support.springsource.com/spring_committer_signup[Contributor's Agreement]
-before your first change, however trivial. (Or if you filed such an agreement already for
-another project just mention that in your pull request.)_
+before your first change, however trivial._
 
 === Building reference documentation
 
+First of all, make sure you have built the project:
+
+[indent=0]
+----
+	$ ./mvnw clean install
+----
+
 The reference documentation requires the documentation of the Maven plugin to be
 available so you need to build that first since it's not generated by default.
 
 [indent=0]
 ----
-	$ ./mvnw clean install -pl spring-boot-tools/spring-boot-maven-plugin -Pdefault,full
+	$ ./mvnw clean install -pl spring-boot-project/spring-boot-tools/spring-boot-maven-plugin -Pdefault,full
 ----
 
-The documentation also includes auto-generated information about the starters. To
-allow this information to be collected, the starter projects must be built first:
+The documentation also includes auto-generated information about the starters. You might
+have that in your local repository already (per the first step) but if you want to refresh
+it:
 
 [indent=0]
 ----
-	$ ./mvnw clean install -f spring-boot-starters
+	$ ./mvnw clean install -f spring-boot-project/spring-boot-starters
 ----
 
 Once this is done, you can build the reference documentation with the command below:
 
 [indent=0]
 ----
-	$ ./mvnw clean prepare-package -pl spring-boot-docs -Pdefault,full
+	$ ./mvnw clean prepare-package -pl spring-boot-project/spring-boot-docs -Pdefault,full
 ----
 
-TIP: The generated documentation is available from `spring-boot-docs/target/contents/reference`
+TIP: The generated documentation is available from `spring-boot-project/spring-boot-docs/target/contents/reference`
 
 
 == Modules
@@ -159,7 +165,7 @@ these include:
 * The `SpringApplication` class, providing static convenience methods that make it easy
 to write a stand-alone Spring Application. Its sole job is to create and refresh an
 appropriate Spring `ApplicationContext`
-* Embedded web applications with a choice of container (Tomcat or Jetty for now)
+* Embedded web applications with a choice of container (Tomcat, Jetty or Undertow)
 * First class externalized configuration support
 * Convenience `ApplicationContext` initializers, including support for sensible logging
 defaults
@@ -171,7 +177,7 @@ Spring Boot can configure large parts of common applications based on the conten
 of their classpath. A single `@EnableAutoConfiguration` annotation triggers
 auto-configuration of the Spring context.
 
-Auto-configuration attempts to deduce which beans a user might need. For example, If
+Auto-configuration attempts to deduce which beans a user might need. For example, if
 `HSQLDB` is on the classpath, and the user has not configured any database connections,
 then they probably want an in-memory database to be defined. Auto-configuration will
 always back away as the user starts to define their own beans.

README.adoc

@@ -0,0 +1,37 @@
+== Concourse pipeline
+
+The pipeline can be deployed using the following command:
+
+[source]
+----
+$ fly -t spring set-pipeline -p spring-boot -c ci/pipeline.yml -l ci/parameters.yml
+----
+
+NOTE: This assumes that you have credhub integration configured with the appropriate
+secrets
+
+=== Release
+
+To release a milestone:
+
+[source]
+----
+$ fly -t spring trigger-job -j spring-boot/stage-milestone
+$ fly -t spring trigger-job -j spring-boot/promote-milestone
+----
+
+To release an RC:
+
+[source]
+----
+$ fly -t spring trigger-job -j spring-boot/stage-rc
+$ fly -t spring trigger-job -j spring-boot/promote-rc
+----
+
+To release a GA:
+
+[source]
+----
+$ fly -t spring trigger-job -j spring-boot/stage-release
+$ fly -t spring trigger-job -j spring-boot/promote-release
+----

ci/README.adoc

@@ -0,0 +1,8 @@
+FROM openjdk:8u141-jdk
+
+RUN apt-get update && \
+    apt-get install -y git && \
+    apt-get install -y libxml2-utils && \
+    apt-get install -y jq
+
+ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.1/concourse-java.sh /opt/

ci/images/spring-boot-ci-image/Dockerfile

@@ -0,0 +1,8 @@
+FROM openjdk:9-b179-jdk
+
+RUN apt-get update && \
+    apt-get install -y git && \
+    apt-get install -y libxml2-utils && \
+    apt-get install -y jq
+
+ADD https://raw.githubusercontent.com/spring-io/concourse-java-scripts/v0.0.1/concourse-java.sh /opt/

ci/images/spring-boot-jdk9-ci-image/Dockerfile

@@ -0,0 +1,11 @@
+email-server: "smtp.svc.pivotal.io"
+email-from: "[email protected]"
+email-to: ["[email protected]"]
+github-repo: "https://github.com/spring-projects/spring-boot.git"
+github-repo-name: "spring-projects/spring-boot"
+docker-hub-organization: "springci"
+artifactory-server: "https://repo.spring.io/"
+branch: "master"
+build-name: "spring-boot"
+bintray-subject: "spring"
+bintray-repo: "jars"