Skip to content
GitLab
Commit 1cb0dcc7 authored by Jan Marchel's avatar Jan Marchel
Browse files

Merge remote-tracking branch 'origin/proactive-dev-2.5' into edge-support 

# Conflicts:
#	adapter/pom.xml
#	cp_generator/pom.xml
#	gui-backend/pom.xml
#	melodic-cache/pom.xml
#	melodic-commons/pom.xml
parents 5db4beea 913e6e38
Pipeline #21103 passed with stages
in 3 minutes and 13 seconds
Expand all Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ 1cb0dcc7
This diff is collapsed.
adapter/pom.xml
View file @ 1cb0dcc7
......@@ -188,7 +188,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>2.5-20220421.141237-9</version>
<version>2.6-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.github.cloudiator.client</groupId>
......
cp_generator/pom.xml
View file @ 1cb0dcc7
......@@ -173,7 +173,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</dependency>
</dependencies>
......
gui-backend/pom.xml
View file @ 1cb0dcc7
......@@ -7,7 +7,7 @@
<parent>
<artifactId>upperware</artifactId>
<groupId>org.ow2.paasage</groupId>
<version>4.5.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<groupId>eu.melodic</groupId>
......@@ -17,7 +17,7 @@
<properties>
<java.version>1.8</java.version>
<cdo.version>3.1.0-SNAPSHOT</cdo.version>
<upperware.version>4.5.0-SNAPSHOT</upperware.version>
<upperware.version>5.0.0-SNAPSHOT</upperware.version>
<!--DOCKER plugin properties-->
<docker.imageName>gui-backend</docker.imageName>
</properties>
......@@ -118,22 +118,10 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>2.5-20220421.141237-9</version>
</dependency>
<dependency>
<groupId>org.ow2.paasage</groupId>
<artifactId>melodic-commons</artifactId>
</dependency>
<dependency>
<groupId>org.activeeon</groupId>
<artifactId>scheduling-abstraction-layer</artifactId>
<version>4.5-SNAPSHOT</version>
<scope>compile</scope>
<version>2.6-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<finalName>${project.artifactId}</finalName>
<plugins>
......
melodic-cache/pom.xml
View file @ 1cb0dcc7
......@@ -39,7 +39,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>2.1-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>com.squareup.okio</groupId>
......
melodic-commons/pom.xml
View file @ 1cb0dcc7
......@@ -7,7 +7,7 @@
<parent>
<groupId>org.ow2.paasage</groupId>
<artifactId>upperware</artifactId>
<version>4.5.0-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<artifactId>melodic-commons</artifactId>
......@@ -100,7 +100,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>2.5-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
......
mq-http-adapter/pom.xml
View file @ 1cb0dcc7
......@@ -74,7 +74,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>2.0-SNAPSHOT</version>
<version>2.6-SNAPSHOT</version>
</dependency>
</dependencies>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment