From 859a1c4d599b82ea0bdaa6e84d88a0fb635f1349 Mon Sep 17 00:00:00 2001
From: Munilla Christophe <christophe.munilla@inria.fr>
Date: Tue, 7 Aug 2012 10:29:06 +0000
Subject: [PATCH] fix Jenkins integration server error : exclusions of not
 found dependencies (suite)

---
 frascati/nuxeo/fractal/pom.xml                |  9 ---
 .../examples/nuxeo/pom.xml                    |  3 +-
 .../examples/pom.xml                          | 61 +++++++++++++++++-
 .../frascati-implementation-nuxeo/pom.xml     | 16 ++---
 .../binding-frascati-side/pom.xml             | 21 +-----
 frascati/nuxeo/frascati-nuxeo/pom.xml         | 32 +---------
 .../nuxeo/frascati-service-bridge-api/pom.xml | 14 ----
 .../nuxeo/frascati-service-bridge/pom.xml     |  8 ---
 frascati/nuxeo/pom.xml                        | 64 +++++++++++++++++++
 9 files changed, 132 insertions(+), 96 deletions(-)

diff --git a/frascati/nuxeo/fractal/pom.xml b/frascati/nuxeo/fractal/pom.xml
index ebd847157..d02980b84 100644
--- a/frascati/nuxeo/fractal/pom.xml
+++ b/frascati/nuxeo/fractal/pom.xml
@@ -51,14 +51,6 @@
 	    <dependency>
 	      <groupId>org.nuxeo.runtime</groupId>
 	      <artifactId>nuxeo-runtime</artifactId>
-	      <version>${nuxeo.version}</version>
-	      <scope>provided</scope>
-	      <exclusions>	      			
-	      	<exclusion>
-	      		<groupId>org.osgi</groupId>
-	      		<artifactId>osgi-core</artifactId>
-	      	</exclusion>
-	      </exclusions>
 	    </dependency>
 	    <dependency>
 	    	<groupId>org.osgi</groupId>
@@ -70,7 +62,6 @@
     
     <modules>
         <module>fractal-bf-connectors-nuxeo</module>
-        <!--<module>juliac</module>-->
     </modules>
 
 
diff --git a/frascati/nuxeo/frascati-implementation-nuxeo/examples/nuxeo/pom.xml b/frascati/nuxeo/frascati-implementation-nuxeo/examples/nuxeo/pom.xml
index 6ad8bbe3b..c47664d13 100755
--- a/frascati/nuxeo/frascati-implementation-nuxeo/examples/nuxeo/pom.xml
+++ b/frascati/nuxeo/frascati-implementation-nuxeo/examples/nuxeo/pom.xml
@@ -90,9 +90,8 @@
     <dependency>
       <groupId>org.nuxeo.runtime</groupId>
       <artifactId>nuxeo-runtime-reload</artifactId>
-      <version>${nuxeo.version}</version>
     </dependency>
-
+    
     <!-- Nuxeo ECM Core Event Component. -->
     <dependency>
       <groupId>org.nuxeo.ecm.core</groupId>
diff --git a/frascati/nuxeo/frascati-implementation-nuxeo/examples/pom.xml b/frascati/nuxeo/frascati-implementation-nuxeo/examples/pom.xml
index 4d429ac41..2c4c0979d 100755
--- a/frascati/nuxeo/frascati-implementation-nuxeo/examples/pom.xml
+++ b/frascati/nuxeo/frascati-implementation-nuxeo/examples/pom.xml
@@ -66,6 +66,51 @@
   <!-- Dependencies -->
   <!-- ============ -->
 
+  <dependencyManagement>
+  		<dependencies> 
+		    <dependency>
+		      <groupId>org.nuxeo.runtime</groupId>
+		      <artifactId>nuxeo-runtime-reload</artifactId>
+		      <version>${nuxeo.version}</version>
+		      <scope>provided</scope>
+		      <exclusions>
+		      	<exclusion>
+		      		<groupId>org.osgi</groupId>
+		      		<artifactId>osgi-core</artifactId>
+		      	</exclusion>
+		      </exclusions>
+		    </dependency> 		
+			<dependency>
+		      <groupId>org.nuxeo.runtime</groupId>
+		      <artifactId>nuxeo-runtime-test</artifactId>
+		      <version>${nuxeo.version}</version>
+		      <scope>test</scope>
+		      <exclusions>
+		      	<exclusion>
+		      		<groupId>org.seleniumhq.selenium</groupId>
+		      		<artifactId>selenium-server-standalone</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>org.milyn</groupId>
+		      		<artifactId>milyn-magger</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>org.milyn</groupId>
+		      		<artifactId>flute</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>com.sun.xml</groupId>
+		      		<artifactId>xsom</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>org.osgi</groupId>
+		      		<artifactId>osgi-core</artifactId>
+		      	</exclusion>
+		      </exclusions>
+		    </dependency>
+        </dependencies>
+    </dependencyManagement>
+    
   <dependencies>
 
     <!-- OW2 FraSCAti SCA Implementation Nuxeo Module. -->
