You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2009/09/30 23:05:27 UTC
svn commit: r820449 - in /felix/trunk: bundlerepository/pom.xml
framework/pom.xml main/pom.xml shell.tui/pom.xml shell/pom.xml
Author: pauls
Date: Wed Sep 30 21:05:27 2009
New Revision: 820449
URL: http://svn.apache.org/viewvc?rev=820449&view=rev
Log:
Modify framework, main, shell, shell.tui, and obr to depend on official OSGi JAR files (FELIX-1617)
Modified:
felix/trunk/bundlerepository/pom.xml
felix/trunk/framework/pom.xml
felix/trunk/main/pom.xml
felix/trunk/shell.tui/pom.xml
felix/trunk/shell/pom.xml
Modified: felix/trunk/bundlerepository/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/pom.xml?rev=820449&r1=820448&r2=820449&view=diff
==============================================================================
--- felix/trunk/bundlerepository/pom.xml (original)
+++ felix/trunk/bundlerepository/pom.xml Wed Sep 30 21:05:27 2009
@@ -46,11 +46,16 @@
<version>2.2.2</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.0.0</version>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>4.1.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=820449&r1=820448&r2=820449&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Wed Sep 30 21:05:27 2009
@@ -30,14 +30,14 @@
<version>2.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.2.0</version>
<exclusions>
<exclusion>
<groupId>${pom.groupId}</groupId>
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=820449&r1=820448&r2=820449&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Wed Sep 30 21:05:27 2009
@@ -35,11 +35,11 @@
<version>2.1.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
@@ -50,11 +50,11 @@
<version>1.5.0-SNAPSHOT</version>
<exclusions>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
<exclusion>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
</exclusions>
@@ -88,6 +88,14 @@
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.service.obr</artifactId>
</exclusion>
Modified: felix/trunk/shell.tui/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell.tui/pom.xml?rev=820449&r1=820448&r2=820449&view=diff
==============================================================================
--- felix/trunk/shell.tui/pom.xml (original)
+++ felix/trunk/shell.tui/pom.xml Wed Sep 30 21:05:27 2009
@@ -31,9 +31,9 @@
<artifactId>org.apache.felix.shell.tui</artifactId>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
Modified: felix/trunk/shell/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/shell/pom.xml?rev=820449&r1=820448&r2=820449&view=diff
==============================================================================
--- felix/trunk/shell/pom.xml (original)
+++ felix/trunk/shell/pom.xml Wed Sep 30 21:05:27 2009
@@ -30,14 +30,14 @@
<version>1.5.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.1.0</version>
</dependency>
<dependency>
- <groupId>${pom.groupId}</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>4.0.0</version>
</dependency>
</dependencies>
<build>