Author: marrs
Date: Thu Apr 21 16:38:50 2011
New Revision: 1095774
URL: http://svn.apache.org/viewvc?rev=1095774&view=rev
Log:
Freed the pom from its direct parent.
Updated the dependencies to include a reference to the Eclipse Shell API.
Modified:
felix/trunk/dependencymanager/compat/pom.xml
felix/trunk/dependencymanager/runtime/pom.xml
felix/trunk/dependencymanager/shell/DEPENDENCIES
Modified: felix/trunk/dependencymanager/compat/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/compat/pom.xml?rev=1095774&r1=1095773&r2=1095774&view=diff
==============================================================================
--- felix/trunk/dependencymanager/compat/pom.xml (original)
+++ felix/trunk/dependencymanager/compat/pom.xml Thu Apr 21 16:38:50 2011
@@ -19,11 +19,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>dependencymanager-reactor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
+ <properties>
+
<felix.dependencymanager.version>3.0.0-SNAPSHOT</felix.dependencymanager.version>
+ <osgi.version>4.2.0</osgi.version>
+ <pax.exam.version>1.2.0</pax.exam.version>
+ </properties>
+
<name>Apache Felix Dependency Manager Compatibility</name>
<artifactId>org.apache.felix.dependencymanager.compat</artifactId>
<packaging>bundle</packaging>
@@ -32,19 +39,31 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.version}</version>
</dependency>
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>${felix.dependencymanager.version}</version>
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
Modified: felix/trunk/dependencymanager/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/runtime/pom.xml?rev=1095774&r1=1095773&r2=1095774&view=diff
==============================================================================
--- felix/trunk/dependencymanager/runtime/pom.xml (original)
+++ felix/trunk/dependencymanager/runtime/pom.xml Thu Apr 21 16:38:50 2011
@@ -19,11 +19,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>dependencymanager-reactor</artifactId>
- <version>3.0.0-SNAPSHOT</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
+ <properties>
+
<felix.dependencymanager.version>3.0.0-SNAPSHOT</felix.dependencymanager.version>
+ <osgi.version>4.2.0</osgi.version>
+ <pax.exam.version>1.2.0</pax.exam.version>
+ </properties>
+
<name>Apache Felix Dependency Manager Runtime</name>
<artifactId>org.apache.felix.dependencymanager.runtime</artifactId>
<packaging>bundle</packaging>
@@ -32,25 +39,37 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.version}</version>
</dependency>
-
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
+ <version>${felix.dependencymanager.version}</version>
</dependency>
-
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<scope>provided</scope>
+ <version>20070829</version>
</dependency>
</dependencies>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+
<artifactId>maven-bundle-plugin</artifactId>
+ <version>1.4.0</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: felix/trunk/dependencymanager/shell/DEPENDENCIES
URL:
http://svn.apache.org/viewvc/felix/trunk/dependencymanager/shell/DEPENDENCIES?rev=1095774&r1=1095773&r2=1095774&view=diff
==============================================================================
--- felix/trunk/dependencymanager/shell/DEPENDENCIES (original)
+++ felix/trunk/dependencymanager/shell/DEPENDENCIES Thu Apr 21 16:38:50 2011
@@ -17,8 +17,10 @@ Copyright (c) OSGi Alliance (2000, 2009)
Licensed under the Apache License 2.0.
This product uses software developed at
-The Eclipse ... TODO
+The Eclipse Foundation (http://www.eclipse.org/).
+Licensed under the Eclipse Public License 1.0.
III. Overall License Summary
- Apache License 2.0
+- Eclipse Public License 1.0
