Commit 859a1c4d authored by Munilla Christophe's avatar Munilla Christophe

fix Jenkins integration server error : exclusions of not found dependencies (suite)

parent 86c5c770
...@@ -51,14 +51,6 @@ ...@@ -51,14 +51,6 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime</artifactId> <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> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
...@@ -70,7 +62,6 @@ ...@@ -70,7 +62,6 @@
<modules> <modules>
<module>fractal-bf-connectors-nuxeo</module> <module>fractal-bf-connectors-nuxeo</module>
<!--<module>juliac</module>-->
</modules> </modules>
......
...@@ -90,9 +90,8 @@ ...@@ -90,9 +90,8 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-reload</artifactId> <artifactId>nuxeo-runtime-reload</artifactId>
<version>${nuxeo.version}</version>
</dependency> </dependency>
<!-- Nuxeo ECM Core Event Component. --> <!-- Nuxeo ECM Core Event Component. -->
<dependency> <dependency>
<groupId>org.nuxeo.ecm.core</groupId> <groupId>org.nuxeo.ecm.core</groupId>
......
...@@ -66,6 +66,51 @@ ...@@ -66,6 +66,51 @@
<!-- Dependencies --> <!-- 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> <dependencies>
<!-- OW2 FraSCAti SCA Implementation Nuxeo Module. --> <!-- OW2 FraSCAti SCA Implementation Nuxeo Module. -->
...@@ -75,6 +120,13 @@ ...@@ -75,6 +120,13 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
<!-- ============ --> <!-- ============ -->
<!-- For testing --> <!-- For testing -->
<!-- ============ --> <!-- ============ -->
...@@ -99,10 +151,13 @@ ...@@ -99,10 +151,13 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-test</artifactId> <artifactId>nuxeo-runtime-test</artifactId>
<version>${nuxeo.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -101,15 +101,13 @@ ...@@ -101,15 +101,13 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime</artifactId> <artifactId>nuxeo-runtime</artifactId>
<version>${nuxeo.version}</version> </dependency>
<scope>provided</scope> <dependency>
<exclusions> <groupId>org.osgi</groupId>
<exclusion> <artifactId>org.osgi.core</artifactId>
<groupId>org.osgi</groupId> <version>4.2.0</version>
<artifactId>osgi-core</artifactId> <scope>provided</scope>
</exclusion> </dependency>
</exclusions>
</dependency>
<!-- ============ --> <!-- ============ -->
<!-- For testing --> <!-- For testing -->
......
...@@ -34,24 +34,5 @@ ...@@ -34,24 +34,5 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </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> </project>
...@@ -58,47 +58,17 @@ ...@@ -58,47 +58,17 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-bridge</artifactId> <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>
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-test</artifactId> <artifactId>nuxeo-runtime-test</artifactId>
<version>5.5</version>
<scope>provided</scope> <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>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>org.osgi.core</artifactId>
<version>4.2.0</version> <version>4.2.0</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ow2.frascati.nuxeo</groupId> <groupId>org.ow2.frascati.nuxeo</groupId>
......
...@@ -45,14 +45,6 @@ ...@@ -45,14 +45,6 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime</artifactId> <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> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
...@@ -60,12 +52,6 @@ ...@@ -60,12 +52,6 @@
<version>4.2.0</version> <version>4.2.0</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
</dependencies> </dependencies>
</project> </project>
...@@ -24,14 +24,6 @@ ...@@ -24,14 +24,6 @@
<dependency> <dependency>
<groupId>org.nuxeo.runtime</groupId> <groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime</artifactId> <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> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
......
...@@ -258,6 +258,70 @@ ...@@ -258,6 +258,70 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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> </dependencies>
</dependencyManagement> </dependencyManagement>
......
Markdown is supported
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