From f2bd2e5604f9cb40071675a6da414bf3a8cb7cd7 Mon Sep 17 00:00:00 2001 From: Danny Date: Fri, 20 Aug 2021 12:54:42 +0300 Subject: [PATCH 01/46] aa --- pom.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..c54d0da80 --- /dev/null +++ b/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + com.neo + spring-boot-package-war + 0.0.1-SNAPSHOT + war + + spring-boot-package-war + Demo project for Spring Boot package war + + + 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 + + + + + + + From bcfb2dd72b5c0a3819183df8d46bf62067186c2a Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:09:57 +0300 Subject: [PATCH 02/46] Update pom.xml --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index c54d0da80..8de2a2867 100644 --- a/pom.xml +++ b/pom.xml @@ -60,6 +60,9 @@ true + + spring-boot-maven-plugin + From 77db1825d5985dc02fc31d416c94c05c9a46bbea Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:14:27 +0300 Subject: [PATCH 03/46] Update pom.xml --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 8de2a2867..701db5371 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,14 @@ + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.springframework.boot @@ -60,9 +68,6 @@ true - - spring-boot-maven-plugin - From 81d709ba5a7ee17d6fa9471c60c9c9150da07e20 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:17:03 +0300 Subject: [PATCH 04/46] Update pom.xml --- pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 701db5371..31d0069d2 100644 --- a/pom.xml +++ b/pom.xml @@ -52,21 +52,10 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - + org.springframework.boot spring-boot-maven-plugin - - true - From c4b04739510c522a0abf7a0e35f300ce3ea05c1f Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:19:12 +0300 Subject: [PATCH 05/46] Update pom.xml --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 31d0069d2..1d6d0052d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,6 +56,9 @@ org.springframework.boot spring-boot-maven-plugin + + true + From ac7c04013c73d76d04655cf2638ba254fe4d30ef Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:20:17 +0300 Subject: [PATCH 06/46] 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..315ecca5f 100644 --- a/spring-boot-package-war/pom.xml +++ b/spring-boot-package-war/pom.xml @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-maven-plugin - true + true From b65dd00870ae3ff9e98a07193739eac93c88e644 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:48:07 +0300 Subject: [PATCH 07/46] Create Jenkinsfile pipeline { agent { label 'master' } stages{ stage('checkout code'){ steps { git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' } } stage('Build'){ steps { sh 'mvn clean package' } } stage('Deploy to Integration ') { steps { sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' } } } } --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1 @@ + From dd00b82c453d8f2fc9ee63a5a3f3f5ed696f652f Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:54:49 +0300 Subject: [PATCH 08/46] Update Jenkinsfile --- Jenkinsfile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8b1378917..1a9f46c70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,22 @@ - +pipeline { + agent { + label 'master' + } + stages{ + stage('checkout code'){ + steps { + git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' + } + } + stage('Build'){ + steps { + sh 'mvn clean package' + } + } + stage('Deploy to Integration ') { + steps { + sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' + } + } + } +} From 9c4b157d75c78d998f84154fd96fa790db9d27a1 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 13:58:50 +0300 Subject: [PATCH 09/46] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1a9f46c70..1d6b5c6bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,7 @@ pipeline { } stage('Build'){ steps { + sh 'mvn install' sh 'mvn clean package' } } From 86a5a35983b1a6465ac897b365fe4ba71864eff7 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Fri, 20 Aug 2021 14:18:07 +0300 Subject: [PATCH 10/46] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d6b5c6bd..9e3465aa7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,8 +10,7 @@ pipeline { } stage('Build'){ steps { - sh 'mvn install' - sh 'mvn clean package' + sh 'mvn compile' } } stage('Deploy to Integration ') { From 6bab0d7ef7073c1642ce0cfbb536630593ee32cd Mon Sep 17 00:00:00 2001 From: Danny Date: Fri, 20 Aug 2021 14:31:14 +0300 Subject: [PATCH 11/46] sd --- .../main/resources/java/com/neo/Application.java | 12 ++++++++++++ .../resources/java/com/neo/ServletInitializer.java | 14 ++++++++++++++ .../com/neo/controller/HelloWorldController.java | 13 +++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 spring-boot-package-war/src/main/resources/java/com/neo/Application.java create mode 100644 spring-boot-package-war/src/main/resources/java/com/neo/ServletInitializer.java create mode 100644 spring-boot-package-war/src/main/resources/java/com/neo/controller/HelloWorldController.java diff --git a/spring-boot-package-war/src/main/resources/java/com/neo/Application.java b/spring-boot-package-war/src/main/resources/java/com/neo/Application.java new file mode 100644 index 000000000..6cda50c81 --- /dev/null +++ b/spring-boot-package-war/src/main/resources/java/com/neo/Application.java @@ -0,0 +1,12 @@ +package com.neo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/spring-boot-package-war/src/main/resources/java/com/neo/ServletInitializer.java b/spring-boot-package-war/src/main/resources/java/com/neo/ServletInitializer.java new file mode 100644 index 000000000..e57ead010 --- /dev/null +++ b/spring-boot-package-war/src/main/resources/java/com/neo/ServletInitializer.java @@ -0,0 +1,14 @@ +package com.neo; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.web.SpringBootServletInitializer; + +/** + * Created by summer on 2017/5/8. + */ +public class ServletInitializer extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } +} diff --git a/spring-boot-package-war/src/main/resources/java/com/neo/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/java/com/neo/controller/HelloWorldController.java new file mode 100644 index 000000000..c231fae49 --- /dev/null +++ b/spring-boot-package-war/src/main/resources/java/com/neo/controller/HelloWorldController.java @@ -0,0 +1,13 @@ +package com.neo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloWorldController { + + @RequestMapping("/hello") + public String index() { + return "Hello World xx"; + } +} \ No newline at end of file From af3a9611fbb4268797013f652e9e71eaa0ce8534 Mon Sep 17 00:00:00 2001 From: Danny Date: Fri, 20 Aug 2021 14:33:21 +0300 Subject: [PATCH 12/46] asd --- .../src/main/resources/{java/com/neo => }/Application.java | 0 .../src/main/resources/{java/com/neo => }/ServletInitializer.java | 0 .../{java/com/neo => }/controller/HelloWorldController.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename spring-boot-package-war/src/main/resources/{java/com/neo => }/Application.java (100%) rename spring-boot-package-war/src/main/resources/{java/com/neo => }/ServletInitializer.java (100%) rename spring-boot-package-war/src/main/resources/{java/com/neo => }/controller/HelloWorldController.java (100%) diff --git a/spring-boot-package-war/src/main/resources/java/com/neo/Application.java b/spring-boot-package-war/src/main/resources/Application.java similarity index 100% rename from spring-boot-package-war/src/main/resources/java/com/neo/Application.java rename to spring-boot-package-war/src/main/resources/Application.java diff --git a/spring-boot-package-war/src/main/resources/java/com/neo/ServletInitializer.java b/spring-boot-package-war/src/main/resources/ServletInitializer.java similarity index 100% rename from spring-boot-package-war/src/main/resources/java/com/neo/ServletInitializer.java rename to spring-boot-package-war/src/main/resources/ServletInitializer.java diff --git a/spring-boot-package-war/src/main/resources/java/com/neo/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java similarity index 100% rename from spring-boot-package-war/src/main/resources/java/com/neo/controller/HelloWorldController.java rename to spring-boot-package-war/src/main/resources/controller/HelloWorldController.java From 4e94ec38bbe52bbd74d65b1ae91fad0a18651fe2 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Wed, 25 Aug 2021 11:30:49 +0300 Subject: [PATCH 13/46] Update Jenkinsfile --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 9e3465aa7..ea64046f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,11 @@ pipeline { steps { sh 'mvn compile' } + } + stage('Test'){ + steps { + sh 'mvn test' + } } stage('Deploy to Integration ') { steps { From bf8a2d59b85c68bd2cfa2762b7a064cb6851ee89 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Wed, 25 Aug 2021 11:54:36 +0300 Subject: [PATCH 14/46] Update Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea64046f8..e0ddb4a7d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,14 +10,9 @@ pipeline { } stage('Build'){ steps { - sh 'mvn compile' + sh 'mvn package' } } - stage('Test'){ - steps { - sh 'mvn test' - } - } stage('Deploy to Integration ') { steps { sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' From 8ce55676e56c5f2c7393c510ed8e49b4c168999a Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 25 Aug 2021 11:55:39 +0300 Subject: [PATCH 15/46] 11 --- spring-boot-package-war/Jenkinsfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 spring-boot-package-war/Jenkinsfile diff --git a/spring-boot-package-war/Jenkinsfile b/spring-boot-package-war/Jenkinsfile new file mode 100644 index 000000000..e0ddb4a7d --- /dev/null +++ b/spring-boot-package-war/Jenkinsfile @@ -0,0 +1,22 @@ +pipeline { + agent { + label 'master' + } + stages{ + stage('checkout code'){ + steps { + git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' + } + } + stage('Build'){ + steps { + sh 'mvn package' + } + } + stage('Deploy to Integration ') { + steps { + sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' + } + } + } +} From e3b4a4ed99c9d115cb944d51a2f12d89841efb06 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 25 Aug 2021 11:57:01 +0300 Subject: [PATCH 16/46] 111 --- README.md | 58 --------------------------------------------- README_EN.md | 30 ----------------------- pom.xml | 67 ---------------------------------------------------- 3 files changed, 155 deletions(-) delete mode 100644 README.md delete mode 100644 README_EN.md delete mode 100644 pom.xml diff --git a/README.md b/README.md deleted file mode 100644 index d005c0ff9..000000000 --- a/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# Spring Boot Examples - -Demo website：http://www.ityouknow.com/ - -[参与贡献](https://github.com/ityouknow/spring-boot-examples/issues) |  [English](README_EN.md) - - -Spring boot使用的各种示例，以最简单、最实用为标准 - - -- [spring-boot-helloWorld](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-helloWorld)：spring-boot的helloWorld版本 -- [spring-boot-mybaits-annotation](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation)：注解版本 -- [spring-boot-mybaits-xml](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-xml)：xml配置版本 -- [spring-boot-mybatis-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-mulidatasource)：springboot+mybatis多数据源最简解决方案 -- [spring-boot-mybatis-annotation-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation-mulidatasource)：springboot+mybatis（注解版）多数据源最简解决方案 -- [spring-boot-thymeleaf](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-thymeleaf)：simple spring boot thymeleaf demo -- [spring-boot-jpa-thymeleaf-curd](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-jpa-thymeleaf-curd)：spring boot + jpa + thymeleaf 增删改查示例 -- [spring-boot-rabbitmq](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-rabbitmq)：spring boot和rabbitmq各种消息应用案例 -- [spring-boot-scheduler](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-scheduler)：spring boot和定时任务案例 -- [spring-boot-web](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-web)：web开发综合使用案例 -- [spring-boot-mail](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mail)：spring boot和邮件服务 -- [spring-boot-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mongodb)：spring boot和mongodb的使用 -- [spring-boot-multi-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-multi-mongodb)：spring boot和mongodb多数据源的使用 -- [spring-boot-package-war](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-package-war)：spring-boot打包成war包示例 -- [spring-boot-shiro](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-shiro)：springboot 整合shiro rbac示例 -- [spring-boot-file-upload](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-file-upload)：springboot 集成上传文件示例 -- [spring-boot-fastDFS](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-fastDFS)：springboot 集成FastDFS示例 - -**[Favorites-web](https://github.com/cloudfavorites/favorites-web)：云收藏（springboot实战开源项目）** - - - -参考文章： - -- [springboot(一)：入门篇](http://www.ityouknow.com/springboot/2016/01/06/springboot(%E4%B8%80)-%E5%85%A5%E9%97%A8%E7%AF%87.html) -- [springboot(二)：web综合开发](http://www.ityouknow.com/springboot/2016/02/03/springboot(%E4%BA%8C)-web%E7%BB%BC%E5%90%88%E5%BC%80%E5%8F%91.html) -- [springboot(三)：Spring boot中Redis的使用](http://www.ityouknow.com/springboot/2016/03/06/springboot(%E4%B8%89)-Spring-Boot%E4%B8%ADRedis%E7%9A%84%E4%BD%BF%E7%94%A8.html) -- [springboot(四)：thymeleaf使用详解](http://www.ityouknow.com/springboot/2016/05/01/springboot(%E5%9B%9B)-thymeleaf%E4%BD%BF%E7%94%A8%E8%AF%A6%E8%A7%A3.html) -- [springboot(五)：spring data jpa的使用](http://www.ityouknow.com/springboot/2016/08/20/springboot(%E4%BA%94)-spring-data-jpa%E7%9A%84%E4%BD%BF%E7%94%A8.html) -- [springboot(六)：如何优雅的使用mybatis](http://www.ityouknow.com/springboot/2016/11/06/springboot(%E5%85%AD)-%E5%A6%82%E4%BD%95%E4%BC%98%E9%9B%85%E7%9A%84%E4%BD%BF%E7%94%A8mybatis.html) -- [springboot(七)：springboot+mybatis多数据源最简解决方案](http://www.ityouknow.com/springboot/2016/11/25/springboot(%E4%B8%83)-springboot+mybatis%E5%A4%9A%E6%95%B0%E6%8D%AE%E6%BA%90%E6%9C%80%E7%AE%80%E8%A7%A3%E5%86%B3%E6%96%B9%E6%A1%88.html) -- [springboot(八)：RabbitMQ详解](http://www.ityouknow.com/springboot/2016/11/30/springboot(%E5%85%AB)-RabbitMQ%E8%AF%A6%E8%A7%A3.html) -- [springboot(九)：定时任务](http://www.ityouknow.com/springboot/2016/12/02/springboot(%E4%B9%9D)-%E5%AE%9A%E6%97%B6%E4%BB%BB%E5%8A%A1.html) -- [springboot(十)：邮件服务](http://www.ityouknow.com/springboot/2017/05/06/springboot-mail.html) -- [springboot(十一)：Spring boot中mongodb的使用](http://www.ityouknow.com/springboot/2017/05/08/springboot-mongodb.html) -- [springboot(十二)：springboot如何测试打包部署](http://www.ityouknow.com/springboot/2017/05/09/springboot-deploy.html) -- [springboot(十三)：springboot小技巧](http://www.ityouknow.com/springboot/2017/06/22/springboot-tips.html) -- [springboot(十四)：springboot整合shiro-登录认证和权限管理](http://www.ityouknow.com/springboot/2017/06/26/springboot-shiro.html) - -**[springboot实战：我们的第一款开源项目](http://www.ityouknow.com/springboot/2016/09/26/springboot%E5%AE%9E%E6%88%98-%E6%88%91%E4%BB%AC%E7%9A%84%E7%AC%AC%E4%B8%80%E6%AC%BE%E5%BC%80%E6%BA%90%E8%BD%AF%E4%BB%B6.html)** - -> 如果大家想了解关于springboot的其它方面应用，也可以以[issues](https://github.com/ityouknow/spring-boot-examples/issues)的形式反馈给我，我后续来完善。 - - -关注公众号：纯洁的微笑，回复"springboot"进群交流 - -![](http://www.ityouknow.com/assets/images/keeppuresmile.jpg) - diff --git a/README_EN.md b/README_EN.md deleted file mode 100644 index 50c842a1b..000000000 --- a/README_EN.md +++ /dev/null @@ -1,30 +0,0 @@ -# Spring Boot Examples - -this is ablout learn Spring Boot Examples - -Demo website：http://www.ityouknow.com/ - -[Contribution](https://github.com/ityouknow/spring-boot-examples/issues) |  [中文](README.md) - - -Spring Boot Examples, Use the simplest and most useful scene demo. - -- [spring-boot-helloWorld](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-helloWorld)：Spring Boot helloWorld -- [spring-boot-mybaits-annotation](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation)：Spring Boot use mybatis annotation -- [spring-boot-mybaits-xml](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-xml)：Spring Boot use mybatis xml -- [spring-boot-mybatis-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-mulidatasource)：Spring Boot+mybatis+mulidatasource -- [spring-boot-mybatis-annotation-mulidatasource](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mybatis-annotation-mulidatasource)：Spring Boot+ mybatis annotation + mulidatasource -- [spring-boot-thymeleaf](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-thymeleaf)：simple spring boot thymeleaf demo -- [spring-boot-jpa-thymeleaf-curd](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-jpa-thymeleaf-curd)：spring boot + jpa + thymeleaf curd demo -- [spring-boot-rabbitmq](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-rabbitmq)： using AMQP and RabbitMQ -- [spring-boot-scheduler](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-scheduler)：Timed tasks developed using Spring Boot -- [spring-boot-web](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-web)：Web projects developed using Spring Boot -- [spring-boot-mail](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mail)：Mail system developed using Spring Boot -- [spring-boot-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-mongodb)：Spring Boot + Mongodb -- [spring-boot-multi-mongodb](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-multi-mongodb)：Spring Boot + multiMongodb -- [spring-boot-package-war](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-package-war)：Spring Boot package war -- [spring-boot-shiro](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-shiro)：spring boot shiro rbac demo -- [spring-boot-file-upload](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-file-upload)：Spring Boot file upload example -- [spring-boot-fastDFS](https://github.com/ityouknow/spring-boot-examples/tree/master/spring-boot-fastDFS)：springboot use FastDFS example - -**[Favorites-web](https://github.com/cloudfavorites/favorites-web)：Open source projects developed using Spring Boot** diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 1d6d0052d..000000000 --- a/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.neo - spring-boot-package-war - 0.0.1-SNAPSHOT - war - - spring-boot-package-war - Demo project for Spring Boot package war - - - 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 - - - - - - - From b88b1349d17f85e4dacdd62d520a9d88b8f95b91 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 25 Aug 2021 11:58:42 +0300 Subject: [PATCH 17/46] 11 --- pom.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 pom.xml diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..315ecca5f --- /dev/null +++ b/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + com.neo + spring-boot-package-war + 0.0.1-SNAPSHOT + war + + spring-boot-package-war + Demo project for Spring Boot package war + + + 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 + + + + + + + From ae1868971434e9f43bbeaf2bd2b6c892d1e9a00c Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 29 Aug 2021 11:00:33 +0300 Subject: [PATCH 18/46] 1111 --- pom.xml | 2 +- .../Jenkinsfile | 0 .../pom.xml | 2 +- .../src/main/java/com/neo/Application.java | 0 .../main/java/com/neo/ServletInitializer.java | 0 .../neo/controller/HelloWorldController.java | 0 .../src/main/resources/Application.java | 0 .../main/resources/ServletInitializer.java | 0 .../src/main/resources/application.properties | 0 .../controller/HelloWorldController.java | 0 .../test/java/com/neo/ApplicationTests.java | 0 .../java/com/neo/controller/HelloTests.java | 0 .../controller/HelloWorldControlerTests.java | 0 src/main/java/com/neo/Application.java | 12 ++++++ src/main/java/com/neo/ServletInitializer.java | 14 +++++++ .../neo/controller/HelloWorldController.java | 13 +++++++ src/main/resources/Application.java | 12 ++++++ src/main/resources/ServletInitializer.java | 14 +++++++ src/main/resources/application.properties | 0 .../controller/HelloWorldController.java | 13 +++++++ src/test/java/com/neo/ApplicationTests.java | 16 ++++++++ .../java/com/neo/controller/HelloTests.java | 39 +++++++++++++++++++ .../controller/HelloWorldControlerTests.java | 37 ++++++++++++++++++ 23 files changed, 172 insertions(+), 2 deletions(-) rename {spring-boot-package-war => spring-boot-package-war_}/Jenkinsfile (100%) rename {spring-boot-package-war => spring-boot-package-war_}/pom.xml (97%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/java/com/neo/Application.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/java/com/neo/ServletInitializer.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/java/com/neo/controller/HelloWorldController.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/resources/Application.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/resources/ServletInitializer.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/resources/application.properties (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/main/resources/controller/HelloWorldController.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/test/java/com/neo/ApplicationTests.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/test/java/com/neo/controller/HelloTests.java (100%) rename {spring-boot-package-war => spring-boot-package-war_}/src/test/java/com/neo/controller/HelloWorldControlerTests.java (100%) create mode 100644 src/main/java/com/neo/Application.java create mode 100644 src/main/java/com/neo/ServletInitializer.java create mode 100644 src/main/java/com/neo/controller/HelloWorldController.java create mode 100644 src/main/resources/Application.java create mode 100644 src/main/resources/ServletInitializer.java create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/controller/HelloWorldController.java create mode 100644 src/test/java/com/neo/ApplicationTests.java create mode 100644 src/test/java/com/neo/controller/HelloTests.java create mode 100644 src/test/java/com/neo/controller/HelloWorldControlerTests.java diff --git a/pom.xml b/pom.xml index 315ecca5f..5abf3af57 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.neo spring-boot-package-war - 0.0.1-SNAPSHOT + 0.0.${BUILD_ID}-SNAPSHOT war spring-boot-package-war diff --git a/spring-boot-package-war/Jenkinsfile b/spring-boot-package-war_/Jenkinsfile similarity index 100% rename from spring-boot-package-war/Jenkinsfile rename to spring-boot-package-war_/Jenkinsfile diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war_/pom.xml similarity index 97% rename from spring-boot-package-war/pom.xml rename to spring-boot-package-war_/pom.xml index 315ecca5f..5abf3af57 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.${BUILD_ID}-SNAPSHOT war spring-boot-package-war diff --git a/spring-boot-package-war/src/main/java/com/neo/Application.java b/spring-boot-package-war_/src/main/java/com/neo/Application.java similarity index 100% rename from spring-boot-package-war/src/main/java/com/neo/Application.java rename to spring-boot-package-war_/src/main/java/com/neo/Application.java diff --git a/spring-boot-package-war/src/main/java/com/neo/ServletInitializer.java b/spring-boot-package-war_/src/main/java/com/neo/ServletInitializer.java similarity index 100% rename from spring-boot-package-war/src/main/java/com/neo/ServletInitializer.java rename to spring-boot-package-war_/src/main/java/com/neo/ServletInitializer.java 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 similarity index 100% rename from spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java rename to spring-boot-package-war_/src/main/java/com/neo/controller/HelloWorldController.java diff --git a/spring-boot-package-war/src/main/resources/Application.java b/spring-boot-package-war_/src/main/resources/Application.java similarity index 100% rename from spring-boot-package-war/src/main/resources/Application.java rename to spring-boot-package-war_/src/main/resources/Application.java diff --git a/spring-boot-package-war/src/main/resources/ServletInitializer.java b/spring-boot-package-war_/src/main/resources/ServletInitializer.java similarity index 100% rename from spring-boot-package-war/src/main/resources/ServletInitializer.java rename to spring-boot-package-war_/src/main/resources/ServletInitializer.java diff --git a/spring-boot-package-war/src/main/resources/application.properties b/spring-boot-package-war_/src/main/resources/application.properties similarity index 100% rename from spring-boot-package-war/src/main/resources/application.properties rename to spring-boot-package-war_/src/main/resources/application.properties diff --git a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war_/src/main/resources/controller/HelloWorldController.java similarity index 100% rename from spring-boot-package-war/src/main/resources/controller/HelloWorldController.java rename to spring-boot-package-war_/src/main/resources/controller/HelloWorldController.java diff --git a/spring-boot-package-war/src/test/java/com/neo/ApplicationTests.java b/spring-boot-package-war_/src/test/java/com/neo/ApplicationTests.java similarity index 100% rename from spring-boot-package-war/src/test/java/com/neo/ApplicationTests.java rename to spring-boot-package-war_/src/test/java/com/neo/ApplicationTests.java 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 similarity index 100% rename from spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java rename to spring-boot-package-war_/src/test/java/com/neo/controller/HelloTests.java diff --git a/spring-boot-package-war/src/test/java/com/neo/controller/HelloWorldControlerTests.java b/spring-boot-package-war_/src/test/java/com/neo/controller/HelloWorldControlerTests.java similarity index 100% rename from spring-boot-package-war/src/test/java/com/neo/controller/HelloWorldControlerTests.java rename to spring-boot-package-war_/src/test/java/com/neo/controller/HelloWorldControlerTests.java diff --git a/src/main/java/com/neo/Application.java b/src/main/java/com/neo/Application.java new file mode 100644 index 000000000..6cda50c81 --- /dev/null +++ b/src/main/java/com/neo/Application.java @@ -0,0 +1,12 @@ +package com.neo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/java/com/neo/ServletInitializer.java b/src/main/java/com/neo/ServletInitializer.java new file mode 100644 index 000000000..e57ead010 --- /dev/null +++ b/src/main/java/com/neo/ServletInitializer.java @@ -0,0 +1,14 @@ +package com.neo; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.web.SpringBootServletInitializer; + +/** + * Created by summer on 2017/5/8. + */ +public class ServletInitializer extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } +} diff --git a/src/main/java/com/neo/controller/HelloWorldController.java b/src/main/java/com/neo/controller/HelloWorldController.java new file mode 100644 index 000000000..c231fae49 --- /dev/null +++ b/src/main/java/com/neo/controller/HelloWorldController.java @@ -0,0 +1,13 @@ +package com.neo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloWorldController { + + @RequestMapping("/hello") + public String index() { + return "Hello World xx"; + } +} \ No newline at end of file diff --git a/src/main/resources/Application.java b/src/main/resources/Application.java new file mode 100644 index 000000000..6cda50c81 --- /dev/null +++ b/src/main/resources/Application.java @@ -0,0 +1,12 @@ +package com.neo; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } +} diff --git a/src/main/resources/ServletInitializer.java b/src/main/resources/ServletInitializer.java new file mode 100644 index 000000000..e57ead010 --- /dev/null +++ b/src/main/resources/ServletInitializer.java @@ -0,0 +1,14 @@ +package com.neo; + +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.context.web.SpringBootServletInitializer; + +/** + * Created by summer on 2017/5/8. + */ +public class ServletInitializer extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 000000000..e69de29bb diff --git a/src/main/resources/controller/HelloWorldController.java b/src/main/resources/controller/HelloWorldController.java new file mode 100644 index 000000000..c231fae49 --- /dev/null +++ b/src/main/resources/controller/HelloWorldController.java @@ -0,0 +1,13 @@ +package com.neo.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class HelloWorldController { + + @RequestMapping("/hello") + public String index() { + return "Hello World xx"; + } +} \ No newline at end of file diff --git a/src/test/java/com/neo/ApplicationTests.java b/src/test/java/com/neo/ApplicationTests.java new file mode 100644 index 000000000..f35d76c7a --- /dev/null +++ b/src/test/java/com/neo/ApplicationTests.java @@ -0,0 +1,16 @@ +package com.neo; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = Application.class) +public class ApplicationTests { + + @Test + public void contextLoads() { + } + +} diff --git a/src/test/java/com/neo/controller/HelloTests.java b/src/test/java/com/neo/controller/HelloTests.java new file mode 100644 index 000000000..02133d7ef --- /dev/null +++ b/src/test/java/com/neo/controller/HelloTests.java @@ -0,0 +1,39 @@ +package com.neo.controller; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.http.MediaType; +import org.springframework.mock.web.MockServletContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +import static org.hamcrest.Matchers.equalTo; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = MockServletContext.class) +@WebAppConfiguration +public class HelloTests { + + + private MockMvc mvc; + + @Before + public void setUp() throws Exception { + mvc = MockMvcBuilders.standaloneSetup(new HelloWorldController()).build(); + } + + @Test + public void getHello() throws Exception { + mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().string(equalTo("Hello World"))); + } + +} \ No newline at end of file diff --git a/src/test/java/com/neo/controller/HelloWorldControlerTests.java b/src/test/java/com/neo/controller/HelloWorldControlerTests.java new file mode 100644 index 000000000..423d57caa --- /dev/null +++ b/src/test/java/com/neo/controller/HelloWorldControlerTests.java @@ -0,0 +1,37 @@ +package com.neo.controller; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.http.MediaType; +import org.springframework.mock.web.MockServletContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +import org.springframework.test.web.servlet.MockMvc; +import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import org.springframework.test.web.servlet.result.MockMvcResultHandlers; +import org.springframework.test.web.servlet.result.MockMvcResultMatchers; +import org.springframework.test.web.servlet.setup.MockMvcBuilders; + +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = MockServletContext.class) +@WebAppConfiguration +public class HelloWorldControlerTests { + + private MockMvc mvc; + + @Before + public void setUp() throws Exception { + mvc = MockMvcBuilders.standaloneSetup(new HelloWorldController()).build(); + } + + @Test + public void getHello() throws Exception { + mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) + .andExpect(MockMvcResultMatchers.status().isOk()) + .andDo(MockMvcResultHandlers.print()) + .andReturn(); + } + +} \ No newline at end of file From 12792cd5a461fbc86e12c5684f3ac1b392379ef7 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Sun, 29 Aug 2021 11:10:31 +0300 Subject: [PATCH 19/46] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e0ddb4a7d..3ac06ce60 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { } stage('Deploy to Integration ') { steps { - sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' + sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war" /opt/tomcat/latest/webapps' } } } From aaaa4ee3392887d97ea4743ca802a912ca8211db Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 29 Aug 2021 11:11:09 +0300 Subject: [PATCH 20/46] 1 --- spring-boot-package-war_/Jenkinsfile | 22 ------ spring-boot-package-war_/pom.xml | 67 ------------------- .../src/main/java/com/neo/Application.java | 12 ---- .../main/java/com/neo/ServletInitializer.java | 14 ---- .../neo/controller/HelloWorldController.java | 13 ---- .../src/main/resources/Application.java | 12 ---- .../main/resources/ServletInitializer.java | 14 ---- .../src/main/resources/application.properties | 0 .../controller/HelloWorldController.java | 13 ---- .../test/java/com/neo/ApplicationTests.java | 16 ----- .../java/com/neo/controller/HelloTests.java | 39 ----------- .../controller/HelloWorldControlerTests.java | 37 ---------- 12 files changed, 259 deletions(-) delete mode 100644 spring-boot-package-war_/Jenkinsfile delete mode 100644 spring-boot-package-war_/pom.xml delete mode 100644 spring-boot-package-war_/src/main/java/com/neo/Application.java delete mode 100644 spring-boot-package-war_/src/main/java/com/neo/ServletInitializer.java delete mode 100644 spring-boot-package-war_/src/main/java/com/neo/controller/HelloWorldController.java delete mode 100644 spring-boot-package-war_/src/main/resources/Application.java delete mode 100644 spring-boot-package-war_/src/main/resources/ServletInitializer.java delete mode 100644 spring-boot-package-war_/src/main/resources/application.properties delete mode 100644 spring-boot-package-war_/src/main/resources/controller/HelloWorldController.java delete mode 100644 spring-boot-package-war_/src/test/java/com/neo/ApplicationTests.java delete mode 100644 spring-boot-package-war_/src/test/java/com/neo/controller/HelloTests.java delete mode 100644 spring-boot-package-war_/src/test/java/com/neo/controller/HelloWorldControlerTests.java diff --git a/spring-boot-package-war_/Jenkinsfile b/spring-boot-package-war_/Jenkinsfile deleted file mode 100644 index e0ddb4a7d..000000000 --- a/spring-boot-package-war_/Jenkinsfile +++ /dev/null @@ -1,22 +0,0 @@ -pipeline { - agent { - label 'master' - } - stages{ - stage('checkout code'){ - steps { - git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' - } - } - stage('Build'){ - steps { - sh 'mvn package' - } - } - stage('Deploy to Integration ') { - steps { - sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' - } - } - } -} diff --git a/spring-boot-package-war_/pom.xml b/spring-boot-package-war_/pom.xml deleted file mode 100644 index 5abf3af57..000000000 --- a/spring-boot-package-war_/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.neo - spring-boot-package-war - 0.0.${BUILD_ID}-SNAPSHOT - war - - spring-boot-package-war - Demo project for Spring Boot package war - - - 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 - - - - - - - diff --git a/spring-boot-package-war_/src/main/java/com/neo/Application.java b/spring-boot-package-war_/src/main/java/com/neo/Application.java deleted file mode 100644 index 6cda50c81..000000000 --- a/spring-boot-package-war_/src/main/java/com/neo/Application.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.neo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} diff --git a/spring-boot-package-war_/src/main/java/com/neo/ServletInitializer.java b/spring-boot-package-war_/src/main/java/com/neo/ServletInitializer.java deleted file mode 100644 index e57ead010..000000000 --- a/spring-boot-package-war_/src/main/java/com/neo/ServletInitializer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.neo; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.web.SpringBootServletInitializer; - -/** - * Created by summer on 2017/5/8. - */ -public class ServletInitializer extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(Application.class); - } -} 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 deleted file mode 100644 index c231fae49..000000000 --- a/spring-boot-package-war_/src/main/java/com/neo/controller/HelloWorldController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.neo.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class HelloWorldController { - - @RequestMapping("/hello") - public String index() { - return "Hello World xx"; - } -} \ No newline at end of file diff --git a/spring-boot-package-war_/src/main/resources/Application.java b/spring-boot-package-war_/src/main/resources/Application.java deleted file mode 100644 index 6cda50c81..000000000 --- a/spring-boot-package-war_/src/main/resources/Application.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.neo; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -public class Application { - - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } -} diff --git a/spring-boot-package-war_/src/main/resources/ServletInitializer.java b/spring-boot-package-war_/src/main/resources/ServletInitializer.java deleted file mode 100644 index e57ead010..000000000 --- a/spring-boot-package-war_/src/main/resources/ServletInitializer.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.neo; - -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.context.web.SpringBootServletInitializer; - -/** - * Created by summer on 2017/5/8. - */ -public class ServletInitializer extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(Application.class); - } -} diff --git a/spring-boot-package-war_/src/main/resources/application.properties b/spring-boot-package-war_/src/main/resources/application.properties deleted file mode 100644 index e69de29bb..000000000 diff --git a/spring-boot-package-war_/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war_/src/main/resources/controller/HelloWorldController.java deleted file mode 100644 index c231fae49..000000000 --- a/spring-boot-package-war_/src/main/resources/controller/HelloWorldController.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.neo.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class HelloWorldController { - - @RequestMapping("/hello") - public String index() { - return "Hello World xx"; - } -} \ No newline at end of file diff --git a/spring-boot-package-war_/src/test/java/com/neo/ApplicationTests.java b/spring-boot-package-war_/src/test/java/com/neo/ApplicationTests.java deleted file mode 100644 index f35d76c7a..000000000 --- a/spring-boot-package-war_/src/test/java/com/neo/ApplicationTests.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.neo; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = Application.class) -public class ApplicationTests { - - @Test - public void contextLoads() { - } - -} 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 deleted file mode 100644 index 02133d7ef..000000000 --- a/spring-boot-package-war_/src/test/java/com/neo/controller/HelloTests.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.neo.controller; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.http.MediaType; -import org.springframework.mock.web.MockServletContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; - -import static org.hamcrest.Matchers.equalTo; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = MockServletContext.class) -@WebAppConfiguration -public class HelloTests { - - - private MockMvc mvc; - - @Before - public void setUp() throws Exception { - mvc = MockMvcBuilders.standaloneSetup(new HelloWorldController()).build(); - } - - @Test - public void getHello() throws Exception { - mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) - .andExpect(status().isOk()) - .andExpect(content().string(equalTo("Hello World"))); - } - -} \ No newline at end of file diff --git a/spring-boot-package-war_/src/test/java/com/neo/controller/HelloWorldControlerTests.java b/spring-boot-package-war_/src/test/java/com/neo/controller/HelloWorldControlerTests.java deleted file mode 100644 index 423d57caa..000000000 --- a/spring-boot-package-war_/src/test/java/com/neo/controller/HelloWorldControlerTests.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.neo.controller; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.SpringApplicationConfiguration; -import org.springframework.http.MediaType; -import org.springframework.mock.web.MockServletContext; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.result.MockMvcResultHandlers; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; -import org.springframework.test.web.servlet.setup.MockMvcBuilders; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = MockServletContext.class) -@WebAppConfiguration -public class HelloWorldControlerTests { - - private MockMvc mvc; - - @Before - public void setUp() throws Exception { - mvc = MockMvcBuilders.standaloneSetup(new HelloWorldController()).build(); - } - - @Test - public void getHello() throws Exception { - mvc.perform(MockMvcRequestBuilders.get("/hello").accept(MediaType.APPLICATION_JSON)) - .andExpect(MockMvcResultMatchers.status().isOk()) - .andDo(MockMvcResultHandlers.print()) - .andReturn(); - } - -} \ No newline at end of file From 455bb9c94c73c2b17fe8b60c63d2f4b6ef6924de Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 29 Aug 2021 11:12:13 +0300 Subject: [PATCH 21/46] 11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5abf3af57..315ecca5f 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.neo spring-boot-package-war - 0.0.${BUILD_ID}-SNAPSHOT + 0.0.1-SNAPSHOT war spring-boot-package-war From 2603e63a9fb96b97da05c95397a096b7bed13564 Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 29 Aug 2021 11:14:39 +0300 Subject: [PATCH 22/46] 22 --- .../Jenkinsfile_ | 2 +- spring-boot-package-war/pom.xml | 67 +++++++++++++++++++ .../src}/main/java/com/neo/Application.java | 0 .../main/java/com/neo/ServletInitializer.java | 0 .../neo/controller/HelloWorldController.java | 0 .../src}/main/resources/Application.java | 0 .../main/resources/ServletInitializer.java | 0 .../main/resources/application.properties | 0 .../controller/HelloWorldController.java | 0 .../test/java/com/neo/ApplicationTests.java | 0 .../java/com/neo/controller/HelloTests.java | 0 .../controller/HelloWorldControlerTests.java | 0 12 files changed, 68 insertions(+), 1 deletion(-) rename Jenkinsfile => spring-boot-package-war/Jenkinsfile_ (84%) create mode 100644 spring-boot-package-war/pom.xml rename {src => spring-boot-package-war/src}/main/java/com/neo/Application.java (100%) rename {src => spring-boot-package-war/src}/main/java/com/neo/ServletInitializer.java (100%) rename {src => spring-boot-package-war/src}/main/java/com/neo/controller/HelloWorldController.java (100%) rename {src => spring-boot-package-war/src}/main/resources/Application.java (100%) rename {src => spring-boot-package-war/src}/main/resources/ServletInitializer.java (100%) rename {src => spring-boot-package-war/src}/main/resources/application.properties (100%) rename {src => spring-boot-package-war/src}/main/resources/controller/HelloWorldController.java (100%) rename {src => spring-boot-package-war/src}/test/java/com/neo/ApplicationTests.java (100%) rename {src => spring-boot-package-war/src}/test/java/com/neo/controller/HelloTests.java (100%) rename {src => spring-boot-package-war/src}/test/java/com/neo/controller/HelloWorldControlerTests.java (100%) diff --git a/Jenkinsfile b/spring-boot-package-war/Jenkinsfile_ similarity index 84% rename from Jenkinsfile rename to spring-boot-package-war/Jenkinsfile_ index 3ac06ce60..e0ddb4a7d 100644 --- a/Jenkinsfile +++ b/spring-boot-package-war/Jenkinsfile_ @@ -15,7 +15,7 @@ pipeline { } stage('Deploy to Integration ') { steps { - sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war" /opt/tomcat/latest/webapps' + sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' } } } diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml new file mode 100644 index 000000000..5abf3af57 --- /dev/null +++ b/spring-boot-package-war/pom.xml @@ -0,0 +1,67 @@ + + + 4.0.0 + + com.neo + spring-boot-package-war + 0.0.${BUILD_ID}-SNAPSHOT + war + + spring-boot-package-war + Demo project for Spring Boot package war + + + 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 + + + + + + + diff --git a/src/main/java/com/neo/Application.java b/spring-boot-package-war/src/main/java/com/neo/Application.java similarity index 100% rename from src/main/java/com/neo/Application.java rename to spring-boot-package-war/src/main/java/com/neo/Application.java diff --git a/src/main/java/com/neo/ServletInitializer.java b/spring-boot-package-war/src/main/java/com/neo/ServletInitializer.java similarity index 100% rename from src/main/java/com/neo/ServletInitializer.java rename to spring-boot-package-war/src/main/java/com/neo/ServletInitializer.java diff --git a/src/main/java/com/neo/controller/HelloWorldController.java b/spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java similarity index 100% rename from src/main/java/com/neo/controller/HelloWorldController.java rename to spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java diff --git a/src/main/resources/Application.java b/spring-boot-package-war/src/main/resources/Application.java similarity index 100% rename from src/main/resources/Application.java rename to spring-boot-package-war/src/main/resources/Application.java diff --git a/src/main/resources/ServletInitializer.java b/spring-boot-package-war/src/main/resources/ServletInitializer.java similarity index 100% rename from src/main/resources/ServletInitializer.java rename to spring-boot-package-war/src/main/resources/ServletInitializer.java diff --git a/src/main/resources/application.properties b/spring-boot-package-war/src/main/resources/application.properties similarity index 100% rename from src/main/resources/application.properties rename to spring-boot-package-war/src/main/resources/application.properties diff --git a/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java similarity index 100% rename from src/main/resources/controller/HelloWorldController.java rename to spring-boot-package-war/src/main/resources/controller/HelloWorldController.java diff --git a/src/test/java/com/neo/ApplicationTests.java b/spring-boot-package-war/src/test/java/com/neo/ApplicationTests.java similarity index 100% rename from src/test/java/com/neo/ApplicationTests.java rename to spring-boot-package-war/src/test/java/com/neo/ApplicationTests.java diff --git a/src/test/java/com/neo/controller/HelloTests.java b/spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java similarity index 100% rename from src/test/java/com/neo/controller/HelloTests.java rename to spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java diff --git a/src/test/java/com/neo/controller/HelloWorldControlerTests.java b/spring-boot-package-war/src/test/java/com/neo/controller/HelloWorldControlerTests.java similarity index 100% rename from src/test/java/com/neo/controller/HelloWorldControlerTests.java rename to spring-boot-package-war/src/test/java/com/neo/controller/HelloWorldControlerTests.java From c629bb48f5545d7f4354df3a4a9aa87445d30b34 Mon Sep 17 00:00:00 2001 From: Danny Date: Sun, 29 Aug 2021 11:16:15 +0300 Subject: [PATCH 23/46] 22 --- Jenkinsfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..3ac06ce60 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,22 @@ +pipeline { + agent { + label 'master' + } + stages{ + stage('checkout code'){ + steps { + git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' + } + } + stage('Build'){ + steps { + sh 'mvn package' + } + } + stage('Deploy to Integration ') { + steps { + sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war" /opt/tomcat/latest/webapps' + } + } + } +} From 1c2b302d8333508ae16875d41df35e6e44c90fad Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 08:51:00 +0300 Subject: [PATCH 24/46] 11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 315ecca5f..3e19913c3 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ org.springframework.boot spring-boot-maven-plugin - true + false From 6232b394f477a279994feb68c47b832c39bb749a Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 09:06:35 +0300 Subject: [PATCH 25/46] 1 --- pom.xml => pom.xm_ | 0 "\342\200\217\342\200\217pom.xml" | 64 +++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) rename pom.xml => pom.xm_ (100%) create mode 100644 "\342\200\217\342\200\217pom.xml" diff --git a/pom.xml b/pom.xm_ similarity index 100% rename from pom.xml rename to pom.xm_ diff --git "a/\342\200\217\342\200\217pom.xml" "b/\342\200\217\342\200\217pom.xml" new file mode 100644 index 000000000..7925cdb44 --- /dev/null +++ "b/\342\200\217\342\200\217pom.xml" @@ -0,0 +1,64 @@ + + + 4.0.0 + + com.neo + spring-boot-package-war + 0.0.1-SNAPSHOT + war + + spring-boot-package-war + Demo project for Spring Boot package war + + + org.springframework.boot + spring-boot-starter-parent + 1.3.6.RELEASE + + + + + UTF-8 + 1.8 + + + + + 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 + + + + + + From 0d9b82d6e371b224513e2731e832faefdf20c915 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 09:08:09 +0300 Subject: [PATCH 26/46] qw --- "\342\200\217\342\200\217pom.xml" | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git "a/\342\200\217\342\200\217pom.xml" "b/\342\200\217\342\200\217pom.xml" index 7925cdb44..cd87f054d 100644 --- "a/\342\200\217\342\200\217pom.xml" +++ "b/\342\200\217\342\200\217pom.xml" @@ -20,7 +20,7 @@ UTF-8 - 1.8 + 1.7 From b8c815b51e06e553b58f21e22201d0c251ca4f03 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 09:09:08 +0300 Subject: [PATCH 27/46] wqw --- pom.xm_ => pom.xml | 0 "\342\200\217\342\200\217pom.xml" | 64 ------------------------------- 2 files changed, 64 deletions(-) rename pom.xm_ => pom.xml (100%) delete mode 100644 "\342\200\217\342\200\217pom.xml" diff --git a/pom.xm_ b/pom.xml similarity index 100% rename from pom.xm_ rename to pom.xml diff --git "a/\342\200\217\342\200\217pom.xml" "b/\342\200\217\342\200\217pom.xml" deleted file mode 100644 index cd87f054d..000000000 --- "a/\342\200\217\342\200\217pom.xml" +++ /dev/null @@ -1,64 +0,0 @@ - - - 4.0.0 - - com.neo - spring-boot-package-war - 0.0.1-SNAPSHOT - war - - spring-boot-package-war - Demo project for Spring Boot package war - - - 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 - - - - - - From 2afdb19d6c776ea58606870c2e9040eca2f321f8 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 09:56:12 +0300 Subject: [PATCH 28/46] 11 --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 3e19913c3..506319b83 100644 --- a/pom.xml +++ b/pom.xml @@ -49,6 +49,11 @@ spring-boot-devtools true + + javax.xml.bind + jaxb-api + 2.3.0 +
From 970156d91ad0da3031cee113b2d13ffc8331bb8b Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:02:14 +0300 Subject: [PATCH 29/46] '' --- pom.xml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 506319b83..f69a428b2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,7 @@ org.springframework.boot spring-boot-starter-test + 1.3.6.RELEASE test @@ -39,21 +40,18 @@ 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.0 -
From a87dca98592a2f222ad47398d62067ab7c3bf895 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:09:01 +0300 Subject: [PATCH 30/46] t --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index f69a428b2..fe9b2f95c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,6 +52,13 @@ spring-boot-devtools true + + + javax.xml.bind + jaxb-api + 2.3.0 + + From ee49b3336c7ebcc06c2ed8f617c0b2a2f7eb62b6 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:13:19 +0300 Subject: [PATCH 31/46] ee --- spring-boot-package-war/Jenkinsfile_ | 22 ------------------- spring-boot-package-war/{pom.xml => pom.xm_} | 0 .../neo/controller/HelloWorldController.java | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 spring-boot-package-war/Jenkinsfile_ rename spring-boot-package-war/{pom.xml => pom.xm_} (100%) diff --git a/spring-boot-package-war/Jenkinsfile_ b/spring-boot-package-war/Jenkinsfile_ deleted file mode 100644 index e0ddb4a7d..000000000 --- a/spring-boot-package-war/Jenkinsfile_ +++ /dev/null @@ -1,22 +0,0 @@ -pipeline { - agent { - label 'master' - } - stages{ - stage('checkout code'){ - steps { - git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' - } - } - stage('Build'){ - steps { - sh 'mvn package' - } - } - stage('Deploy to Integration ') { - steps { - sh 'cp "/opt/tomcat/.jenkins/workspace/final project/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps' - } - } - } -} diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xm_ similarity index 100% rename from spring-boot-package-war/pom.xml rename to spring-boot-package-war/pom.xm_ 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..7d0256b4a 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 1bcb78712b324f8c79adaaca51eda52e9811080b Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:14:58 +0300 Subject: [PATCH 32/46] 33 --- .../src/main/resources/controller/HelloWorldController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java index c231fae49..7d0256b4a 100644 --- a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java +++ b/spring-boot-package-war/src/main/resources/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 3ce38526e93496f62294759dc766c13d14105132 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:18:56 +0300 Subject: [PATCH 33/46] 3 --- .../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 02133d7ef..27c5672cc 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 a2e4423e561623bf136cf227a403f5cab8f69156 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Wed, 1 Sep 2021 10:23:22 +0300 Subject: [PATCH 34/46] Update HelloWorldController.java --- .../src/main/resources/controller/HelloWorldController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java index 7d0256b4a..01d019141 100644 --- a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java +++ b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java @@ -8,6 +8,6 @@ public class HelloWorldController { @RequestMapping("/hello") public String index() { - return "Hello World"; + return "Hello World xx"; } -} \ No newline at end of file +} From 5c89ba04ea2fd1012c870ea0a3b35b1f90ea39d2 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Wed, 1 Sep 2021 10:23:50 +0300 Subject: [PATCH 35/46] Update HelloWorldController.java --- .../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 7d0256b4a..01d019141 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"; + return "Hello World xx"; } -} \ No newline at end of file +} From 4bd50afdcca4a903335103ace2e4e931d8854397 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:33:04 +0300 Subject: [PATCH 36/46] w --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fe9b2f95c..5bba0d5c4 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ org.springframework.boot spring-boot-maven-plugin - false + true From 4482100017aca34295e7d0f44d2b589f089ac8fc Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:37:35 +0300 Subject: [PATCH 37/46] ee --- .../src/main/java/com/neo/controller/HelloWorldController.java | 2 +- .../src/main/resources/controller/HelloWorldController.java | 2 +- .../src/test/java/com/neo/controller/HelloTests.java | 2 +- 3 files changed, 3 insertions(+), 3 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 01d019141..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"; } } diff --git a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java index 01d019141..a8a6efb45 100644 --- a/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java +++ b/spring-boot-package-war/src/main/resources/controller/HelloWorldController.java @@ -8,6 +8,6 @@ public class HelloWorldController { @RequestMapping("/hello") public String index() { - return "Hello World xx"; + return "Hello World"; } } 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 27c5672cc..02133d7ef 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"))); } } \ No newline at end of file From 980adbc058faa5fe526032bc60b34b5e96d72878 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:44:32 +0300 Subject: [PATCH 38/46] ww --- spring-boot-package-war/{pom.xm_ => _om.xm_} | 0 pom.xml => spring-boot-package-war/pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename spring-boot-package-war/{pom.xm_ => _om.xm_} (100%) rename pom.xml => spring-boot-package-war/pom.xml (100%) diff --git a/spring-boot-package-war/pom.xm_ b/spring-boot-package-war/_om.xm_ similarity index 100% rename from spring-boot-package-war/pom.xm_ rename to spring-boot-package-war/_om.xm_ diff --git a/pom.xml b/spring-boot-package-war/pom.xml similarity index 100% rename from pom.xml rename to spring-boot-package-war/pom.xml From 53bb73a7c4dd09395dc88d2cf53ed8196e672774 Mon Sep 17 00:00:00 2001 From: Danny Date: Wed, 1 Sep 2021 10:45:43 +0300 Subject: [PATCH 39/46] wqw --- spring-boot-package-war/_om.xm_ => _om.xm_ | 0 spring-boot-package-war/pom.xml => pom.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename spring-boot-package-war/_om.xm_ => _om.xm_ (100%) rename spring-boot-package-war/pom.xml => pom.xml (100%) diff --git a/spring-boot-package-war/_om.xm_ b/_om.xm_ similarity index 100% rename from spring-boot-package-war/_om.xm_ rename to _om.xm_ diff --git a/spring-boot-package-war/pom.xml b/pom.xml similarity index 100% rename from spring-boot-package-war/pom.xml rename to pom.xml From 126e006ddfa2d0fa112e2b14e6b4b5d3c3bab29a Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 12:52:25 +0300 Subject: [PATCH 40/46] aa --- Jenkinsfile | 3 +- _om.xm_ | 67 ---------------------- pom.xml => spring-boot-package-war/pom.xml | 0 3 files changed, 2 insertions(+), 68 deletions(-) delete mode 100644 _om.xm_ rename pom.xml => spring-boot-package-war/pom.xml (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 3ac06ce60..e12e2ff74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,8 @@ pipeline { } stage('Build'){ steps { - sh 'mvn package' + cd /spring-boot-package-war + sh 'mvn package' } } stage('Deploy to Integration ') { diff --git a/_om.xm_ b/_om.xm_ deleted file mode 100644 index 5abf3af57..000000000 --- a/_om.xm_ +++ /dev/null @@ -1,67 +0,0 @@ - - - 4.0.0 - - com.neo - spring-boot-package-war - 0.0.${BUILD_ID}-SNAPSHOT - war - - spring-boot-package-war - Demo project for Spring Boot package war - - - 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 - - - - - - - diff --git a/pom.xml b/spring-boot-package-war/pom.xml similarity index 100% rename from pom.xml rename to spring-boot-package-war/pom.xml From b96fc8ad07ea8fe5634095c560a51240a5707466 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 13:03:00 +0300 Subject: [PATCH 41/46] qq --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e12e2ff74..0845f7fc7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } stage('Build'){ steps { - cd /spring-boot-package-war + cd spring-boot-package-war sh 'mvn package' } } From 7c9a973b334cf1f9818f28bcef0bdcf5e8ba003f Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 13:04:13 +0300 Subject: [PATCH 42/46] gg --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0845f7fc7..86c676906 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { } stage('Build'){ steps { - cd spring-boot-package-war + cd "spring-boot-package-war" sh 'mvn package' } } From 997c5e264d6e196f0f8d9d63f0cc935858e1c39c Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 13:07:21 +0300 Subject: [PATCH 43/46] hv --- Jenkinsfile | 3 +-- pom.xml | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 pom.xml diff --git a/Jenkinsfile b/Jenkinsfile index 86c676906..3ac06ce60 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,8 +10,7 @@ pipeline { } stage('Build'){ steps { - cd "spring-boot-package-war" - sh 'mvn package' + sh 'mvn package' } } stage('Deploy to Integration ') { diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..5bba0d5c4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,77 @@ + + + 4.0.0 + + com.neo + spring-boot-package-war + 0.0.1-SNAPSHOT + war + + spring-boot-package-war + Demo project for Spring Boot package war + + + 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 + 1.3.6.RELEASE + 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.0 + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + + + From f679ec2643fb6df00ae2acef4f9d8fa812b8f1e1 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 13:09:53 +0300 Subject: [PATCH 44/46] dsds --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3ac06ce60..b7d9c32cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,12 @@ pipeline { } stage('Build'){ steps { - sh 'mvn package' + sh 'mvn compile' + } + } + stage('Test'){ + steps { + sh 'mvn test' } } stage('Deploy to Integration ') { From 4946c42239c00a2eaa383e0c658ee02c5c4e730d Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 13:31:55 +0300 Subject: [PATCH 45/46] b --- pom.xml | 77 --------------------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 5bba0d5c4..000000000 --- a/pom.xml +++ /dev/null @@ -1,77 +0,0 @@ - - - 4.0.0 - - com.neo - spring-boot-package-war - 0.0.1-SNAPSHOT - war - - spring-boot-package-war - Demo project for Spring Boot package war - - - 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 - 1.3.6.RELEASE - 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.0 - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - true - - - - - - - From 658ca28005a914595448b371b7a97a446e61f0d3 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 13:41:06 +0300 Subject: [PATCH 46/46] sasasa --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7d9c32cd..c33a9922d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,12 +10,14 @@ pipeline { } stage('Build'){ steps { - sh 'mvn compile' + sh '''cd spring-boot-package-war''' + sh '''mvn compile''' } } stage('Test'){ steps { - sh 'mvn test' + sh '''cd spring-boot-package-war + mvn test''' } } stage('Deploy to Integration ') {