Exclude Beans from the Health Check

.github/ISSUE_TEMPLATE.md

@@ -1,19 +1,24 @@
 <!--
-Thanks for raising a Spring Boot issue. What sort of issue are you raising?
+Thanks for raising a Spring Boot issue. Please take the time to review the following
+categories as some of them do not apply here.
 
-❓Question
-Please ask questions about how to use something, or to understand why something isn't
+🙅 "Please DO NOT Raise an Issue" Cases
+- Question
+STOP!! Please ask questions about how to use something, or to understand why something isn't
 working as you expect it to, on Stack Overflow using the spring-boot tag.
+- Security Vulnerability
+STOP!! Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.
+- Managed Dependency Upgrade
+You DO NOT need to raise an issue for a managed dependency version upgrade as there's a semi-automatic process for checking managed dependencies for new versions before a release. BUT pull requests for upgrades that are more involved than just a version property change are still most welcome.
+- With an Immediate Pull Request
+An issue will be closed as a duplicate of the immediate pull request, so you don't have to raise an issue if you plan to create a pull request immediately.
 
 🐞 Bug report
 Please provide details of the problem, including the version of Spring Boot that you
 are using. If possible, please provide a test case or sample application that reproduces
 the problem. This makes it much easier for us to diagnose the problem and to verify that
 we have fixed it.
 
-🚨 Security Vulnerability
-STOP!! Please don't raise security vulnerabilities here. Head over to https://pivotal.io/security to learn how to disclose them responsibly.
-
 🎁 Enhancement
 Please start by describing the problem that you are trying to solve. There may already
 be a solution, or there may be a way to solve it that you hadn't considered.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +1,26 @@
 <!--
-Thanks for contributing to Spring Boot. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
--->
+Thanks for contributing to Spring Boot. Please review the following notes before
+submitting you pull request.
+
+Security Vulnerabilities
+
+STOP! If your contribution fixes a security vulnerability, please do not submit it.
+Instead, please head over to https://pivotal.io/security to learn how to disclose a
+vulnerability responsibly.
+
+Dependency Upgrades
+
+Please do not open a pull request for a straightforward dependency upgrade (one that
+only updates the version property). We have a semi-automated process for such upgrades
+that we prefer to use. However, if the upgrade is more involved (such as requiring
+changes for removed or deprecated API) your pull request is most welcome.
+
+Describing Your Changes
+
+If, having reviewed the notes above, you're ready to submit your pull request, please
+provide a brief description of the proposed changes. If they fix a bug, please
+describe the broken behaviour and how the changes fix it. If they make an enhancement,
+please describe the new functionality and why you believe it's useful. If your pull
+request relates to any existing issues, please reference them by using the issue number
+prefixed with #.
+-->

README.adoc

@@ -1,4 +1,4 @@
-= Spring Boot image:https://ci.spring.io/api/v1/teams/spring-boot/pipelines/spring-boot-2.0.x/jobs/build/badge["Build Status", link="https://ci.spring.io/teams/spring-boot/pipelines/spring-boot-2.0.x?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"]
+= 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: https://docs.spring.io/spring-boot/docs/current-SNAPSHOT/reference
 
 Spring Boot makes it easy to create Spring-powered, production-grade applications and
@@ -67,7 +67,8 @@ Having trouble with Spring Boot? We'd like to help!
 * If you are upgrading, read the https://github.com/spring-projects/spring-boot/wiki[release notes]
   for upgrade instructions and "new and noteworthy" features.
 * Ask a question - we monitor https://stackoverflow.com[stackoverflow.com] for questions
-  tagged with https://stackoverflow.com/tags/spring-boot[`spring-boot`].
+  tagged with https://stackoverflow.com/tags/spring-boot[`spring-boot`]. You can also chat
+  with the community on https://gitter.im/spring-projects/spring-boot[Gitter].
 * Report bugs with Spring Boot at https://github.com/spring-projects/spring-boot/issues[github.com/spring-projects/spring-boot/issues].
 
 

ci/README.adoc

@@ -4,7 +4,7 @@ The pipeline can be deployed using the following command:
 
 [source]
 ----
-$ fly -t spring set-pipeline -p spring-boot-2.0.x -c ci/pipeline.yml -l ci/parameters.yml
+$ 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
@@ -16,22 +16,22 @@ To release a milestone:
 
 [source]
 ----
