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/webconsole-plugin/DEPENDENCIES b/ipojo/webconsole-plugin/DEPENDENCIES
new file mode 100644
index 0000000..2b2770d
--- /dev/null
+++ b/ipojo/webconsole-plugin/DEPENDENCIES
@@ -0,0 +1,28 @@
+Apache Felix iPOJO Webconsole Plugins
+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 from http://www.json.org.
+Copyright (c) 2002 JSON.org
+Licensed under the JSON 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
+- JSON License
+
diff --git a/ipojo/webconsole-plugin/NOTICE b/ipojo/webconsole-plugin/NOTICE
index 098b175..226fefe 100644
--- a/ipojo/webconsole-plugin/NOTICE
+++ b/ipojo/webconsole-plugin/NOTICE
@@ -1,8 +1,6 @@
Apache Felix iPOJO Webconsole Plugins
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,18 +9,3 @@
Copyright (c) 2002 JSON.org
Licensed under the JSON 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
-- JSON License
-
diff --git a/ipojo/webconsole-plugin/pom.xml b/ipojo/webconsole-plugin/pom.xml
index 89de678..83a6e56 100644
--- a/ipojo/webconsole-plugin/pom.xml
+++ b/ipojo/webconsole-plugin/pom.xml
@@ -61,8 +61,12 @@
org.apache.felix.ipojo.webconsole
</Private-Package>
<Import-Package>*</Import-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, res=src/main/resources/res
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/LICENSE.json=LICENSE.json,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES,
+ res=src/main/resources/res
</Include-Resource>
<Embed-Dependency>
<!-- Required for JSON data transfer -->