updated tui to use the maven osgi plugin instead of using the jar plugin with manifest splicing
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@383754 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.shell.tui/pom.xml b/org.apache.felix.shell.tui/pom.xml
index bfe5e44..74f77f3 100644
--- a/org.apache.felix.shell.tui/pom.xml
+++ b/org.apache.felix.shell.tui/pom.xml
@@ -5,30 +5,41 @@
<version>0.8-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <packaging>jar</packaging>
- <name>Apache Felix Shell Text Based UI</name>
+ <packaging>osgi-bundle</packaging>
+ <name>Apache Felix Shell Text Interface</name>
<artifactId>org.apache.felix.shell.tui</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi</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.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <groupId>org.apache.felix.plugins</groupId>
+ <artifactId>maven-osgi-plugin</artifactId>
+ <version>${pom.version}</version>
+ <extensions>true</extensions>
<configuration>
- <archive>
- <manifestFile>src/main/resources/Manifest.mf</manifestFile>
- </archive>
+ <osgiManifest>
+ <bundleName>ShellTUI</bundleName>
+ <bundleDescription>A simple textual user interface for Felix' shell service.</bundleDescription>
+ <bundleActivator>org.apache.felix.shell.tui.Activator</bundleActivator>
+ <bundleDocUrl>http://oscar-osgi.sf.net/obr2/shelltui/</bundleDocUrl>
+ <bundleSource>http://oscar-osgi.sf.net/obr2/shelltui/org.apache.felix.shell.tui-src.jar</bundleSource>
+ <bundleSymbolicName>org.apache.felix.shell.tui</bundleSymbolicName>
+ <importPackage>org.osgi.framework, org.apache.felix.shell</importPackage>
+ <importService>org.apache.felix.shell.ShellService</importService>
+ </osgiManifest>
</configuration>
</plugin>
</plugins>
diff --git a/org.apache.felix.shell.tui/src/main/resources/Manifest.mf b/org.apache.felix.shell.tui/src/main/resources/Manifest.mf
deleted file mode 100644
index 1d953c3..0000000
--- a/org.apache.felix.shell.tui/src/main/resources/Manifest.mf
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle-Name: ShellTUI
-Bundle-SymbolicName: org.apache.felix.shell.tui
-Bundle-Description: A simple textual user interface for Felix' shell service.
-Bundle-DocURL: http://oscar-osgi.sf.net/obr2/shelltui/
-Bundle-Source: http://oscar-osgi.sf.net/obr2/shelltui/org.apache.felix.shell.tui-src.jar
-Bundle-Version: 1.0.1
-Bundle-Activator: org.apache.felix.shell.tui.Activator
-Bundle-ClassPath: .
-Import-Package: org.osgi.framework, org.apache.felix.shell
-Import-Service: org.apache.felix.shell.ShellService