diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..02c127494 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,56 @@ +pipeline { + agent { + node { + label 'CentOS7' + } + + } + stages { + stage('checkout code') { + steps { + git(branch: 'danny_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git') + } + } + + stage('Build') { + steps { + sh '''cd spring-boot-package-war + mvn compile''' + } + } + + stage('Test') { + post { + always { + junit '**/surefire-reports/**/*.xml' + } + + } + steps { + sh '''cd spring-boot-package-war + mvn test''' + } + } + + stage('Deploy to Integration ') { + steps { + sh '''cd spring-boot-package-war + mvn build-helper:parse-version versions:set -DnewVersion=0.0.2.$BUILD_ID-SNAPSHOT versions:commit + mvn package''' + } + } + + stage('Artifacts') { + steps { + archiveArtifacts 'spring-boot-package-war/target/*.war' + } + } + + stage('slack') { + steps { + slackSend(channel: 'danny-dev', color: '#439FE0', message: 'new mvn build', tokenCredentialId: 'Slack') + } + } + + } +} diff --git a/README.md b/README.md deleted file mode 100644 index ac66352de..000000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Spring Boot Examples - 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/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml index c54d0da80..842282545 100644 --- a/spring-boot-package-war/pom.xml +++ b/spring-boot-package-war/pom.xml @@ -49,6 +49,11 @@ spring-boot-devtools true + + javax.xml.bind + jaxb-api + 2.3.0 + 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 +}