felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r952255 - in /felix/trunk/main.distribution: DEPENDENCIES NOTICE
Date Mon, 07 Jun 2010 14:44:05 GMT
Author: rickhall
Date: Mon Jun  7 14:44:05 2010
New Revision: 952255

URL: http://svn.apache.org/viewvc?rev=952255&view=rev
Log:
Update NOTICE/DEPENDENCIES files.

Added:
    felix/trunk/main.distribution/DEPENDENCIES
Modified:
    felix/trunk/main.distribution/NOTICE

Added: felix/trunk/main.distribution/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/main.distribution/DEPENDENCIES?rev=952255&view=auto
==============================================================================
--- felix/trunk/main.distribution/DEPENDENCIES (added)
+++ felix/trunk/main.distribution/DEPENDENCIES Mon Jun  7 14:44:05 2010
@@ -0,0 +1,32 @@
+Apache Felix Main Distribution
+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.
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
+Licensed under BSD License.
+
+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
+- BSD License

Modified: felix/trunk/main.distribution/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/main.distribution/NOTICE?rev=952255&r1=952254&r2=952255&view=diff
==============================================================================
--- felix/trunk/main.distribution/NOTICE (original)
+++ felix/trunk/main.distribution/NOTICE Mon Jun  7 14:44:05 2010
@@ -1,9 +1,6 @@
-Apache Felix Main
+Apache Felix Main Distribution
 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.
@@ -13,21 +10,17 @@ 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://kxml.sourceforge.net.
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-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, 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
-- BSD License
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.



Mime
View raw message