Skip to content
This repository has been archived by the owner on Jul 12, 2023. It is now read-only.

fix(GH-3229): Update Activiti Cloud Application to Spring Boot 2.4.1 #220

Merged
merged 19 commits into from
Jan 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
35250bd
fix: update activiti.cloud-version to 0.0.1-PR-249-1464-SNAPSHOT
igdianov Dec 15, 2020
4850e83
fix: Update to Spring Boot 2.4.1
igdianov Dec 15, 2020
31dade4
fix: update activiti-cloud-build-parent version to 0.0.1-PR-249-1464-…
igdianov Dec 15, 2020
84a9f66
fix(build): add spring-milestones repository
igdianov Dec 15, 2020
027473d
fix: update activiti-cloud.version to 0.0.1-PR-249-1468-SNAPSHOT
igdianov Dec 16, 2020
8b1dd3b
fix(version): update activiti-cloud.version to 0.0.1-PR-253-1493-SNAP…
igdianov Dec 22, 2020
50104f6
fix: update activiti-cloud-build-parent version to 0.0.1-PR-253-1493-…
igdianov Dec 22, 2020
a8f3a4f
Fix formatting
erdemedeiros Dec 22, 2020
93df53e
Deploy preview
erdemedeiros Dec 22, 2020
cbf48dc
fix(version): update activiti-cloud.version to 0.0.1-PR-253-1497-SNAP…
igdianov Dec 23, 2020
3ce79e6
fix: disable helm delete
igdianov Dec 23, 2020
bdb115c
Re-enable environment delete
erdemedeiros Dec 23, 2020
b729346
fix: re-enable docker delete
igdianov Dec 23, 2020
64c2453
fix: update activiti-cloud.version to 0.0.1-PR-253-1553-SNAPSHOT
igdianov Dec 31, 2020
06e9e7a
fix: update activiti-cloud.version for query and modeling liquibase 0…
igdianov Dec 31, 2020
3f5a3ee
Revert "Re-enable environment delete"
erdemedeiros Dec 23, 2020
c96b478
Revert "Revert "Re-enable environment delete""
erdemedeiros Dec 23, 2020
89fb3da
fix(version): update activiti-cloud.version to 0.0.1-PR-253-1563-SNAP…
igdianov Jan 8, 2021
480b87d
Update activiti-cloud preview to 0.0.1-PR-253-1565-SNAPSHOT
erdemedeiros Jan 12, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=
2 changes: 1 addition & 1 deletion activiti-cloud-acceptance-scenarios/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<java.release>11</java.release>
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
<serenity-maven-plugin.version>2.1.13</serenity-maven-plugin.version>
<feign.version>10.7.0</feign.version>
</properties>
Expand Down
9 changes: 7 additions & 2 deletions activiti-cloud-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.activiti.cloud</groupId>
<artifactId>activiti-cloud-build-parent</artifactId>
<version>7.1.608</version>
<version>0.0.1-PR-253-1563-SNAPSHOT</version>
<relativePath/>
</parent>
<artifactId>activiti-cloud-dependencies-parent</artifactId>
Expand All @@ -17,7 +17,7 @@
<java.version>1.${java.release}</java.version>
<license-maven-plugin.version>3.0</license-maven-plugin.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
</properties>
<repositories>
<repository>
Expand All @@ -29,6 +29,11 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</repository>
Comment on lines +32 to +36
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed now.

<repository>
<id>activiti-releases</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases</url>
Expand Down
1 change: 1 addition & 0 deletions activiti-cloud-modeling/liquibase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-modeling/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<java.release>11</java.release>
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
10 changes: 7 additions & 3 deletions activiti-cloud-query/liquibase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<java.release>11</java.release>
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
</properties>
<dependencyManagement>
<dependencies>
Expand All @@ -37,8 +37,12 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.activiti.cloud</groupId>
Expand Down
2 changes: 1 addition & 1 deletion activiti-cloud-query/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<java.release>11</java.release>
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion example-cloud-connector/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<java.release>11</java.release>
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
</properties>
<dependencyManagement>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion example-runtime-bundle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<java.release>11</java.release>
<java.version>1.${java.release}</java.version>
<maven.compiler.release>${java.release}</maven.compiler.release>
<activiti-cloud.version>7.1.608</activiti-cloud.version>
<activiti-cloud.version>0.0.1-PR-253-1565-SNAPSHOT</activiti-cloud.version>
<docker-maven-plugin.version>0.33.0</docker-maven-plugin.version>
</properties>
<dependencyManagement>
Expand Down
7 changes: 6 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.2.8.RELEASE</version>
<version>2.4.1</version>
<relativePath/>
</parent>
<groupId>org.activiti.cloud</groupId>
Expand Down Expand Up @@ -82,6 +82,11 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>spring-milestones</id>
<name>Spring Milestones</name>
<url>https://repo.spring.io/milestone</url>
</repository>
Comment on lines +85 to +89
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be removed.

<repository>
<id>activiti-releases</id>
<url>https://artifacts.alfresco.com/nexus/content/repositories/activiti-releases</url>
Expand Down