modified shapes, embedd dependencies, plus versions and licenses updates in preparation for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1225650 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/webconsole-plugins/servicediagnostics/sample/pom.xml b/webconsole-plugins/servicediagnostics/sample/pom.xml
index 039c294..c4b3d1b 100644
--- a/webconsole-plugins/servicediagnostics/sample/pom.xml
+++ b/webconsole-plugins/servicediagnostics/sample/pom.xml
@@ -6,20 +6,21 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>servicediagnostics</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.felix</groupId>
<artifactId>servicediagnostics.sample</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <name>Sample Services and Launcher for Service Diagnostics</name>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>servicediagnostics.core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>0.1.0-SNAPSHOT</version>
</dependency>
<!-- runtime dependencies. added to populate the local repository -->
<dependency>
@@ -37,6 +38,12 @@
<artifactId>org.apache.felix.shell</artifactId>
<version>1.4.2</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>2.9.1</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -51,19 +58,21 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Bundle-Category>osgi</Bundle-Category>
- <Bundle-SymbolicName>
- ${project.artifactId}
- </Bundle-SymbolicName>
- <Service-Component>
- *
- </Service-Component>
+ <Bundle-Category>samples</Bundle-Category>
+ <Bundle-SymbolicName> ${project.artifactId} </Bundle-SymbolicName>
+ <Service-Component> * </Service-Component>
<Private-Package>
org.apache.felix.servicediagnostics.sample
</Private-Package>
<Import-Package>
- !aQute.bnd.annotation.component,!org.apache.felix.main,*
+ !aQute.bnd.annotation.component,!org.apache.felix.main,sun.misc*;resolution:=optional,*
</Import-Package>
+ <Include-Resource>
+ {maven-resources},scala-library-2.9.1.jar
+ </Include-Resource>
+ <Bundle-ClassPath>
+ ., scala-library-2.9.1.jar
+ </Bundle-ClassPath>
</instructions>
</configuration>
</plugin>