@@ -75,6 +120,13 @@
       <version>${project.version}</version>
     </dependency>
 	
+    <dependency>
+    	<groupId>org.osgi</groupId>
+    	<artifactId>org.osgi.core</artifactId>
+    	<version>4.2.0</version>
+    	<scope>provided</scope>
+    </dependency>
+    
     <!-- ============ -->
     <!-- For testing  -->
     <!-- ============ -->
@@ -99,10 +151,13 @@
     <dependency>
       <groupId>org.nuxeo.runtime</groupId>
       <artifactId>nuxeo-runtime-test</artifactId>
-      <version>${nuxeo.version}</version>
-      <scope>test</scope>
     </dependency>
-
+    <dependency>
+    	<groupId>org.osgi</groupId>
+    	<artifactId>org.osgi.core</artifactId>
+    	<version>4.2.0</version>
+    	<scope>provided</scope>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/frascati/nuxeo/frascati-implementation-nuxeo/pom.xml b/frascati/nuxeo/frascati-implementation-nuxeo/pom.xml
index 7f31dcb3a..da88cfe64 100755
--- a/frascati/nuxeo/frascati-implementation-nuxeo/pom.xml
+++ b/frascati/nuxeo/frascati-implementation-nuxeo/pom.xml
@@ -101,15 +101,13 @@
     <dependency>
       <groupId>org.nuxeo.runtime</groupId>
       <artifactId>nuxeo-runtime</artifactId>
-      <version>${nuxeo.version}</version>
-      <scope>provided</scope>
-      <exclusions>
-      	<exclusion>
-      		<groupId>org.osgi</groupId>
-      		<artifactId>osgi-core</artifactId>
-      	</exclusion>
-      </exclusions>
-    </dependency>
+    </dependency>	
+    <dependency>
+    	<groupId>org.osgi</groupId>
+    	<artifactId>org.osgi.core</artifactId>
+    	<version>4.2.0</version>
+    	<scope>provided</scope>
+    </dependency>	  
 
     <!-- ============ -->
     <!-- For testing  -->
diff --git a/frascati/nuxeo/frascati-nuxeo-test/binding-frascati-side/pom.xml b/frascati/nuxeo/frascati-nuxeo-test/binding-frascati-side/pom.xml
index b40882399..dc0b79490 100644
--- a/frascati/nuxeo/frascati-nuxeo-test/binding-frascati-side/pom.xml
+++ b/frascati/nuxeo/frascati-nuxeo-test/binding-frascati-side/pom.xml
@@ -34,24 +34,5 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    <!--
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.ow2.frascati.mojo</groupId>
-                <artifactId>frascati-compiler-plugin</artifactId>
-                <configuration>
-                    <composite>NuxeoBinder</composite>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.ow2.frascati.mojo</groupId>
-                <artifactId>frascati-test-compiler-plugin</artifactId>
-                <configuration>
-                    <composite>NuxeoBinder</composite>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-    -->
+
 </project>
diff --git a/frascati/nuxeo/frascati-nuxeo/pom.xml b/frascati/nuxeo/frascati-nuxeo/pom.xml
index c5867b7ac..356af8eb8 100644
--- a/frascati/nuxeo/frascati-nuxeo/pom.xml
+++ b/frascati/nuxeo/frascati-nuxeo/pom.xml
@@ -58,47 +58,17 @@
     <dependency>
       <groupId>org.nuxeo.runtime</groupId>
       <artifactId>nuxeo-runtime-bridge</artifactId>
-      <version>5.5-SNAPSHOT</version>
-      <scope>provided</scope>
-      <exclusions>
-      	<exclusion>
-      		<groupId>org.osgi</groupId>
-      		<artifactId>osgi-core</artifactId>
-      	</exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.nuxeo.runtime</groupId>
       <artifactId>nuxeo-runtime-test</artifactId>
-      <version>5.5</version>
       <scope>provided</scope>
-      <exclusions>
-      	<exclusion>
-      		<groupId>org.seleniumhq.selenium</groupId>
-      		<artifactId>selenium-server-standalone</artifactId>
-      	</exclusion>
-      	<exclusion>
-      		<groupId>org.milyn</groupId>
-      		<artifactId>milyn-magger</artifactId>
-      	</exclusion>
-      	<exclusion>
-      		<groupId>org.milyn</groupId>
-      		<artifactId>flute</artifactId>
-      	</exclusion>
-      	<exclusion>
-      		<groupId>com.sun.xml</groupId>
-      		<artifactId>xsom</artifactId>
-      	</exclusion>
-      	<exclusion>
-      		<groupId>org.osgi</groupId>
-      		<artifactId>osgi-core</artifactId>
-      	</exclusion>
-      </exclusions>
     </dependency>
     <dependency>
     	<groupId>org.osgi</groupId>
     	<artifactId>org.osgi.core</artifactId>
     	<version>4.2.0</version>
