Merge branch '2.1.x'

2019-03-28 11:48:47 +00:00
parent 3e3353e0e9 b7bca872a6
commit 878a635bfb
125 changed files with 450 additions and 447 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