Merge branch '2.0.x'

spring-boot-project/spring-boot-cli/pom.xml

@@ -328,13 +328,62 @@
 								<echo
 									message="Customizing homebrew for ${project.version} with checksum ${checksum} in ${repo} repo" />
 								<copy file="${basedir}/src/main/homebrew/springboot.rb"
-									tofile="${project.build.directory}/springboot.rb" overwrite="true">
+									tofile="${project.build.directory}/homebrew/springboot.rb" overwrite="true">
 									<filterchain>
 										<expandproperties />
 									</filterchain>
 								</copy>
-								<attachartifact file="${project.build.directory}/springboot.rb"
-									classifier="homebrew" type="rb" />
+									<attachartifact file="${project.build.directory}/homebrew/springboot.rb"
+										classifier="homebrew" type="rb" />
+									</target>
+						</configuration>
+					</execution>
+					<execution>
+						<id>scoop</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<inherited>false</inherited>
+						<configuration>
+							<target>
+								<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
+								<taskdef name="stringutil" classname="ise.antelope.tasks.StringUtilTask" />
+								<var name="scoop-version" value="${project.version}" />
+								<propertyregex property="scoop-version" override="true"
+									input="${scoop-version}" regexp="(.*)\..*" replace="\1" />
+								<var name="version-type" value="${project.version}" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp=".*\.(.*)" replace="\1" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
+								<propertyregex property="version-type" override="true"
+									input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
+								<stringutil string="${version-type}" property="repo">
+									<lowercase />
+								</stringutil>
+								<checksum algorithm="sha-256"
+									file="${project.build.directory}/spring-boot-cli-${project.version}-bin.zip"
+									property="hash" />
+								<echo
+									message="Customizing scoop for ${project.version} with hash ${hash} in ${repo} repo" />
+								<copy file="${basedir}/src/main/scoop/springboot.json"
+									  tofile="${project.build.directory}/scoop/springboot.json" overwrite="true">
+									<filterchain>
+										<expandproperties>
+											<propertyset>
+												<propertyref name="scoop-version" />
+												<propertyref name="hash" />
+												<propertyref name="repo" />
+												<propertyref name="project.version" />
+											</propertyset>
+										</expandproperties>
+									</filterchain>
+								</copy>
+								<attachartifact file="${project.build.directory}/scoop/springboot.json"
+												classifier="scoop" type="json" />
 							</target>
 						</configuration>
 					</execution>

spring-boot-project/spring-boot-cli/src/main/scoop/springboot.json

@@ -0,0 +1,26 @@
+{
+  "homepage": "https://projects.spring.io/spring-boot/",
+  "version": "${scoop-version}",
+  "license": "Apache 2.0",
+  "hash": "${hash}",
+  "url": "https://repo.spring.io/${repo}/org/springframework/boot/spring-boot-cli/${project.version}/spring-boot-cli-${project.version}-bin.zip",
+  "extract_dir": "spring-${project.version}",
+  "bin": "bin\\spring.bat",
+  "suggest": {
+    "JDK": [
+      "java/oraclejdk",
+      "java/openjdk"
+    ]
+  },
+  "checkver": {
+    "github": "https://github.com/spring-projects/spring-boot",
+    "re": "/releases/tag/(?:v)?(2[\\d.]+)\\.RELEASE"
+  },
+  "autoupdate": {
+    "url": "https://repo.spring.io/release/org/springframework/boot/spring-boot-cli/$version.RELEASE/spring-boot-cli-$version.RELEASE-bin.zip",
+    "extract_dir": "spring-$version.RELEASE",
+    "hash": {
+      "url": "$url.sha256"
+    }
+  }
+}

spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc

@@ -387,6 +387,24 @@ completion scripts are automatically registered with your shell.
 
 
 
+[[getting-started-scoop-cli-installation]]
+==== Windows Scoop Installation
+If you are on a Windows and use http://scoop.sh/[Scoop], you can install the Spring Boot
+CLI by using the following commands:
+
+[indent=0]
+----
+	> scoop bucket add extras
+	> scoop install springboot
+----
+
+Scoop installs `spring` to `~/scoop/apps/springboot/current/bin`.
+
+NOTE: If you do not see the app manifest, your installation of scoop might be out-of-date.
+In that case, run `scoop update` and try again.
+
+
+
 [[getting-started-cli-example]]
 ==== Quick-start Spring CLI Example
 You can use the following web application to test your installation. To start, create a