From 8fa15d176c5697f1da2b26874e2c6af80240032b Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 11:46:46 +0200 Subject: [PATCH 1/7] Update HelloTests.java --- .../src/test/java/com/neo/controller/HelloTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java b/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java index 02133d7ef..f908ed13f 100644 --- a/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java +++ b/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java @@ -33,7 +33,7 @@ public void setUp() throws Exception { public void getHello() throws Exception { mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpect(content().string(equalTo("Hello World"))); + .andExpect(content().string(equalTo("Hello World xx"))); } -} \ No newline at end of file +} From a66e3071ea25934a843dd30def13f0ef202ef175 Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 14:28:23 +0200 Subject: [PATCH 2/7] Update HelloWorldController.java drop xx --- .../main/java/com/neo/controller/HelloWorldController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java b/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java index c231fae49..a8a6efb45 100644 --- a/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java +++ b/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java @@ -8,6 +8,6 @@ public class HelloWorldController { @RequestMapping("/hello") public String index() { - return "Hello World xx"; + return "Hello World"; } -} \ No newline at end of file +} From 48825abbe6f1ca5998c1312d11268e20e5a90f96 Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 14:30:15 +0200 Subject: [PATCH 3/7] Update HelloTests.java --- .../src/test/java/com/neo/controller/HelloTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java b/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java index f908ed13f..cf7ea6435 100644 --- a/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java +++ b/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java @@ -33,7 +33,7 @@ public void setUp() throws Exception { public void getHello() throws Exception { mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) .andExpect(status().isOk()) - .andExpect(content().string(equalTo("Hello World xx"))); + .andExpect(content().string(equalTo("Hello World"))); } } From edabb16e230e399d00db35565394c7236f421486 Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 15:59:33 +0200 Subject: [PATCH 4/7] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index d005c0ff9..3286f8185 100644 --- a/README.md +++ b/README.md @@ -56,3 +56,5 @@ Spring boot使用的各种示例，以最简单、最实用为标准 ![](http://www.ityouknow.com/assets/images/keeppuresmile.jpg) +trigger build + From 1f3093250e4dbb942bb67afbc2ae5ad1e0f547e0 Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 16:09:19 +0200 Subject: [PATCH 5/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3286f8185..d06c53fb8 100644 --- a/README.md +++ b/README.md @@ -56,5 +56,5 @@ Spring boot使用的各种示例，以最简单、最实用为标准 ![](http://www.ityouknow.com/assets/images/keeppuresmile.jpg) -trigger build +trigger test From 1caf1321ffb6d61b4a4dca0310a8ed6003d1615e Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 16:15:58 +0200 Subject: [PATCH 6/7] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index d06c53fb8..d005c0ff9 100644 --- a/README.md +++ b/README.md @@ -56,5 +56,3 @@ Spring boot使用的各种示例，以最简单、最实用为标准 ![](http://www.ityouknow.com/assets/images/keeppuresmile.jpg) -trigger test - From f596d887ad9a450a0734cd5c772d9c746503ae32 Mon Sep 17 00:00:00 2001 From: assafmercier <58207479+assafmercier@users.noreply.github.com> Date: Thu, 18 Feb 2021 16:52:53 +0200 Subject: [PATCH 7/7] Update pom.xml --- spring-boot-package-war/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml index c54d0da80..af0591aa6 100644 --- a/spring-boot-package-war/pom.xml +++ b/spring-boot-package-war/pom.xml @@ -5,7 +5,7 @@ com.neo spring-boot-package-war - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT war spring-boot-package-war