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/06/09 19:42:24 UTC
svn commit: r953095 - in /felix/trunk/bundlerepository: DEPENDENCIES NOTICE
pom.xml
Author: rickhall
Date: Wed Jun 9 17:42:23 2010
New Revision: 953095
URL: http://svn.apache.org/viewvc?rev=953095&view=rev
Log:
Update to new NOTICE/DEPENDENCIES files.
Added:
felix/trunk/bundlerepository/DEPENDENCIES
Modified:
felix/trunk/bundlerepository/NOTICE
felix/trunk/bundlerepository/pom.xml
Added: felix/trunk/bundlerepository/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/DEPENDENCIES?rev=953095&view=auto
==============================================================================
--- felix/trunk/bundlerepository/DEPENDENCIES (added)
+++ felix/trunk/bundlerepository/DEPENDENCIES Wed Jun 9 17:42:23 2010
@@ -0,0 +1,27 @@
+Apache Felix OSGi Bundle Repository
+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 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/bundlerepository/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/NOTICE?rev=953095&r1=953094&r2=953095&view=diff
==============================================================================
--- felix/trunk/bundlerepository/NOTICE (original)
+++ felix/trunk/bundlerepository/NOTICE Wed Jun 9 17:42:23 2010
@@ -1,32 +1,10 @@
Apache Felix OSGi Bundle Repository
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.
-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 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/bundlerepository/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundlerepository/pom.xml?rev=953095&r1=953094&r2=953095&view=diff
==============================================================================
--- felix/trunk/bundlerepository/pom.xml (original)
+++ felix/trunk/bundlerepository/pom.xml Wed Jun 9 17:42:23 2010
@@ -109,6 +109,7 @@
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Service>org.apache.felix.bundlerepository.RepositoryAdmin,org.osgi.service.obr.RepositoryAdmin</Export-Service>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
+ <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/LICENSE.kxml2=LICENSE.kxml2,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource>
</instructions>
</configuration>
</plugin>