Merge branch '2.2.x' into 2.3.x

Author: philwebb

spring-boot-project/spring-boot-cli/build.gradle

@@ -167,11 +167,11 @@ def scoopManifestArtifact = artifacts.add("archives", file("${buildDir}/scoop/sp
 task homebrewFormula(type: org.springframework.boot.build.cli.HomebrewFormula) {
 	dependsOn tar
 	outputDir = file("${buildDir}/homebrew")
-	template = file("src/main/homebrew/springboot.rb")
+	template = file("src/main/homebrew/spring-boot.rb")
 	archive = tar.archiveFile
 }
 
-def homebrewFormulaArtifact = artifacts.add("archives", file("${buildDir}/homebrew/springboot.rb")) {
+def homebrewFormulaArtifact = artifacts.add("archives", file("${buildDir}/homebrew/spring-boot.rb")) {
 	type "rb"
 	classifier "homebrew"
 	builtBy "homebrewFormula"

spring-boot-project/spring-boot-cli/src/main/homebrew/springboot.rb renamed to spring-boot-project/spring-boot-cli/src/main/homebrew/spring-boot.rb

@@ -1,6 +1,6 @@
 require 'formula'
 
-class Springboot < Formula
+class SpringBoot < Formula
   homepage 'https://spring.io/projects/spring-boot'
   url 'https://repo.spring.io/${repo}/org/springframework/boot/spring-boot-cli/${project.version}/spring-boot-cli-${project.version}-bin.tar.gz'
   version '${project.version}'