From a8ef3a3f4229c5c3f28074b33952d080ba09921c Mon Sep 17 00:00:00 2001
From: Gwenael Cattez <Gwenael.Cattez@inria.fr>
Date: Thu, 1 Dec 2011 14:17:05 +0000
Subject: [PATCH] <frascati-binding-jms> : Setting dependency
 jgroups:jgroups-all:jar:2.2.8 to org.jgroups:jgroups:jar:2.12.1.Final to
 avoid conflict with <frascati-binding-jgroups> Add property <jgroups.version>
 to prevent that king of conflicts

---
 frascati/modules/frascati-binding-jms/pom.xml     | 12 ++++++++++++
 .../module-gcs/frascati-binding-jgroups/pom.xml   | 15 +++++++++++++--
 pom.xml                                           |  1 +
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/frascati/modules/frascati-binding-jms/pom.xml b/frascati/modules/frascati-binding-jms/pom.xml
index c2323d2c2..8b21d2496 100755
--- a/frascati/modules/frascati-binding-jms/pom.xml
+++ b/frascati/modules/frascati-binding-jms/pom.xml
@@ -154,6 +154,18 @@
       <groupId>org.objectweb.joram</groupId>
       <artifactId>jndi-client</artifactId>
       <version>${joram.version}</version>
+      	<exclusions>
+      		<exclusion>
+      			<groupId>jgroups</groupId>
+      			<artifactId>jgroups-all</artifactId>
+      		</exclusion>
+      	</exclusions>
+    </dependency>
+    
+     <dependency>
+    	<groupId>org.jgroups</groupId>
+    	<artifactId>jgroups</artifactId>
+    	<version>${jgroups.version}</version>
     </dependency>
     
     <dependency>
diff --git a/frascati/modules/module-gcs/frascati-binding-jgroups/pom.xml b/frascati/modules/module-gcs/frascati-binding-jgroups/pom.xml
index 208eccfbc..17b6d36f8 100644
--- a/frascati/modules/module-gcs/frascati-binding-jgroups/pom.xml
+++ b/frascati/modules/module-gcs/frascati-binding-jgroups/pom.xml
@@ -92,7 +92,18 @@
       <artifactId>frascati-component-factory-julia</artifactId>
       <version>${project.version}</version>
     </dependency>
-    
+
+	<dependency>
+		<groupId>org.objectweb.monolog</groupId>
+		<artifactId>monolog</artifactId>
+		<version>2.1.12</version>
+	</dependency>
+	
+	<dependency>
+		<groupId>asm</groupId>
+		<artifactId>asm</artifactId>
+		<version>3.1</version>
+	</dependency>
 
     <!-- OW2 FraSCAti Group Communication Metamodel Module. -->
     <dependency>
@@ -104,7 +115,7 @@
     <dependency>
     	<groupId>org.jgroups</groupId>
     	<artifactId>jgroups</artifactId>
-    	<version>2.12.1.Final</version>
+    	<version>${jgroups.version}</version>
     </dependency>
 
     <!-- TODO: remove this dependency to OW2 Fractal Julia. -->
diff --git a/pom.xml b/pom.xml
index f80119b5d..25966bc09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,6 +317,7 @@
       <xerces.version>2.9.1</xerces.version>
       <jaxb.version>2.1.13</jaxb.version>
       <velocity.version>1.7</velocity.version>
+      <jgroups.version>2.12.1.Final</jgroups.version>
       <jaxb2.version>0.6.0</jaxb2.version>
     </properties>
 
-- 
GitLab