Add DEPENDENCIES files (just copy the existing NOTICE files)
Update the NOTICE files to just contains 'includes' clauses
Modify pom files to embed the DEPENDENCIES files in the packages
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@964124 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/composite/DEPENDENCIES b/ipojo/composite/DEPENDENCIES
new file mode 100644
index 0000000..0346e51
--- /dev/null
+++ b/ipojo/composite/DEPENDENCIES
@@ -0,0 +1,27 @@
+Apache Felix iPOJO Composite
+Copyright 2008-2010 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.
+
+This product includes software developed at
+Copyright (c) 2000-2005 INRIA, France Telecom
+Licensed under BSD License.
+
+II. Used Software
+
+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 uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
+- BSD License
diff --git a/ipojo/composite/NOTICE b/ipojo/composite/NOTICE
index b8b1f7d..81972a5 100644
--- a/ipojo/composite/NOTICE
+++ b/ipojo/composite/NOTICE
@@ -1,8 +1,6 @@
Apache Felix iPOJO Composite
Copyright 2008-2010 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.
@@ -11,17 +9,3 @@
Copyright (c) 2000-2005 INRIA, France Telecom
Licensed under BSD License.
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
diff --git a/ipojo/composite/pom.xml b/ipojo/composite/pom.xml
index ee5bac3..7a1298c 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/composite/pom.xml
@@ -94,8 +94,11 @@
org.objectweb.asm*;version=3.0;-split-package:=merge-first ,
org.apache.felix.ipojo.manipulation
</Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
<IPOJO-Extension>
composite:org.apache.felix.ipojo.composite.CompositeFactory