Author: rickhall
Date: Mon May 24 19:03:10 2010
New Revision: 947765
URL: http://svn.apache.org/viewvc?rev=947765&view=rev
Log:
Modified gogo modules to use org.apache.felix groupId. (FELIX-2334)
Modified:
felix/trunk/gogo/pom.xml
felix/trunk/gogo/runtime/pom.xml
felix/trunk/gogo/shell/pom.xml
Modified: felix/trunk/gogo/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/pom.xml?rev=947765&r1=947764&r2=947765&view=diff
==============================================================================
--- felix/trunk/gogo/pom.xml (original)
+++ felix/trunk/gogo/pom.xml Mon May 24 19:03:10 2010
@@ -27,69 +27,24 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
<name>Apache Felix Gogo</name>
- <description>Apache Felix Gogo Bundles</description>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>gogo</artifactId>
+ <description>Apache Felix Gogo Subproject</description>
+ <artifactId>gogo-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<modules>
<module>runtime</module>
<module>shell</module>
- <module>commands</module>
- <module>felixcommands</module>
+ <module>command</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>2.0.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>1.4.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>1.2.0</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.foundation</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>org.apache.felix.gogo.runtime</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>org.apache.felix.gogo.console</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>org.apache.felix.gogo.launcher</artifactId>
- <version>${pom.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
Modified: felix/trunk/gogo/runtime/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/runtime/pom.xml?rev=947765&r1=947764&r2=947765&view=diff
==============================================================================
--- felix/trunk/gogo/runtime/pom.xml (original)
+++ felix/trunk/gogo/runtime/pom.xml Mon May 24 19:03:10 2010
@@ -18,8 +18,8 @@
-->
<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";>
<parent>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>gogo</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>gogo-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,13 +29,15 @@
<version>0.5.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: felix/trunk/gogo/shell/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/gogo/shell/pom.xml?rev=947765&r1=947764&r2=947765&view=diff
==============================================================================
--- felix/trunk/gogo/shell/pom.xml (original)
+++ felix/trunk/gogo/shell/pom.xml Mon May 24 19:03:10 2010
@@ -18,8 +18,8 @@
-->
<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";>
<parent>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>gogo</artifactId>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>gogo-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,18 +29,21 @@
<version>0.5.0-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <version>4.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.felix.gogo</groupId>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.gogo.runtime</artifactId>
+ <version>${pom.version}</version>
</dependency>
</dependencies>
<build>
