Merge branch '2.1.x'

2019-06-04 14:31:57 -07:00
parent e06325e029 0ef331018e
commit db75347eb6
36 changed files with 45 additions and 39 deletions
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/excluded
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/alpha/nested/fileA
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/fileC
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/bravo/nested/fileB
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/one/fileD
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/three
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/bravo/fileE
@@ -0,0 +1 @@
+
--- a/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
+++ b/spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/fileF
@@ -0,0 +1 @@
+