From d05a22972a63293a878695443ccef45b106a0a2b Mon Sep 17 00:00:00 2001
From: Jonathan Johnson <jj@scaldingspoon.com>
Date: Wed, 7 Mar 2018 18:49:30 +0000
Subject: [PATCH] Merged in SHIBUI-360 (pull request #3)

* SHIBUI-362 Update documentation for war

* SHIBUI-360 Update gradle
---
 README.md                                | 3 ++-
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 699398da9..d7e3ea57f 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ There are currently 2 ways to run the application:
 
 ### Running as an executable
 
-`java -jar shibui.jar`
+`java -jar shibui.war`
 
 For complete information on overriding default configuration, see [https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html].
 
@@ -95,5 +95,6 @@ shibui.logout-url=/dashboard
 
 spring.profiles.active=default
 
+# Password for the default user. If not set, a password will be generated at startup
 #shibui.default-password=
 ```
diff --git a/build.gradle b/build.gradle
index 0aff375c2..a6916b87d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,3 @@
 task wrapper(type: Wrapper) {
-    gradleVersion = 4.1
+    gradleVersion = 4.6
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c188b6cc2..d75d348bf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip