From daccdbb18d4528fbb24698568a47941f86bad9cd Mon Sep 17 00:00:00 2001
From: Andrey Saksonov <andrey@saksonov.me>
Date: Mon, 12 Mar 2018 11:46:44 +0300
Subject: [PATCH 1/2] Add CLI manifest for Scoop

See gh-12541
---
 spring-boot-project/spring-boot-cli/pom.xml   | 53 ++++++++++++++++++-
 .../src/main/scoop/springboot.json            | 26 +++++++++
 .../src/main/asciidoc/getting-started.adoc    | 18 +++++++
 3 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 spring-boot-project/spring-boot-cli/src/main/scoop/springboot.json

diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
index 013ea825a4e..08686816c80 100644
--- a/spring-boot-project/spring-boot-cli/pom.xml
+++ b/spring-boot-project/spring-boot-cli/pom.xml
@@ -328,16 +328,65 @@
 								<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"
+								<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>
 				</executions>
 			</plugin>
 			<plugin>
diff --git a/spring-boot-project/spring-boot-cli/src/main/scoop/springboot.json b/spring-boot-project/spring-boot-cli/src/main/scoop/springboot.json
new file mode 100644
index 00000000000..b8b3ad73f2d
--- /dev/null
+++ b/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"
+    }
+  }
+}
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index 38cedcebe54..afe86e934a7 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/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

From a3a6a2b291b45cf554152450525d9c17bcbb60cb Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Mon, 14 May 2018 18:20:57 +0200
Subject: [PATCH 2/2] Polish "Add CLI manifest for Scoop"

Closes gh-12541
---
 spring-boot-project/spring-boot-cli/pom.xml   | 22 +++++++++----------
 .../src/main/asciidoc/getting-started.adoc    |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/spring-boot-project/spring-boot-cli/pom.xml b/spring-boot-project/spring-boot-cli/pom.xml
index 08686816c80..902b717cf34 100644
--- a/spring-boot-project/spring-boot-cli/pom.xml
+++ b/spring-boot-project/spring-boot-cli/pom.xml
@@ -333,9 +333,9 @@
 										<expandproperties />
 									</filterchain>
 								</copy>
-								<attachartifact file="${project.build.directory}/homebrew/springboot.rb"
-									classifier="homebrew" type="rb" />
-							</target>
+									<attachartifact file="${project.build.directory}/homebrew/springboot.rb"
+										classifier="homebrew" type="rb" />
+									</target>
 						</configuration>
 					</execution>
 					<execution>
@@ -351,24 +351,24 @@
 								<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" />
+									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" />
+									input="${version-type}" regexp=".*\.(.*)" replace="\1" />
 								<propertyregex property="version-type" override="true"
-											   input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
+									input="${version-type}" regexp="(M)\d+" replace="MILESTONE" />
 								<propertyregex property="version-type" override="true"
-											   input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
+									input="${version-type}" regexp="(RC)\d+" replace="MILESTONE" />
 								<propertyregex property="version-type" override="true"
-											   input="${version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
+									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" />
+									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" />
+									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>
diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
index afe86e934a7..3921769e32a 100644
--- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
@@ -400,8 +400,8 @@ CLI by using the following commands:
 
 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.
+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.