From 8d67f29499a6e2280faaf9086290da63c4889e82 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 14:12:51 +0300 Subject: [PATCH 01/24] Add Jenkinsfile --- Jenkinsfile | 29 +++++++++++++++++++++++++++++ README.md | 2 -- README_EN.md | 30 ------------------------------ 3 files changed, 29 insertions(+), 32 deletions(-) create mode 100644 Jenkinsfile delete mode 100644 README.md delete mode 100644 README_EN.md diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 000000000..c33a9922d --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,29 @@ +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 '''cd spring-boot-package-war''' + sh '''mvn compile''' + } + } + stage('Test'){ + steps { + sh '''cd spring-boot-package-war + mvn test''' + } + } + 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' + } + } + } +} 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** From 8cb40a52c3b52ce46966e044b1302c0c5b14408e Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 14:14:23 +0300 Subject: [PATCH 02/24] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c33a9922d..742a35086 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ pipeline { stages{ stage('checkout code'){ steps { - git branch: 'IditOryDanny_2_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' + git branch: 'danny_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' } } stage('Build'){ From 9ac249b996189c0589bfd730f676aaf8f8ff6ce8 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 14:15:18 +0300 Subject: [PATCH 03/24] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 742a35086..ca34fb0fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,14 +10,14 @@ pipeline { } stage('Build'){ steps { - sh '''cd spring-boot-package-war''' - sh '''mvn compile''' + sh '''cd spring-boot-package-war + mvn compile''' } } stage('Test'){ steps { sh '''cd spring-boot-package-war - mvn test''' + mvn test''' } } stage('Deploy to Integration ') { From fd8f7441a455c884c1797db4b58e5dde2f9d2a93 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 14:26:06 +0300 Subject: [PATCH 04/24] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca34fb0fe..e61ba348d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { mvn compile''' } } - stage('Test'){ + stage('Test'){ steps { sh '''cd spring-boot-package-war mvn test''' From 942f80c47337b499650a0f709524154e4ac425ae Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 14:35:23 +0300 Subject: [PATCH 05/24] update Jenkinsfile --- Jenkinsfile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e61ba348d..f60268c93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,18 +8,13 @@ pipeline { git branch: 'danny_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' } } - stage('Build'){ + stage('Build and Test'){ steps { sh '''cd spring-boot-package-war - mvn compile''' - } - } - stage('Test'){ - steps { - sh '''cd spring-boot-package-war - mvn test''' + 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 0f4d22b7173bccc86e0b1f74e503e513f0c85506 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 14:37:51 +0300 Subject: [PATCH 06/24] 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 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 d5236b18c2e4dc6653d469c3fe6ae9ca17206087 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:02:08 +0300 Subject: [PATCH 07/24] aaa --- spring-boot-package-war/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-boot-package-war/pom.xml b/spring-boot-package-war/pom.xml index c54d0da80..e8704dc00 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 +
From d0b98a53030377d9d067a3d85b389e2599211bb9 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:06:34 +0300 Subject: [PATCH 08/24] ff --- 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 e8704dc00..842282545 100644 --- a/spring-boot-package-war/pom.xml +++ b/spring-boot-package-war/pom.xml @@ -53,7 +53,7 @@ javax.xml.bind jaxb-api 2.3.0 -
+ From f231acb0524762124b3f8eef344de03940a3c4f2 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:32:51 +0300 Subject: [PATCH 09/24] Update Jenkinsfile --- Jenkinsfile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f60268c93..ca34fb0fe 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,13 +8,18 @@ pipeline { git branch: 'danny_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git' } } - stage('Build and Test'){ + stage('Build'){ steps { sh '''cd spring-boot-package-war - mvn package''' + mvn compile''' + } + } + stage('Test'){ + steps { + sh '''cd spring-boot-package-war + mvn test''' } } - 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 3b9c12ae0dd548c35dee7deed315d1a4a5f8a7b3 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:35:54 +0300 Subject: [PATCH 10/24] asfa --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca34fb0fe..1d3724a97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,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/spring-boot-examples/target/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war" /opt/tomcat/latest/webapps' } } } From e489e859437f01d09aa749ab07d7ee6cf7f04d98 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:39:27 +0300 Subject: [PATCH 11/24] dssss --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d3724a97..6270d6d0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,14 @@ pipeline { } stage('Deploy to Integration ') { steps { - sh 'cp "/opt/tomcat/.jenkins/workspace/spring-boot-examples/target/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war" /opt/tomcat/latest/webapps' + sh 'cp "/opt/tomcat/.jenkins/workspace/spring-boot-examples/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war' } } + stage('packege {mvn clean packege}') { + steps { + sh '''cd spring-boot-package-war + mvn clean package''' + } + } } } From 8290143acea0053d52c2494d0973a709b449b363 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:46:27 +0300 Subject: [PATCH 12/24] ssss --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6270d6d0d..f714a904d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,10 +22,12 @@ pipeline { } stage('Deploy to Integration ') { steps { - sh 'cp "/opt/tomcat/.jenkins/workspace/spring-boot-examples/target/spring-boot-package-war-0.0.1-SNAPSHOT.war" /opt/tomcat/latest/webapps/spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war' + sh '''cd spring-boot-package-war + mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit + cp "/opt/tomcat/.jenkins/workspace/spring-boot-examples/target/spring-boot-package-war-0.0.*-SNAPSHOT.war" /opt/tomcat/latest/webapps''' } } - stage('packege {mvn clean packege}') { + stage('packege') { steps { sh '''cd spring-boot-package-war mvn clean package''' From c1b970fd4b352ae85ef24e9d5d1e0fea263266a8 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 15:49:35 +0300 Subject: [PATCH 13/24] dsdsdsd --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f714a904d..a18963fb6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,8 +23,7 @@ pipeline { stage('Deploy to Integration ') { steps { sh '''cd spring-boot-package-war - mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit - cp "/opt/tomcat/.jenkins/workspace/spring-boot-examples/target/spring-boot-package-war-0.0.*-SNAPSHOT.war" /opt/tomcat/latest/webapps''' + mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit''' } } stage('packege') { From 9f5392da04509e67a388f99ae3335e318cef5b47 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 16:23:39 +0300 Subject: [PATCH 14/24] aaa --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a18963fb6..6bbd2fb03 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,10 +26,9 @@ pipeline { mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit''' } } - stage('packege') { + stage('Artifacts') { steps { - sh '''cd spring-boot-package-war - mvn clean package''' + archiveArtifacts artifacts: 'spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war', followSymlinks: false } } } From 1653f7aee85cdb979d9f6d99fb39d150443b43a8 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 16:40:08 +0300 Subject: [PATCH 15/24] sdfsdf --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6bbd2fb03..70149832d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { } stage('Artifacts') { steps { - archiveArtifacts artifacts: 'spring-boot-package-war-0.0.${BUILD_ID}-SNAPSHOT.war', followSymlinks: false + archiveArtifacts 'spring-boot-package-war/target/*.war', followSymlinks: false } } } From dba9cdeab4d612dfbee5ceb3460a06ac504a3146 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 16:52:47 +0300 Subject: [PATCH 16/24] ffdffd --- Jenkinsfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 70149832d..e206e1242 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,8 +17,13 @@ pipeline { stage('Test'){ steps { sh '''cd spring-boot-package-war - mvn test''' + mvn test''' } + post { + always { + junit '**/surefire-reports/**/*.xml' + } + } } stage('Deploy to Integration ') { steps { @@ -28,7 +33,7 @@ pipeline { } stage('Artifacts') { steps { - archiveArtifacts 'spring-boot-package-war/target/*.war', followSymlinks: false + archiveArtifacts '**/target/*.war', followSymlinks: false } } } From f73bde074d3e2edce9406e8c76b2dfc2a5e5a60e Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 16:57:22 +0300 Subject: [PATCH 17/24] ccvvc --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e206e1242..8e50b5585 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ pipeline { } stage('Artifacts') { steps { - archiveArtifacts '**/target/*.war', followSymlinks: false + archiveArtifacts artifacts: 'spring-boot-package-war/target/*.war', followSymlinks: false } } } From 3729eb05f898fde344714f39f21461dd24283915 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 17:46:28 +0300 Subject: [PATCH 18/24] aaa --- Jenkinsfile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8e50b5585..6df2e4454 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,9 +32,14 @@ pipeline { } } stage('Artifacts') { - steps { - archiveArtifacts artifacts: 'spring-boot-package-war/target/*.war', followSymlinks: false - } - } + steps { + archiveArtifacts artifacts: 'spring-boot-package-war/target/*.war', followSymlinks: false + } + } + stage('slack') { + steps { + slackSend channel: 'danny-dev', color: '#439FE0', message: 'new mvn build', tokenCredentialId: 'Slack' + } + } } } From 0a4b8add7d7ce2be7723e8fae71e43b69579fa47 Mon Sep 17 00:00:00 2001 From: Danny Date: Mon, 13 Sep 2021 18:01:12 +0300 Subject: [PATCH 19/24] saas --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6df2e4454..cbc0cd4ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,8 @@ pipeline { stage('Deploy to Integration ') { steps { sh '''cd spring-boot-package-war - mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit''' + mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit + mvn package''' } } stage('Artifacts') { From 7a8736ca76a95e9252f9ea3c6e70b980d8a7da65 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 18:13:29 +0300 Subject: [PATCH 20/24] Added Jenkinsfile --- Jenkinsfile | 85 +++++++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 39 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cbc0cd4ab..f1d0a0868 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,46 +1,53 @@ pipeline { - agent { - label 'master' + agent { + label 'master' + } + stages { + stage('checkout code') { + steps { + git(branch: 'danny_sol', url: 'https://github.com/danny-ros/spring-boot-examples.git') + } } - 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 + + stage('Build') { + steps { + sh '''cd spring-boot-package-war mvn compile''' - } + } + } + + stage('Test') { + post { + always { + junit '**/surefire-reports/**/*.xml' } - stage('Test'){ - steps { - sh '''cd spring-boot-package-war + + } + steps { + sh '''cd spring-boot-package-war mvn test''' - } - post { - always { - junit '**/surefire-reports/**/*.xml' - } - } - } - stage('Deploy to Integration ') { - steps { - sh '''cd spring-boot-package-war + } + } + + stage('Deploy to Integration ') { + steps { + sh '''cd spring-boot-package-war mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit mvn package''' - } - } - stage('Artifacts') { - steps { - archiveArtifacts artifacts: 'spring-boot-package-war/target/*.war', followSymlinks: false - } - } - stage('slack') { - steps { - slackSend channel: 'danny-dev', color: '#439FE0', message: 'new mvn build', tokenCredentialId: 'Slack' - } - } - } -} + } + } + + 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') + } + } + + } +} \ No newline at end of file From 917be6ccec67201545267a1fdd07c317b7dec7b7 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 19:05:53 +0300 Subject: [PATCH 21/24] Added Jenkinsfile --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f1d0a0868..3f192d42d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,9 @@ pipeline { agent { - label 'master' + node { + label 'centos7' + } + } stages { stage('checkout code') { From 165a62a4d1db74ba540d973dba7b7494bcf31468 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 19:13:34 +0300 Subject: [PATCH 22/24] Added Jenkinsfile From 8f73150ead806d9b4f74a8707394b9adba435b78 Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 19:15:41 +0300 Subject: [PATCH 23/24] Added Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f192d42d..2698e1438 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { node { - label 'centos7' + label 'CentOS7' } } From 2af0fa7bb50814a9bb23c8ac1881f90bcbd998aa Mon Sep 17 00:00:00 2001 From: danny-ros <86313869+danny-ros@users.noreply.github.com> Date: Mon, 13 Sep 2021 20:46:09 +0300 Subject: [PATCH 24/24] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2698e1438..02c127494 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { stage('Deploy to Integration ') { steps { sh '''cd spring-boot-package-war - mvn build-helper:parse-version versions:set -DnewVersion=0.0.$BUILD_ID-SNAPSHOT versions:commit + mvn build-helper:parse-version versions:set -DnewVersion=0.0.2.$BUILD_ID-SNAPSHOT versions:commit mvn package''' } } @@ -53,4 +53,4 @@ pipeline { } } -} \ No newline at end of file +}