[karaf] fix NOTICE files (first pass)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@816773 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/karaf/shell/admin/NOTICE b/karaf/shell/admin/NOTICE
new file mode 100644
index 0000000..2f69501
--- /dev/null
+++ b/karaf/shell/admin/NOTICE
@@ -0,0 +1,21 @@
+Apache Felix Karaf
+Copyright 2009 The Apache Software Foundation
+
+
+I. Included Software
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+
+III. License Summary
+- Apache License 2.0
diff --git a/karaf/shell/admin/pom.xml b/karaf/shell/admin/pom.xml
index f90cdf8..65252e7 100644
--- a/karaf/shell/admin/pom.xml
+++ b/karaf/shell/admin/pom.xml
@@ -37,6 +37,10 @@
Provides administration commands
</description>
+ <properties>
+ <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix.karaf.shell</groupId>
@@ -100,7 +104,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>create-prop</id>
@@ -130,18 +133,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>ant-contrib</groupId>
- <artifactId>ant-contrib</artifactId>
- <version>1.0b3</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant-optional</artifactId>
- <version>1.5.3-1</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -210,6 +201,7 @@
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*;version=${project.version}</Export-Package>
<Import-Package>
+ !${pom.artifactId}*,
org.osgi.service.command,
org.apache.felix.gogo.commands,
org.apache.felix.karaf.shell.console,