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

Merge branch 'proactive-dev' into morph-rc15-sync

# Conflicts:
#	connectors/proactive_client/pom.xml
#	mule_esb/mule-integration/pom.xml
parents 01f4b52e de266da7
Pipeline #14581 passed with stages
in 4 minutes and 54 seconds
......@@ -6,7 +6,7 @@
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>connectors</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.3-SNAPSHOT</version>
<modules>
<module>proactive_client</module>
</modules>
......
......@@ -5,12 +5,12 @@
<parent>
<artifactId>connectors</artifactId>
<groupId>cloud.morphemic.connectors</groupId>
<version>1.2-SNAPSHOT</version>
<version>1.3-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>proactive_client</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.3-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.3-SNAPSHOT</version>
<version>3.4-SNAPSHOT</version>
</dependency>
</dependencies>
......
......@@ -261,7 +261,7 @@
<dependency>
<groupId>cloud.morphemic.connectors</groupId>
<artifactId>proactive_client</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.3-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