Commit 7b9765a1 authored by Munilla Christophe's avatar Munilla Christophe

- osgi core artifact is already provided by the osgi parent project : comment...

- osgi core artifact is already provided by the osgi parent project : comment the dependencies in its sub projects
- fix the version of the jboss-logging artifact in the jboss-util module
- add frascati-web-explorer directory (copied at the compilation time) to the svn ignore list
parent abae54f6
......@@ -41,15 +41,18 @@
<packaging>jar</packaging>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
-->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
......
......@@ -49,11 +49,13 @@
<artifactId>fractal-bf-connectors-common</artifactId>
<version>${fractal-bf.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
-->
<!-- tests -->
<dependency>
<groupId>junit</groupId>
......
......@@ -46,11 +46,13 @@
</modules>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
-->
</dependencies>
</project>
......@@ -45,11 +45,13 @@
<name>OW2 FraSCAti OSGi : Runtime Light for FraSCAti in OSGi</name>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
-->
<dependency>
<groupId>org.objectweb.fractal.juliac.osgi</groupId>
<artifactId>juliac-osgi-runtime-core</artifactId>
......
......@@ -40,12 +40,14 @@
<packaging>jar</packaging>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.ow2.frascati.osgi</groupId>
<artifactId>bundle-frascati-api</artifactId>
......
......@@ -38,7 +38,7 @@
<name>FraSCAti in OSGi Core Bundle</name>
<properties>
<frascati.modules.basedir>../../../../../FraSCAti/frascati/modules</frascati.modules.basedir>
<frascati.modules.basedir>../../../../../modules</frascati.modules.basedir>
</properties>
<dependencies>
......
......@@ -40,12 +40,14 @@
<packaging>pom</packaging>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.ow2.frascati.osgi</groupId>
<artifactId>frascati-osgi-util</artifactId>
......
......@@ -46,12 +46,14 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
<build>
......
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.0.0.CR1</version>
<version>3.0.0.Beta3</version>
<scope>runtime</scope>
</dependency>
<dependency>
......
......@@ -42,12 +42,14 @@
<url>http://maven.apache.org</url>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
......
......@@ -41,12 +41,14 @@
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
......
......@@ -45,11 +45,13 @@
<artifactId>frascati-osgi-resources</artifactId>
<version>${project.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
</project>
......@@ -46,11 +46,13 @@
<version>${project.version}</version>
<scope>compile</scope>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
</project>
\ No newline at end of file
......@@ -41,12 +41,14 @@
<packaging>jar</packaging>
<dependencies>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
-->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.enterprise</artifactId>
......
......@@ -50,11 +50,13 @@
<artifactId>jdepend</artifactId>
<version>2.9.1</version>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.2.0</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
</project>
......@@ -65,12 +65,14 @@
<version>${juliac.version}</version>
<scope>provided</scope>
</dependency>
<!--
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<scope>provided</scope>
</dependency>
-->
</dependencies>
<build>
......
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