+    	<scope>provided</scope>
     </dependency>
 	<dependency>
 		<groupId>org.ow2.frascati.nuxeo</groupId>
diff --git a/frascati/nuxeo/frascati-service-bridge-api/pom.xml b/frascati/nuxeo/frascati-service-bridge-api/pom.xml
index ec01f8e5e..2c2d4348d 100644
--- a/frascati/nuxeo/frascati-service-bridge-api/pom.xml
+++ b/frascati/nuxeo/frascati-service-bridge-api/pom.xml
@@ -45,14 +45,6 @@
 	<dependency>
 		<groupId>org.nuxeo.runtime</groupId>
 		<artifactId>nuxeo-runtime</artifactId>
-		<version>${nuxeo.version}</version>
-		<scope>provided</scope>
-		<exclusions>			
-	      	<exclusion>
-	      		<groupId>org.osgi</groupId>
-	      		<artifactId>osgi-core</artifactId>
-	      	</exclusion>
-      </exclusions>
     </dependency>
     <dependency>
     	<groupId>org.osgi</groupId>
@@ -60,12 +52,6 @@
     	<version>4.2.0</version>
 		<scope>provided</scope>
     </dependency>
-		<dependency>
-			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
-			<version>4.2.0</version>
-			<scope>provided</scope>
-		</dependency>
   </dependencies>
   
 </project>
diff --git a/frascati/nuxeo/frascati-service-bridge/pom.xml b/frascati/nuxeo/frascati-service-bridge/pom.xml
index 90bbb4105..b96c88d50 100755
--- a/frascati/nuxeo/frascati-service-bridge/pom.xml
+++ b/frascati/nuxeo/frascati-service-bridge/pom.xml
@@ -24,14 +24,6 @@
 		<dependency>
 			<groupId>org.nuxeo.runtime</groupId>
 			<artifactId>nuxeo-runtime</artifactId>
-			<version>${nuxeo.version}</version>
-			<scope>provided</scope>
-	        <exclusions>	      			
-	      	  <exclusion>
-	      		<groupId>org.osgi</groupId>
-	      		<artifactId>osgi-core</artifactId>
-	      	  </exclusion>
-	        </exclusions>
 	    </dependency>
 	    <dependency>
 	    	<groupId>org.osgi</groupId>
diff --git a/frascati/nuxeo/pom.xml b/frascati/nuxeo/pom.xml
index e3dad2012..e70b4b4a4 100644
--- a/frascati/nuxeo/pom.xml
+++ b/frascati/nuxeo/pom.xml
@@ -258,6 +258,70 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+		      <groupId>org.nuxeo.runtime</groupId>
+		      <artifactId>nuxeo-runtime</artifactId>
+		      <version>${nuxeo.version}</version>
+		      <scope>provided</scope>
+		      <exclusions>
+		      	<exclusion>
+		      		<groupId>org.osgi</groupId>
+		      		<artifactId>osgi-core</artifactId>
+		      	</exclusion>
+		      </exclusions>
+		    </dependency>
+		    <dependency>
+		      <groupId>org.nuxeo.runtime</groupId>
+		      <artifactId>nuxeo-runtime-reload</artifactId>
+		      <version>${nuxeo.version}</version>
+		      <scope>provided</scope>
+		      <exclusions>
+		      	<exclusion>
+		      		<groupId>org.osgi</groupId>
+		      		<artifactId>osgi-core</artifactId>
+		      	</exclusion>
+		      </exclusions>
+		    </dependency>
+		    <dependency>
+		      <groupId>org.nuxeo.runtime</groupId>
+		      <artifactId>nuxeo-runtime-bridge</artifactId>
+		      <version>${nuxeo.version}-SNAPSHOT</version>
+		      <scope>provided</scope>
+		      <exclusions>
+		      	<exclusion>
+		      		<groupId>org.osgi</groupId>
+		      		<artifactId>osgi-core</artifactId>
+		      	</exclusion>
+		      </exclusions>
+		    </dependency>
+			<dependency>
+		      <groupId>org.nuxeo.runtime</groupId>
+		      <artifactId>nuxeo-runtime-test</artifactId>
+		      <version>${nuxeo.version}</version>
+		      <scope>test</scope>
+		      <exclusions>
+		      	<exclusion>
+		      		<groupId>org.seleniumhq.selenium</groupId>
+		      		<artifactId>selenium-server-standalone</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>org.milyn</groupId>
+		      		<artifactId>milyn-magger</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>org.milyn</groupId>
+		      		<artifactId>flute</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>com.sun.xml</groupId>
+		      		<artifactId>xsom</artifactId>
+		      	</exclusion>
+		      	<exclusion>
+		      		<groupId>org.osgi</groupId>
+		      		<artifactId>osgi-core</artifactId>
+		      	</exclusion>
+		      </exclusions>
+		    </dependency>
         </dependencies>
     </dependencyManagement>
 
-- 
GitLab