Commit 9e845fa7 authored by Philippe Merle's avatar Philippe Merle
Browse files

for pom.xml:

* commented module nuxeo to avoid continuous integration errors.
* removed dependency management.
* excludes Eclipse jars related to OSGi from FraSCAti dependencies.
* removed the dependency to the OSGi artifact.

for runnable/pom.xml:
* added a dependency to artifact nuxeo-runtime-test excluding some dependencies.
* added a dependency to the OSGi artifact.
parent 0f41646b
......@@ -23,7 +23,7 @@
*
* Author: Philippe Merle
*
* Contributor(s):
* Contributor(s): Christophe Munilla
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
......@@ -50,7 +50,9 @@
<!-- ============ -->
<modules>
<!-- Commented to avoid errors with Inria Jenkins continuous integration.
<module>nuxeo</module>
-->
<module>runnable</module>
</modules>
......@@ -66,67 +68,6 @@
<!-- 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>
<dependency>
<groupId>org.nuxeo.ecm.core</groupId>
<artifactId>nuxeo-core-event</artifactId>
<version>${nuxeo.version}</version>
<scope>compile</scope>
<exclusions>
<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. -->
......@@ -134,15 +75,22 @@
<groupId>org.ow2.frascati.nuxeo</groupId>
<artifactId>frascati-implementation-nuxeo</artifactId>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
<!-- ============ -->
<!-- For testing -->
<!-- ============ -->
......@@ -161,14 +109,29 @@
<artifactId>frascati-runtime-factory</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.eclipse</groupId>
<artifactId>osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Nuxeo Runtime Testing Framework. -->
<dependency>
<groupId>org.nuxeo.runtime</groupId>
<artifactId>nuxeo-runtime-test</artifactId>
<version>${nuxeo.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
......@@ -42,4 +42,41 @@
<name>OW2 FraSCAti: Runnable Nuxeo Component Example</name>
<artifactId>runnable-nuxeo-component</artifactId>
<dependencies>
<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>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
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