You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/05/28 20:17:59 UTC
svn commit: r949249 - in /felix/trunk: framework/DEPENDENCIES framework/NOTICE framework/pom.xml main/DEPENDENCIES main/NOTICE main/pom.xml

Author: rickhall
Date: Fri May 28 18:17:59 2010
New Revision: 949249

URL: http://svn.apache.org/viewvc?rev=949249&view=rev
Log:
Rename old NOTICE file to DEPENDENCIES and introduce a new NOTICE
file containing only required notices.

Added:
    felix/trunk/framework/DEPENDENCIES
    felix/trunk/main/DEPENDENCIES
Modified:
    felix/trunk/framework/NOTICE
    felix/trunk/framework/pom.xml
    felix/trunk/main/NOTICE
    felix/trunk/main/pom.xml

Added: felix/trunk/framework/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/framework/DEPENDENCIES?rev=949249&view=auto
==============================================================================
--- felix/trunk/framework/DEPENDENCIES (added)
+++ felix/trunk/framework/DEPENDENCIES Fri May 28 18:17:59 2010
@@ -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

Modified: felix/trunk/framework/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/framework/NOTICE?rev=949249&r1=949248&r2=949249&view=diff
==============================================================================
--- felix/trunk/framework/NOTICE (original)
+++ felix/trunk/framework/NOTICE Fri May 28 18:17:59 2010
@@ -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 @@ This product includes software developed
 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

Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=949249&r1=949248&r2=949249&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Fri May 28 18:17:59 2010
@@ -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>

Added: felix/trunk/main/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/main/DEPENDENCIES?rev=949249&view=auto
==============================================================================
--- felix/trunk/main/DEPENDENCIES (added)
+++ felix/trunk/main/DEPENDENCIES Fri May 28 18:17:59 2010
@@ -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

Modified: felix/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/main/NOTICE?rev=949249&r1=949248&r2=949249&view=diff
==============================================================================
--- felix/trunk/main/NOTICE (original)
+++ felix/trunk/main/NOTICE Fri May 28 18:17:59 2010
@@ -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 @@ This product includes software developed
 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

Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=949249&r1=949248&r2=949249&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Fri May 28 18:17:59 2010
@@ -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>