Rename old NOTICE file to DEPENDENCIES and introduce a new NOTICE
file containing only required notices.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@949249 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/DEPENDENCIES b/framework/DEPENDENCIES
new file mode 100644
index 0000000..fd51e96
--- /dev/null
+++ b/framework/DEPENDENCIES
@@ -0,0 +1,27 @@
+Apache Felix Framework
+Copyright 2010 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party 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.
+
+II. Used Third-Party 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.
+
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/framework/NOTICE b/framework/NOTICE
index cb17aa2..0415e2b 100644
--- a/framework/NOTICE
+++ b/framework/NOTICE
@@ -1,9 +1,6 @@
Apache Felix Framework
Copyright 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.
@@ -12,18 +9,3 @@
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2009).
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.
-
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/framework/pom.xml b/framework/pom.xml
index 84b20bb..63c183e 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -58,7 +58,7 @@
<Export-Package>org.osgi.framework;-split-package:=merge-first,org.osgi.framework.launch,org.osgi.framework.hooks.service,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
<Private-Package>org.apache.felix.moduleloader.*,org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,{src/main/resources/}</Include-Resource>
+ <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource>
</instructions>
</configuration>
</plugin>
diff --git a/main/DEPENDENCIES b/main/DEPENDENCIES
new file mode 100644
index 0000000..5f67e1e
--- /dev/null
+++ b/main/DEPENDENCIES
@@ -0,0 +1,27 @@
+Apache Felix Main
+Copyright 2010 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party 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.
+
+II. Used Third-Party 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.
+
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/main/NOTICE b/main/NOTICE
index 08db165..46d96fe 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -1,9 +1,6 @@
Apache Felix Main
Copyright 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.
@@ -12,18 +9,3 @@
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2009).
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.
-
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
diff --git a/main/pom.xml b/main/pom.xml
index dd17c1f..501edc1 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -72,7 +72,7 @@
<Private-Package>org.apache.felix.main.*</Private-Package>
<Export-Package>!org.osgi.service.log, !org.osgi.service.obr,org.osgi.*</Export-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,{src/main/resources/}</Include-Resource>
+ <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource>
</instructions>
</configuration>
</plugin>