-$ fly -t spring trigger-job -j spring-boot-2.0.x/stage-milestone
-$ fly -t spring trigger-job -j spring-boot-2.0.x/promote-milestone
+$ 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-2.0.x/stage-rc
-$ fly -t spring trigger-job -j spring-boot-2.0.x/promote-rc
+$ 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-2.0.x/stage-release
-$ fly -t spring trigger-job -j spring-boot-2.0.x/promote-release
+$ fly -t spring trigger-job -j spring-boot/stage-release
+$ fly -t spring trigger-job -j spring-boot/promote-release
 ----

ci/images/docker-lib.sh

@@ -66,22 +66,10 @@ start_docker() {
   docker daemon --data-root /scratch/docker ${server_args} >/tmp/docker.log 2>&1 &
   echo $! > /tmp/docker.pid
 
-  trap stop_docker EXIT
-
   sleep 1
 
   until docker info >/dev/null 2>&1; do
     echo waiting for docker to come up...
     sleep 1
   done
-}
-
-stop_docker() {
-  local pid=$(cat /tmp/docker.pid)
-  if [ -z "$pid" ]; then
-    return 0
-  fi
-
-  kill -TERM $pid
-  wait $pid
 }

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

@@ -0,0 +1,33 @@
+FROM openjdk:11-ea-28-jdk
+
+RUN apt-get update && \
+    apt-get install -y git && \
+    apt-get install -y libxml2-utils && \
+    apt-get install -y jq
+
+ADD https://github.com/raw/spring-io/concourse-java-scripts/v0.0.2/concourse-java.sh /opt/
+
+ENV DOCKER_VERSION=17.05.0-ce \
+    ENTRYKIT_VERSION=0.4.0
+
+RUN apt-get update && \
+    apt-get install -y curl && \
+	apt-get install -y libudev1 && \
+	apt-get install -y iptables && \
+    curl https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION}.tgz | tar zx && \
+    mv /docker/* /bin/ && chmod +x /bin/docker*
+
+# Install entrykit
+RUN curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSION}/entrykit_${ENTRYKIT_VERSION}_Linux_x86_64.tgz | tar zx && \
+    chmod +x entrykit && \
+    mv entrykit /bin/entrykit && \
+    entrykit --symlink
+
+ADD https://github.com/raw/spring-projects/spring-boot/master/ci/images/docker-lib.sh /docker-lib.sh
+
+ENTRYPOINT [ \
+	"switch", \
+		"shell=/bin/sh", "--", \
+	"codep", \
+		"/bin/docker daemon" \
+]

ci/parameters.yml

@@ -5,9 +5,9 @@ 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: "2.0.x"
+branch: "master"
 build-name: "spring-boot"
-pipeline-name: "spring-boot-2.0.x"
+pipeline-name: "spring-boot"
 concourse-url: "https://ci.spring.io"
 bintray-subject: "spring"
 bintray-repo: "jars"

ci/pipeline.yml

@@ -66,6 +66,13 @@ resources:
     username: ((docker-hub-username))
     password: ((docker-hub-password))
     tag: ((branch))
+- name: spring-boot-jdk11-ci-image
+  type: docker-image
+  source:
+    repository: ((docker-hub-organization))/spring-boot-jdk11-ci-image
+    username: ((docker-hub-username))
+    password: ((docker-hub-password))
+    tag: ((branch))
 - name: artifactory-repo
   type: artifactory-resource
   source:
@@ -94,6 +101,13 @@ resources:
     access_token: ((github-access-token))
     branch: ((branch))
     context: jdk10-build
+- name: repo-status-jdk11-build
+  type: github-status-resource
+  source:
+    repository: ((github-repo-name))
+    access_token: ((github-access-token))
+    branch: ((branch))
+    context: jdk11-build
 - name: slack-alert
   type: slack-notification
   source:
@@ -112,6 +126,9 @@ jobs:
   - put: spring-boot-jdk10-ci-image
     params:
       build: ci-images-git-repo/ci/images/spring-boot-jdk10-ci-image
+  - put: spring-boot-jdk11-ci-image
+    params:
+      build: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image
 - name: build
   serial: true
   public: true
@@ -306,6 +323,52 @@ jobs:
       silent: true
       icon_emoji: ":concourse:"
       username: concourse-ci
+- name: jdk11-build
+  serial: true
+  public: true
+  plan:
+  - get: spring-boot-jdk11-ci-image
+  - get: git-repo
+    trigger: true
+  - put: repo-status-jdk11-build
+    params: { state: "pending", commit: "git-repo" }
+  - do:
+    - task: build-project
+      privileged: true
+      timeout: 1h30m
+      image: spring-boot-jdk11-ci-image
+      file: git-repo/ci/tasks/build-project.yml
+    - aggregate:
+      - task: build-samples
+        timeout: 1h30m
+        image: spring-boot-jdk11-ci-image
+        file: git-repo/ci/tasks/build-samples.yml
+      - task: build-integration-tests
+        timeout: 1h30m
+        image: spring-boot-jdk11-ci-image
+        file: git-repo/ci/tasks/build-integration-tests.yml
+      - task: build-deployment-tests
+        timeout: 1h30m
+        image: spring-boot-jdk11-ci-image
+        file: git-repo/ci/tasks/build-deployment-tests.yml
+    on_failure:
+      do:
+      - put: repo-status-jdk11-build
+        params: { state: "failure", commit: "git-repo" }
+      - put: slack-alert
+        params:
+          text: ":concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>"
+          silent: true
+          icon_emoji: ":concourse:"
+          username: concourse-ci
+  - put: repo-status-jdk11-build
+    params: { state: "success", commit: "git-repo" }
+  - put: slack-alert
+    params:
+      text: ":concourse-succeeded: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} was successful!>"
+      silent: true
+      icon_emoji: ":concourse:"
+      username: concourse-ci
 - name: stage-milestone
   serial: true
   plan:
@@ -471,7 +534,7 @@ jobs:
       BINTRAY_REPO: ((bintray-repo))
 groups:
 - name: "Build"
-  jobs: ["build", "jdk9-build", "jdk10-build"]
+  jobs: ["build", "jdk9-build", "jdk10-build", "jdk11-build"]
 - name: "Release"
   jobs: ["stage-milestone", "stage-rc", "stage-release", "promote-milestone", "promote-rc", "promote-release", "sync-to-maven-central"]
 - name: "CI Images"

pom.xml

@@ -10,7 +10,7 @@
 	<name>Spring Boot Build</name>
 	<description>Spring Boot Build</description>
 	<properties>
-		<revision>2.0.6.BUILD-SNAPSHOT</revision>
+		<revision>2.1.0.BUILD-SNAPSHOT</revision>
 		<main.basedir>${basedir}</main.basedir>
 	</properties>
 	<!-- Most elements are in profiles so they are stripped out during maven-flatten -->
@@ -36,7 +36,7 @@
 							<dependency>
 								<groupId>com.puppycrawl.tools</groupId>
 								<artifactId>checkstyle</artifactId>
-								<version>8.11</version>
+								<version>8.12</version>
 							</dependency>
 							<dependency>
 								<groupId>io.spring.javaformat</groupId>

spring-boot-project/spring-boot-actuator-autoconfigure/pom.xml

@@ -102,6 +102,16 @@
 			<artifactId>micrometer-registry-datadog</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-dynatrace</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-registry-elastic</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>io.micrometer</groupId>
 			<artifactId>micrometer-registry-ganglia</artifactId>
@@ -148,7 +158,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>io.projectreactor.ipc</groupId>
+			<groupId>io.projectreactor.netty</groupId>
 			<artifactId>reactor-netty</artifactId>
 			<optional>true</optional>
 		</dependency>
@@ -193,6 +203,16 @@
 			<artifactId>commons-dbcp2</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.kafka</groupId>
+			<artifactId>kafka-clients</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-core</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-core</artifactId>
@@ -233,6 +253,11 @@
 			<artifactId>jersey-container-servlet-core</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-core</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
@@ -273,6 +298,11 @@
 			<artifactId>spring-jdbc</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-jms</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-messaging</artifactId>
@@ -415,6 +445,16 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-slf4j-impl</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.logging.log4j</groupId>
+			<artifactId>log4j-api</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
@@ -440,6 +480,11 @@
 			<artifactId>jsonassert</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.data</groupId>
 			<artifactId>spring-data-elasticsearch</artifactId>