From 85f16ec88fa3d50414e59d23a94b504fb5c051a7 Mon Sep 17 00:00:00 2001
From: killersh <91311414+nirshif@users.noreply.github.com>
Date: Wed, 20 Jul 2022 09:01:10 +0300
Subject: [PATCH 1/4] Update pom.xml
---
spring-boot-package-war/pom.xml | 108 +++++++++++++++-----------------
1 file changed, 49 insertions(+), 59 deletions(-)
diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml
index c54d0da80..34f57fd29 100644
--- a/spring-boot-package-war/pom.xml
+++ b/spring-boot-package-war/pom.xml
@@ -1,67 +1,57 @@
- 4.0.0
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 4.0.0
- com.neo
- spring-boot-package-war
- 0.0.1-SNAPSHOT
- war
+ com.neo
+ spring-boot-package-war
+ 0.0.2-SNAPSHOT
+ war
- spring-boot-package-war
- Demo project for Spring Boot package war
+ spring-boot-package-war
+ Demo project for Spring Boot package war
-
- org.springframework.boot
- spring-boot-starter-parent
- 1.3.6.RELEASE
-
-
+
+ org.springframework.boot
+ spring-boot-starter-parent
+ 1.3.6.RELEASE
-
- UTF-8
- 1.7
-
+
-
-
- org.springframework.boot
- spring-boot-starter
-
-
-
- org.springframework.boot
- spring-boot-starter-test
- test
-
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-tomcat
- provided
-
-
- org.springframework.boot
- spring-boot-devtools
- true
-
-
-
-
-
-
- org.springframework.boot
- spring-boot-maven-plugin
-
- true
-
-
-
-
-
+
+ UTF-8
+ 1.7
+
-
+
+
+ org.springframework.boot
+ spring-boot-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-tomcat
+ provided
+
+
+ org.springframework.boot
+ spring-boot-devtools
+ true
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.1
+
+
From a20493e83b6c0ceca6a5858e6cbc4b45c8d4f4cb Mon Sep 17 00:00:00 2001
From: killersh <91311414+nirshif@users.noreply.github.com>
Date: Wed, 20 Jul 2022 10:32:56 +0300
Subject: [PATCH 2/4] Update pom.xml
---
spring-boot-package-war/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml
index 34f57fd29..e61699655 100644
--- a/spring-boot-package-war/pom.xml
+++ b/spring-boot-package-war/pom.xml
@@ -55,3 +55,4 @@
2.3.1
+ >
From 5209fa1abbccccd3779413d977ef09c831bfc50a Mon Sep 17 00:00:00 2001
From: killersh <91311414+nirshif@users.noreply.github.com>
Date: Wed, 20 Jul 2022 10:34:17 +0300
Subject: [PATCH 3/4] 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 e61699655..d1e782cb7 100644
--- a/spring-boot-package-war/pom.xml
+++ b/spring-boot-package-war/pom.xml
@@ -55,4 +55,4 @@
2.3.1
- >
+
From 6cb9bfad1e624154adaa9fc83cfe628514a1b9ff Mon Sep 17 00:00:00 2001
From: killersh <91311414+nirshif@users.noreply.github.com>
Date: Wed, 20 Jul 2022 10:46:21 +0300
Subject: [PATCH 4/4] Update HelloWorldController.java
** deleted
---
.../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
+}