More fixes in preparation of a release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1097831 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/deploymentadmin/autoconf/NOTICE b/deploymentadmin/autoconf/NOTICE
index 60e5ffa..146710b 100644
--- a/deploymentadmin/autoconf/NOTICE
+++ b/deploymentadmin/autoconf/NOTICE
@@ -4,3 +4,12 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
diff --git a/deploymentadmin/autoconf/pom.xml b/deploymentadmin/autoconf/pom.xml
index 387ae7e..9f753fc 100644
--- a/deploymentadmin/autoconf/pom.xml
+++ b/deploymentadmin/autoconf/pom.xml
@@ -61,6 +61,17 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -78,7 +89,6 @@
<Export-Package>org.osgi.service.deploymentadmin.spi;version="1.0"</Export-Package>
<DeploymentPackage-Customizer>true</DeploymentPackage-Customizer>
<Deployment-ProvidesResourceProcessor>org.osgi.deployment.rp.autoconf</Deployment-ProvidesResourceProcessor>
- <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>
diff --git a/deploymentadmin/deploymentadmin/DEPENDENCIES b/deploymentadmin/deploymentadmin/DEPENDENCIES
index 609040c..65bd99f 100644
--- a/deploymentadmin/deploymentadmin/DEPENDENCIES
+++ b/deploymentadmin/deploymentadmin/DEPENDENCIES
@@ -8,6 +8,11 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
II. Used Third-Party Software
This product uses software developed at
diff --git a/deploymentadmin/deploymentadmin/NOTICE b/deploymentadmin/deploymentadmin/NOTICE
index eeb614a..3a91c87 100644
--- a/deploymentadmin/deploymentadmin/NOTICE
+++ b/deploymentadmin/deploymentadmin/NOTICE
@@ -4,3 +4,8 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
diff --git a/deploymentadmin/deploymentadmin/pom.xml b/deploymentadmin/deploymentadmin/pom.xml
index d1576dd..1449830 100644
--- a/deploymentadmin/deploymentadmin/pom.xml
+++ b/deploymentadmin/deploymentadmin/pom.xml
@@ -51,6 +51,17 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -66,7 +77,6 @@
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Private-Package>org.apache.felix.deploymentadmin.*</Private-Package>
<Export-Package>org.osgi.service.deploymentadmin.*;version="1.0"</Export-Package>
- <Include-Resource>{maven-resources}, META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>