Modified these subprojects to use the new Maven bundle plugin.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@470535 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index 4ef4d1b..4be7766 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -23,41 +23,38 @@
<version>0.8.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>osgi-bundle</packaging>
- <name>Apache Felix Shell Text Interface</name>
+ <packaging>bundle</packaging>
+ <name>Apache Felix Shell TUI</name>
+ <description>A simple textual user interface for Felix' shell service.</description>
<artifactId>org.apache.felix.shell.tui</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${pom.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<version>${pom.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix.plugins</groupId>
- <artifactId>maven-osgi-plugin</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <osgiManifest>
- <bundleName>ShellTUI</bundleName>
- <bundleDescription>A simple textual user interface for Felix' shell service.</bundleDescription>
- <bundleActivator>auto-detect</bundleActivator>
- <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
- <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
- <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
- <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
- <importService>org.apache.felix.shell.ShellService</importService>
- </osgiManifest>
+ <instructions>
+ <Private-Package>org.apache.felix.shell.tui.*</Private-Package>
+ <Bundle-Activator>org.apache.felix.shell.tui.Activator</Bundle-Activator>
+ <Bundle-DocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</Bundle-DocUrl>
+ <Bundle-Url>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</Bundle-Url>
+ <Bundle-Source>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</Bundle-Source>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Import-Service>org.apache.felix.shell.ShellService</Import-Service>
+ </instructions>
</configuration>
</plugin>
</plugins>