felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r898231 - in /felix/trunk/webconsole: pom.xml src/main/bare-resources/NOTICE
Date Tue, 12 Jan 2010 08:15:06 GMT
Author: fmeschbe
Date: Tue Jan 12 08:15:06 2010
New Revision: 898231

URL: http://svn.apache.org/viewvc?rev=898231&view=rev
Log:
FELIX-1976 Oops: wrong reference to the bare NOTICE file and remove the reference to embedded
OSGi software (nothing from osgi.org is embedded in the bare bundle)

Modified:
    felix/trunk/webconsole/pom.xml
    felix/trunk/webconsole/src/main/bare-resources/NOTICE

Modified: felix/trunk/webconsole/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=898231&r1=898230&r2=898231&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Tue Jan 12 08:15:06 2010
@@ -139,7 +139,7 @@
                                     <classifier>bare</classifier>
                                     <instructions>
                                         <Include-Resource>
-                                            {maven-resources},META-INF/NOTICE=src/main/bare-resources/NOTICE.bare
+                                            {maven-resources},META-INF/NOTICE=src/main/bare-resources/NOTICE
                                         </Include-Resource>
                                         <_donotcopy>LICENSE.json</_donotcopy>
                                         <!-- <_donotcopy>(LICENSE.json|NOTICE.bare)</_donotcopy>
-->

Modified: felix/trunk/webconsole/src/main/bare-resources/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/bare-resources/NOTICE?rev=898231&r1=898230&r2=898231&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/bare-resources/NOTICE (original)
+++ felix/trunk/webconsole/src/main/bare-resources/NOTICE Tue Jan 12 08:15:06 2010
@@ -8,11 +8,6 @@
 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://www.jquery.com
 Copyright (c) 2009 John Resig, http://jquery.com/
 Licensed under the MIT License



Mime
View raw message