Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse Source
This commit is contained in:
Phillip Webb
2019-06-04 02:07:14 -07:00
parent d057f49618 b442d3b906
commit ccfbd03482
107 changed files with 130 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-cli/src/test/resources/.m2/settings.xml
View File

@@ -30,4 +30,4 @@
</proxy>
</proxies>
</settings>
</settings>

2
spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings-security.xml
View File

@@ -1,3 +1,3 @@
<settingsSecurity>
<master>{oAyWuFO63U8HHgiplpqtgXih0/pwcRA0d+uA+Z7TBEk=}</master>
</settingsSecurity>
</settingsSecurity>

2
spring-boot-project/spring-boot-cli/src/test/resources/maven-settings/encrypted/.m2/settings.xml
View File

@@ -28,4 +28,4 @@
</proxy>
</proxies>
</settings>
</settings>

1
spring-boot-project/spring-boot-cli/src/test/resources/resource-matcher/two/.file
View File

@@ -0,0 +1 @@

2
spring-boot-project/spring-boot-cli/src/test/resources/schema-all.sql
View File

@@ -1,4 +1,4 @@
CREATE TABLE FOO (
id INTEGER IDENTITY PRIMARY KEY,
name VARCHAR(30),
);
);

2
spring-boot-project/spring-boot-cli/src/test/resources/templates/home.html
View File

@@ -22,4 +22,4 @@
2012 2:17:16 PM CDT</div>
</div>
</body>
</html>
</html>