Commit 71593047 authored by Marta Różańska's avatar Marta Różańska
Browse files

Merge branch 'proactive-dev-tech' into 'proactive-dev'

updating version of proactive client  and connector to 1.5 and SAL to 3.6

See merge request !24
parents d072303a 607c4e52
Pipeline #15579 passed with stages
in 35 minutes and 14 seconds
......@@ -6,7 +6,7 @@
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>connectors</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<modules>
<module>proactive_client</module>
</modules>
......
......@@ -5,12 +5,12 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>cloud.morphemic.connectors</groupId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>proactive_client</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<properties>
<java.version>1.8</java.version>
......@@ -20,7 +20,7 @@
<dependency>
<groupId>org.activeeon</groupId>
<artifactId>scheduling-abstraction-layer</artifactId>
<version>3.5-SNAPSHOT</version>
<version>3.6-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -261,7 +261,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>1.4-SNAPSHOT</version>
<version>1.5-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.hibernate.validator</groupId>
......
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