From fb5267b15216943420a2b92a14f891b40b230ab0 Mon Sep 17 00:00:00 2001
From: tomohiro-mitani <tmitani@heroku.com>
Date: Thu, 27 Oct 2016 17:01:58 +0900
Subject: [PATCH 1/7] Add Heroku generated app.json

---
 app.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 app.json

diff --git a/app.json b/app.json
new file mode 100644
index 000000000..f14cfab03
--- /dev/null
+++ b/app.json
@@ -0,0 +1,24 @@
+{
+  "name": "spring-mvc-showcase",
+  "scripts": {
+  },
+  "env": {
+  },
+  "formation": {
+    "web": {
+      "quantity": 1
+    }
+  },
+  "addons": [
+    "librato",
+    "loaderio",
+    "papertrail",
+    "pingdom",
+    "tinfoilsecurity"
+  ],
+  "buildpacks": [
+    {
+      "url": "heroku/java"
+    }
+  ]
+}

From 3b2e92090c99ab53293cf917e95f83bab6a7ee1a Mon Sep 17 00:00:00 2001
From: Tomohiro Mitani <tmitani@tmitani-ltm2.internal.salesforce.com>
Date: Thu, 27 Oct 2016 18:29:15 +0900
Subject: [PATCH 2/7] test first

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index d0f5de48f..0e7a24494 100644
--- a/README.md
+++ b/README.md
@@ -48,3 +48,6 @@ Note:
 This showcase originated from a [blog post](http://blog.springsource.com/2010/07/22/spring-mvc-3-showcase/) and was adapted into a SpringOne presentation called [Mastering MVC 3](http://www.infoq.com/presentations/Mastering-Spring-MVC-3).
 
 A screen cast showing the showcase in action is [available in QuickTime format](http://s3.springsource.org/MVC/mvc-showcase-screencast.mov).
+
+
+TEST
\ No newline at end of file

From 030d8f13ca844e1a3ab2c12fff9a92690f5211e2 Mon Sep 17 00:00:00 2001
From: Tomohiro Mitani <tmitani@tmitani-ltm2.internal.salesforce.com>
Date: Thu, 27 Oct 2016 18:37:26 +0900
Subject: [PATCH 3/7] test

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0e7a24494..c4e1996a9 100644
--- a/README.md
+++ b/README.md
@@ -50,4 +50,4 @@ This showcase originated from a [blog post](http://blog.springsource.com/2010/07
 A screen cast showing the showcase in action is [available in QuickTime format](http://s3.springsource.org/MVC/mvc-showcase-screencast.mov).
 
 
-TEST
\ No newline at end of file
+TEST more and more
\ No newline at end of file

From d5e1e02db0cd2691537a27a25c034e13bb3e242b Mon Sep 17 00:00:00 2001
From: Tomohiro Mitani <tmitani@tmitani-ltm2.internal.salesforce.com>
Date: Tue, 1 Nov 2016 19:34:25 +0900
Subject: [PATCH 4/7] Procfile added

---
 Procfile | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 Procfile

diff --git a/Procfile b/Procfile
new file mode 100644
index 000000000..1b91529dc
--- /dev/null
+++ b/Procfile
@@ -0,0 +1 @@
+web:    java $JAVA_OPTS -jar target/dependency/webapp-runner.jar --port $PORT target/*.war
\ No newline at end of file

From 6519c30199bc169321adb69f068ff6c6cd2af786 Mon Sep 17 00:00:00 2001
From: Tomohiro Mitani <tmitani@tmitani-ltm2.internal.salesforce.com>
Date: Tue, 1 Nov 2016 19:52:03 +0900
Subject: [PATCH 5/7] pom changed

---
 pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pom.xml b/pom.xml
index f3bae982b..b9ebd0e75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -296,6 +296,27 @@
 					</webApp>
 				</configuration>
 			</plugin>
+		    <plugin>
+		        <groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-dependency-plugin</artifactId>
+		        <version>2.3</version>
+		        <executions>
+		            <execution>
+		                <phase>package</phase>
+		                <goals><goal>copy</goal></goals>
+		                <configuration>
+		                    <artifactItems>
+		                        <artifactItem>
+		                            <groupId>com.github.jsimone</groupId>
+		                            <artifactId>webapp-runner</artifactId>
+		                            <version>8.0.30.2</version>
+		                            <destFileName>webapp-runner.jar</destFileName>
+		                        </artifactItem>
+		                    </artifactItems>
+		                </configuration>
+		            </execution>
+		        </executions>
+		    </plugin>
 		</plugins>
 	</build>
 </project>

From 77560deb65536f7ec065159633f980ef7444b798 Mon Sep 17 00:00:00 2001
From: Tomohiro Mitani <tmitani@tmitani-ltm2.internal.salesforce.com>
Date: Tue, 13 Dec 2016 16:07:04 +0900
Subject: [PATCH 6/7] dev 1

---
 .gitignore | 1 +
 README.md  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 150f08fee..1c4ce733e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ target
 src/main/webapp/META-INF
 .idea
 *.iml
+.env
diff --git a/README.md b/README.md
index c4e1996a9..3d4c2738c 100644
--- a/README.md
+++ b/README.md
@@ -49,5 +49,5 @@ This showcase originated from a [blog post](http://blog.springsource.com/2010/07
 
 A screen cast showing the showcase in action is [available in QuickTime format](http://s3.springsource.org/MVC/mvc-showcase-screencast.mov).
 
-
+#test1
 TEST more and more
\ No newline at end of file

From a24627e28c9addfbb88a25689b917b5608fc8050 Mon Sep 17 00:00:00 2001
From: Tomohiro Mitani <tmitani@tmitani-ltm2.internal.salesforce.com>
Date: Tue, 13 Dec 2016 16:22:01 +0900
Subject: [PATCH 7/7] dev2

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 3d4c2738c..8d7c56ce8 100644
--- a/README.md
+++ b/README.md
@@ -50,4 +50,5 @@ This showcase originated from a [blog post](http://blog.springsource.com/2010/07
 A screen cast showing the showcase in action is [available in QuickTime format](http://s3.springsource.org/MVC/mvc-showcase-screencast.mov).
 
 #test1
+#test2
 TEST more and more
\ No newline at end of file