From cd68961e3fa9dd00a8576f17127dfe60d715f4a8 Mon Sep 17 00:00:00 2001 From: Igor Dianov Date: Thu, 14 Jan 2021 08:01:10 -0800 Subject: [PATCH] fix(GH-3229): Update Activiti Cloud Application to Spring Boot 2.4.1 (#220) * fix: update activiti.cloud-version to 0.0.1-PR-249-1464-SNAPSHOT * fix: Update to Spring Boot 2.4.1 * fix: update activiti-cloud-build-parent version to 0.0.1-PR-249-1464-SNAPSHOT * fix(build): add spring-milestones repository * fix: update activiti-cloud.version to 0.0.1-PR-249-1468-SNAPSHOT * fix(version): update activiti-cloud.version to 0.0.1-PR-253-1493-SNAPSHOT * fix: update activiti-cloud-build-parent version to 0.0.1-PR-253-1493-SNAPSHOT * Fix formatting * Deploy preview * fix(version): update activiti-cloud.version to 0.0.1-PR-253-1497-SNAPSHOT * fix: disable helm delete * Re-enable environment delete * fix: re-enable docker delete * fix: update activiti-cloud.version to 0.0.1-PR-253-1553-SNAPSHOT * fix: update activiti-cloud.version for query and modeling liquibase 0.0.1-PR-253-1553-SNAPSHOT * Revert "Re-enable environment delete" This reverts commit 1b4b65e5afa60d8b7690a3d9eeb2f2515ddb4465. * Revert "Revert "Re-enable environment delete"" This reverts commit fc720c181c6339cf22b9c6ffacb08342e9c97313. * fix(version): update activiti-cloud.version to 0.0.1-PR-253-1563-SNAPSHOT * Update activiti-cloud preview to 0.0.1-PR-253-1565-SNAPSHOT Co-authored-by: Elias Ricken de Medeiros <26007058+erdemedeiros@users.noreply.github.com> --- .travis.yml | 7 +++++++ activiti-cloud-acceptance-scenarios/pom.xml | 2 +- activiti-cloud-dependencies/pom.xml | 9 +++++++-- activiti-cloud-modeling/liquibase/pom.xml | 1 + activiti-cloud-modeling/pom.xml | 2 +- activiti-cloud-query/liquibase/pom.xml | 10 +++++++--- activiti-cloud-query/pom.xml | 2 +- example-cloud-connector/pom.xml | 2 +- example-runtime-bundle/pom.xml | 2 +- pom.xml | 7 ++++++- 10 files changed, 33 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index feb45ee46..aeccd26aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,6 +96,13 @@ jobs: - develop script: make promote + - name: Deploy Preview + stage: deploy_preview + if: type = pull_request AND head_branch =~ ^.*preview$ + script: | + mvn versions:set -DnewVersion=$(cat VERSION)-SNAPSHOT -DprocessAllModules=true -DgenerateBackupPoms=false || travis_terminate 1 + mvn clean deploy -pl activiti-cloud-dependencies/dependencies -am -DskipTests || travis_terminate 1 + notifications: slack: secure: J/ilLqmqXD7/4VpZZ3HxFrp5Ae6zJJuo6KjsxP5MN4kTxUhfAJvbrfoZfVioxsBX/qXGx/ckvq1WCzen13N+UrWcL+SiXBf9sTsiB4oB2O4mNV8COUAJThJxHvG6w1YFUYIFePD7s9Y6c+4idL5mLfzdthuzBcwn4lHM64iYcWFXqnOR0dJvChzZnbyrLYhOp5MJq9knDdiemKMNU7TI4sa+FTx4Uxj89/f0qKlw7Wd3cuvf1uSPOof+wy2r5ujPz3c5bvecXURcNUc2GLhNAv4TWMNrfY6jQCoCNC9pdmWHm2qcQjXmVqrM75527rOap9wuh1ZSk+fsh/ExiCUWMROB7An1I7Nqy0AdtjUXctuj0kGcjTyKEvVrUg8Eb0DLmFGANcmNvv28JTTokyM2AWx+Jma5ilDnNVZV1TCv++npFGaTMRSP9f3U3IKYDFzHdkjDRifvpQCrpp1Wj+RaGg8r1dRSyfG/3QoAGJ9CwlM1NxJY9SL7aR+aRLgQHSmdsWZWN+LL6ivLgu2OABjInZHDlzwLtDg1nHupbaxAb1lzxGPik52X5rZEkxUHiLHmCnyI94Yvf0L+jvM/Dko+ETGrTj4e1Qayv6ZxSU8ULsOV8gDeBcK5woaCTJsAzXvohz4vKl1YhZ5WP6vISz7sj/WetaPQyaBOLhfQnz+8O5k= diff --git a/activiti-cloud-acceptance-scenarios/pom.xml b/activiti-cloud-acceptance-scenarios/pom.xml index 0e4db297a..6cc068044 100644 --- a/activiti-cloud-acceptance-scenarios/pom.xml +++ b/activiti-cloud-acceptance-scenarios/pom.xml @@ -32,7 +32,7 @@ 11 1.${java.release} ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT 2.1.13 10.7.0 diff --git a/activiti-cloud-dependencies/pom.xml b/activiti-cloud-dependencies/pom.xml index 242c7c283..056d7df12 100755 --- a/activiti-cloud-dependencies/pom.xml +++ b/activiti-cloud-dependencies/pom.xml @@ -5,7 +5,7 @@ org.activiti.cloud activiti-cloud-build-parent - 7.1.608 + 0.0.1-PR-253-1563-SNAPSHOT activiti-cloud-dependencies-parent @@ -17,7 +17,7 @@ 1.${java.release} 3.0 ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT @@ -29,6 +29,11 @@ false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + activiti-releases https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases diff --git a/activiti-cloud-modeling/liquibase/pom.xml b/activiti-cloud-modeling/liquibase/pom.xml index 7ae7f3557..97a3d6ce8 100644 --- a/activiti-cloud-modeling/liquibase/pom.xml +++ b/activiti-cloud-modeling/liquibase/pom.xml @@ -15,6 +15,7 @@ 1.${java.release} ${java.release} 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT diff --git a/activiti-cloud-modeling/pom.xml b/activiti-cloud-modeling/pom.xml index 3d68076d8..8eb34ee9f 100644 --- a/activiti-cloud-modeling/pom.xml +++ b/activiti-cloud-modeling/pom.xml @@ -16,7 +16,7 @@ 11 1.${java.release} ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT diff --git a/activiti-cloud-query/liquibase/pom.xml b/activiti-cloud-query/liquibase/pom.xml index 7076aec5e..7dbbcdd7d 100644 --- a/activiti-cloud-query/liquibase/pom.xml +++ b/activiti-cloud-query/liquibase/pom.xml @@ -15,7 +15,7 @@ 11 1.${java.release} ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT @@ -37,8 +37,12 @@ - org.springframework.boot - spring-boot-starter-jdbc + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-starter-jdbc org.activiti.cloud diff --git a/activiti-cloud-query/pom.xml b/activiti-cloud-query/pom.xml index 8e7bf77fe..b4f82455d 100644 --- a/activiti-cloud-query/pom.xml +++ b/activiti-cloud-query/pom.xml @@ -16,7 +16,7 @@ 11 1.${java.release} ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT diff --git a/example-cloud-connector/pom.xml b/example-cloud-connector/pom.xml index 2de2b1336..6ee7c67f6 100644 --- a/example-cloud-connector/pom.xml +++ b/example-cloud-connector/pom.xml @@ -15,7 +15,7 @@ 11 1.${java.release} ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT diff --git a/example-runtime-bundle/pom.xml b/example-runtime-bundle/pom.xml index 30705b4ea..016613b2a 100644 --- a/example-runtime-bundle/pom.xml +++ b/example-runtime-bundle/pom.xml @@ -22,7 +22,7 @@ 11 1.${java.release} ${java.release} - 7.1.608 + 0.0.1-PR-253-1565-SNAPSHOT 0.33.0 diff --git a/pom.xml b/pom.xml index f75632194..9163acfa8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.8.RELEASE + 2.4.1 org.activiti.cloud @@ -82,6 +82,11 @@ false + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + activiti-releases https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases