Merge branch '1.5.x' into 2.0.x

2019-03-27 19:50:56 +00:00
parent 507b00d623 e036bc4e6d
commit ba4671f0ab
92 changed files with 247 additions and 247 deletions
--- a/spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy
+++ b/spring-boot-project/spring-boot-cli/src/it/resources/jar-command/bad.groovy
@@ -1,4 +1,4 @@
-@GrabResolver(name='clojars.org', root='http://clojars.org/repo')
+@GrabResolver(name='clojars.org', root='https://clojars.org/repo')
@Grab('redis.embedded:embedded-redis:0.2')

@Component