Skip to content
This repository was archived by the owner on Mar 17, 2020. It is now read-only.

Commit 7bb788a

Browse files
authored
Merge pull request #216 from Activiti/dev-almerico-ACTIVITI-3952
update activiti-core to activiti-notification service dependency
2 parents 8984f06 + 3167628 commit 7bb788a

File tree

3 files changed

+35
-13
lines changed

3 files changed

+35
-13
lines changed

.updatebot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ github:
22
organisations:
33
- name: activiti
44
repositories:
5-
- name: activiti-cloud-full-chart
5+
- name: activiti-cloud-dependencies
6+
branch: develop
67
useSinglePullRequest: true
7-

charts/activiti-cloud-notifications-graphql/Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,16 @@ endif
7272

7373
updatebot/push-version:
7474
@echo Resolving push versions for artifacts........
75-
$(eval ACTIVITI_CLOUD_DEPENDENCIES_VERSION=$(shell mvn help:evaluate -Dexpression=activiti-cloud-dependencies.version -q -DforceStdout -f ../../pom.xml))
75+
$(eval ACTIVITI_CLOUD_NOTIFICATIONS_SERVICE_VERSION=$(shell mvn help:evaluate -Dexpression=activiti-cloud-notifications-service-graphql.version -q -DforceStdout -f ../../pom.xml))
7676

7777
@echo Doing updatebot push-version.....
78+
cd ../../ && updatebot push-version --kind maven activiti-cloud-notifications-service-graphql.version $(ACTIVITI_CLOUD_NOTIFICATIONS_SERVICE_VERSION)
79+
cd ../../ && updatebot push-version --kind make ACTIVITI_CLOUD_NOTIFICATIONS_VERSION $(RELEASE_VERSION)
80+
81+
cd ../../ && rm -rf .updatebot-repos/
7882
sleep $$[ ( $$RANDOM % 10 ) + 1 ]s
79-
cd ../../ && updatebot push-version --kind helm $(RELEASE_ARTIFACT) $(RELEASE_VERSION)
80-
cd ../../ && updatebot push-version --kind make NOTIFICATIONS_ACTIVITI_CLOUD_DEPENDENCIES_VERSION $(ACTIVITI_CLOUD_DEPENDENCIES_VERSION)
83+
84+
cd ../../ && updatebot push-version --kind maven activiti-cloud-notifications-service-graphql.version $(ACTIVITI_CLOUD_NOTIFICATIONS_SERVICE_VERSION)
85+
cd ../../ && updatebot push-version --kind make ACTIVITI_CLOUD_NOTIFICATIONS_VERSION $(RELEASE_VERSION)
86+
8187

pom.xml

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</scm>
2323
<properties>
2424
<java.version>11</java.version>
25-
<activiti-cloud-dependencies.version>7.1.172</activiti-cloud-dependencies.version>
25+
<activiti-cloud-notifications-service-graphql.version>7.1.115</activiti-cloud-notifications-service-graphql.version>
2626
<maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
2727
<maven-failsafe-plugin.version>3.0.0-M3</maven-failsafe-plugin.version>
2828
<maven-surefire-plugin.version>3.0.0-M3</maven-surefire-plugin.version>
@@ -31,12 +31,12 @@
3131
<dependencyManagement>
3232
<dependencies>
3333
<dependency>
34-
<groupId>org.activiti.cloud.dependencies</groupId>
35-
<artifactId>activiti-cloud-dependencies</artifactId>
36-
<version>${activiti-cloud-dependencies.version}</version>
37-
<scope>import</scope>
38-
<type>pom</type>
39-
</dependency>
34+
<groupId>org.activiti.cloud.notifications.graphql</groupId>
35+
<artifactId>activiti-cloud-notifications-graphql-dependencies</artifactId>
36+
<version>${activiti-cloud-notifications-service-graphql.version}</version>
37+
<scope>import</scope>
38+
<type>pom</type>
39+
</dependency>
4040
</dependencies>
4141
</dependencyManagement>
4242
<dependencies>
@@ -76,7 +76,23 @@
7676
<dependency>
7777
<groupId>org.springframework.cloud</groupId>
7878
<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
79-
</dependency>
79+
</dependency>
80+
<!-- Marker Pom for Dependency Conversion Validation -->
81+
<dependency>
82+
<groupId>org.activiti.cloud.notifications.graphql</groupId>
83+
<artifactId>activiti-cloud-notifications-graphql-dependencies</artifactId>
84+
<version>${activiti-cloud-notifications-service-graphql.version}</version>
85+
<type>pom</type>
86+
</dependency>
87+
88+
<dependency>
89+
<groupId>org.springframework.boot</groupId>
90+
<artifactId>spring-boot-starter-parent</artifactId>
91+
<version>${project.parent.version}</version>
92+
<type>pom</type>
93+
</dependency>
94+
<!-- Marker Pom for Dependency Conversion Validation -->
95+
8096
</dependencies>
8197
<build>
8298
<plugins>

0 commit comments

Comments
 (0)