Author: clement
Date: Wed Jul 14 18:31:13 2010
New Revision: 964124
URL: http://svn.apache.org/viewvc?rev=964124&view=rev
Log:
Add DEPENDENCIES files (just copy the existing NOTICE files)
Update the NOTICE files to just contains 'includes' clauses
Modify pom files to embed the DEPENDENCIES files in the packages
Added:
felix/trunk/ipojo/annotations/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/annotations/NOTICE
felix/trunk/ipojo/ant/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/ant/NOTICE
felix/trunk/ipojo/api/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/api/NOTICE
felix/trunk/ipojo/arch/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/arch/NOTICE
felix/trunk/ipojo/composite/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/composite/NOTICE
felix/trunk/ipojo/core/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/core/NOTICE
felix/trunk/ipojo/handler/eventadmin/DEPENDENCIES
- copied, changed from r963959,
felix/trunk/ipojo/handler/eventadmin/NOTICE
felix/trunk/ipojo/handler/extender/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/handler/extender/NOTICE
felix/trunk/ipojo/handler/jmx/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/handler/jmx/NOTICE
felix/trunk/ipojo/handler/temporal/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/handler/temporal/NOTICE
felix/trunk/ipojo/handler/whiteboard/DEPENDENCIES
- copied, changed from r963959,
felix/trunk/ipojo/handler/whiteboard/NOTICE
felix/trunk/ipojo/manipulator/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/manipulator/NOTICE
felix/trunk/ipojo/metadata/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/metadata/NOTICE
felix/trunk/ipojo/online-manipulator/DEPENDENCIES
- copied, changed from r963959,
felix/trunk/ipojo/online-manipulator/NOTICE
felix/trunk/ipojo/plugin/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/metadata/NOTICE
felix/trunk/ipojo/webconsole-plugin/DEPENDENCIES
- copied, changed from r963959, felix/trunk/ipojo/webconsole-plugin/NOTICE
Modified:
felix/trunk/ipojo/annotations/NOTICE
felix/trunk/ipojo/annotations/pom.xml
felix/trunk/ipojo/ant/NOTICE
felix/trunk/ipojo/ant/pom.xml
felix/trunk/ipojo/api/NOTICE
felix/trunk/ipojo/api/pom.xml
felix/trunk/ipojo/arch-gogo/pom.xml
felix/trunk/ipojo/arch/NOTICE
felix/trunk/ipojo/arch/pom.xml
felix/trunk/ipojo/composite/NOTICE
felix/trunk/ipojo/composite/pom.xml
felix/trunk/ipojo/core/NOTICE
felix/trunk/ipojo/core/pom.xml
felix/trunk/ipojo/handler/eventadmin/NOTICE
felix/trunk/ipojo/handler/eventadmin/pom.xml
felix/trunk/ipojo/handler/extender/NOTICE
felix/trunk/ipojo/handler/extender/pom.xml
felix/trunk/ipojo/handler/jmx/NOTICE
felix/trunk/ipojo/handler/jmx/pom.xml
felix/trunk/ipojo/handler/temporal/NOTICE
felix/trunk/ipojo/handler/temporal/pom.xml
felix/trunk/ipojo/handler/whiteboard/NOTICE
felix/trunk/ipojo/handler/whiteboard/pom.xml
felix/trunk/ipojo/manipulator/NOTICE
felix/trunk/ipojo/manipulator/pom.xml
felix/trunk/ipojo/metadata/NOTICE
felix/trunk/ipojo/metadata/pom.xml
felix/trunk/ipojo/online-manipulator/NOTICE
felix/trunk/ipojo/online-manipulator/pom.xml
felix/trunk/ipojo/plugin/pom.xml
felix/trunk/ipojo/webconsole-plugin/NOTICE
felix/trunk/ipojo/webconsole-plugin/pom.xml
Copied: felix/trunk/ipojo/annotations/DEPENDENCIES (from r963959,
felix/trunk/ipojo/annotations/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/DEPENDENCIES?p2=felix/trunk/ipojo/annotations/DEPENDENCIES&p1=felix/trunk/ipojo/annotations/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
(empty)
Modified: felix/trunk/ipojo/annotations/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/NOTICE (original)
+++ felix/trunk/ipojo/annotations/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,13 +1,7 @@
Apache Felix iPOJO Annotations
Copyright 2008-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.
-II. Used Software
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/annotations/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/annotations/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/annotations/pom.xml (original)
+++ felix/trunk/ipojo/annotations/pom.xml Wed Jul 14 18:31:13 2010
@@ -68,8 +68,11 @@
org.apache.felix.ipojo.handlers.event,
org.apache.felix.ipojo.transaction
</Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
<obrRepository>NONE</obrRepository>
</configuration>
Copied: felix/trunk/ipojo/ant/DEPENDENCIES (from r963959,
felix/trunk/ipojo/ant/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/DEPENDENCIES?p2=felix/trunk/ipojo/ant/DEPENDENCIES&p1=felix/trunk/ipojo/ant/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
(empty)
Modified: felix/trunk/ipojo/ant/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/NOTICE (original)
+++ felix/trunk/ipojo/ant/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO Ant Task
Copyright 2008-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.
@@ -10,13 +8,3 @@ Licensed under the Apache License 2.0.
This product includes software developed at
Copyright (c) 2000-2005 INRIA, France Telecom
Licensed under BSD License.
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
Modified: felix/trunk/ipojo/ant/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/ant/pom.xml (original)
+++ felix/trunk/ipojo/ant/pom.xml Wed Jul 14 18:31:13 2010
@@ -85,8 +85,11 @@
org.apache.xerces.dom.*, org.apache.xerces.dom3.*
</Private-Package>
<Export-Package> org.apache.felix.ipojo.task </Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
<Import-Package>!org.objectweb.asm.signature,
!org.objectweb.asm.tree, !org.objectweb.asm.tree.analysis, *</Import-Package>
</instructions>
Copied: felix/trunk/ipojo/api/DEPENDENCIES (from r963959,
felix/trunk/ipojo/api/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/api/DEPENDENCIES?p2=felix/trunk/ipojo/api/DEPENDENCIES&p1=felix/trunk/ipojo/api/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/api/NOTICE (original)
+++ felix/trunk/ipojo/api/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -17,9 +17,9 @@ This product uses software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
III. License Summary
Modified: felix/trunk/ipojo/api/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/api/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/api/NOTICE (original)
+++ felix/trunk/ipojo/api/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO API
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.
@@ -10,18 +8,3 @@ Licensed under the Apache License 2.0.
This product includes software developed at
Copyright (c) 2000-2005 INRIA, France Telecom
Licensed under BSD License.
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
Modified: felix/trunk/ipojo/api/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/api/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/api/pom.xml (original)
+++ felix/trunk/ipojo/api/pom.xml Wed Jul 14 18:31:13 2010
@@ -61,8 +61,11 @@
org.objectweb.asm.commons;version=3.0,
org.objectweb.asm;version=3.0
</Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
</instructions>
Modified: felix/trunk/ipojo/arch-gogo/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/arch-gogo/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/arch-gogo/pom.xml (original)
+++ felix/trunk/ipojo/arch-gogo/pom.xml Wed Jul 14 18:31:13 2010
@@ -91,8 +91,11 @@
http://felix.apache.org/site/ipojo-arch-command.html
</Bundle-DocURL>
<Private-Package>org.apache.felix.ipojo.arch.gogo</Private-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
<Import-Package>
org.apache.felix.service.command;version=0.6.0, *
</Import-Package>
Copied: felix/trunk/ipojo/arch/DEPENDENCIES (from r963959,
felix/trunk/ipojo/arch/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/DEPENDENCIES?p2=felix/trunk/ipojo/arch/DEPENDENCIES&p1=felix/trunk/ipojo/arch/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/NOTICE (original)
+++ felix/trunk/ipojo/arch/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -13,9 +13,9 @@ This product uses software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
III. License Summary
Modified: felix/trunk/ipojo/arch/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/NOTICE (original)
+++ felix/trunk/ipojo/arch/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,22 +1,6 @@
Apache Felix iPOJO Arch Command
Copyright 2008-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.
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/arch/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/pom.xml (original)
+++ felix/trunk/ipojo/arch/pom.xml Wed Jul 14 18:31:13 2010
@@ -63,8 +63,11 @@
http://felix.apache.org/site/ipojo-arch-command.html
</Bundle-DocURL>
<Private-Package> org.apache.felix.ipojo.arch </Private-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/ipojo/composite/DEPENDENCIES (from r963959,
felix/trunk/ipojo/composite/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/DEPENDENCIES?p2=felix/trunk/ipojo/composite/DEPENDENCIES&p1=felix/trunk/ipojo/composite/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/NOTICE (original)
+++ felix/trunk/ipojo/composite/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -13,9 +13,9 @@ Licensed under BSD License.
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/composite/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/NOTICE (original)
+++ felix/trunk/ipojo/composite/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO Composite
Copyright 2008-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.
@@ -11,17 +9,3 @@ This product includes software developed
Copyright (c) 2000-2005 INRIA, France Telecom
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, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
Modified: felix/trunk/ipojo/composite/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/composite/pom.xml (original)
+++ felix/trunk/ipojo/composite/pom.xml Wed Jul 14 18:31:13 2010
@@ -94,8 +94,11 @@
org.objectweb.asm*;version=3.0;-split-package:=merge-first ,
org.apache.felix.ipojo.manipulation
</Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
<IPOJO-Extension>
composite:org.apache.felix.ipojo.composite.CompositeFactory
Copied: felix/trunk/ipojo/core/DEPENDENCIES (from r963959,
felix/trunk/ipojo/core/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/core/DEPENDENCIES?p2=felix/trunk/ipojo/core/DEPENDENCIES&p1=felix/trunk/ipojo/core/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
(empty)
Modified: felix/trunk/ipojo/core/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/core/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/core/NOTICE (original)
+++ felix/trunk/ipojo/core/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,28 +1,15 @@
Apache Felix iPOJO Runtime
Copyright 2008-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, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product includes software developed at
Copyright (c) 2000-2005 INRIA, France Telecom
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, 2007).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
Modified: felix/trunk/ipojo/core/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/core/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/core/pom.xml (original)
+++ felix/trunk/ipojo/core/pom.xml Wed Jul 14 18:31:13 2010
@@ -118,7 +118,8 @@
</Export-Package>
<Include-Resource>
META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
<_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
</instructions>
Copied: felix/trunk/ipojo/handler/eventadmin/DEPENDENCIES (from r963959,
felix/trunk/ipojo/handler/eventadmin/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/DEPENDENCIES?p2=felix/trunk/ipojo/handler/eventadmin/DEPENDENCIES&p1=felix/trunk/ipojo/handler/eventadmin/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/NOTICE (original)
+++ felix/trunk/ipojo/handler/eventadmin/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -9,9 +9,9 @@ Licensed under the Apache License 2.0.
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/handler/eventadmin/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/NOTICE (original)
+++ felix/trunk/ipojo/handler/eventadmin/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,22 +1,6 @@
Apache Felix iPOJO Event Admin Handler
Copyright 2008-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.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/handler/eventadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/eventadmin/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/eventadmin/pom.xml (original)
+++ felix/trunk/ipojo/handler/eventadmin/pom.xml Wed Jul 14 18:31:13 2010
@@ -70,8 +70,11 @@
http://felix.apache.org/site/event-admin-handlers.html
</Bundle-DocURL>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/ipojo/handler/extender/DEPENDENCIES (from r963959,
felix/trunk/ipojo/handler/extender/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/DEPENDENCIES?p2=felix/trunk/ipojo/handler/extender/DEPENDENCIES&p1=felix/trunk/ipojo/handler/extender/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/NOTICE (original)
+++ felix/trunk/ipojo/handler/extender/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -9,9 +9,9 @@ Licensed under the Apache License 2.0.
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/handler/extender/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/NOTICE (original)
+++ felix/trunk/ipojo/handler/extender/NOTICE Wed Jul 14 18:31:13 2010
@@ -6,17 +6,3 @@ I. Included Software
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
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, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/handler/extender/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/extender/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/extender/pom.xml (original)
+++ felix/trunk/ipojo/handler/extender/pom.xml Wed Jul 14 18:31:13 2010
@@ -65,8 +65,11 @@
</Private-Package>
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
<Bundle-Name>${project.name}</Bundle-Name>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/ipojo/handler/jmx/DEPENDENCIES (from r963959,
felix/trunk/ipojo/handler/jmx/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/DEPENDENCIES?p2=felix/trunk/ipojo/handler/jmx/DEPENDENCIES&p1=felix/trunk/ipojo/handler/jmx/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/NOTICE (original)
+++ felix/trunk/ipojo/handler/jmx/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -9,9 +9,9 @@ Licensed under the Apache License 2.0.
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/handler/jmx/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/NOTICE (original)
+++ felix/trunk/ipojo/handler/jmx/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,22 +1,7 @@
Apache Felix iPOJO JMX Handler
Copyright 2008-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.
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/handler/jmx/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/jmx/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/jmx/pom.xml (original)
+++ felix/trunk/ipojo/handler/jmx/pom.xml Wed Jul 14 18:31:13 2010
@@ -64,8 +64,11 @@
<Bundle-DocURL>
http://felix.apache.org/site/ipojo-jmx-handler.html
</Bundle-DocURL>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/ipojo/handler/temporal/DEPENDENCIES (from r963959,
felix/trunk/ipojo/handler/temporal/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/DEPENDENCIES?p2=felix/trunk/ipojo/handler/temporal/DEPENDENCIES&p1=felix/trunk/ipojo/handler/temporal/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/NOTICE (original)
+++ felix/trunk/ipojo/handler/temporal/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -13,9 +13,9 @@ Licensed under BSD License.
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/handler/temporal/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/NOTICE (original)
+++ felix/trunk/ipojo/handler/temporal/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO Temporal Dependency Handler
Copyright 2008-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.
@@ -11,18 +9,3 @@ This product includes software developed
Copyright (c) 2000-2005 INRIA, France Telecom
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, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
-
Modified: felix/trunk/ipojo/handler/temporal/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/temporal/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/temporal/pom.xml (original)
+++ felix/trunk/ipojo/handler/temporal/pom.xml Wed Jul 14 18:31:13 2010
@@ -80,10 +80,12 @@
<Bundle-DocURL>
http://felix.apache.org/site/temporal-service-dependency.html
</Bundle-DocURL>
- <Include-Resource> META-INF/LICENSE=LICENSE,
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/NOTICE=NOTICE
- </Include-Resource>
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/ipojo/handler/whiteboard/DEPENDENCIES (from r963959,
felix/trunk/ipojo/handler/whiteboard/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/DEPENDENCIES?p2=felix/trunk/ipojo/handler/whiteboard/DEPENDENCIES&p1=felix/trunk/ipojo/handler/whiteboard/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/NOTICE (original)
+++ felix/trunk/ipojo/handler/whiteboard/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -9,9 +9,9 @@ Licensed under the Apache License 2.0.
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/handler/whiteboard/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/NOTICE (original)
+++ felix/trunk/ipojo/handler/whiteboard/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,22 +1,6 @@
Apache Felix iPOJO Whiteboard Pattern Handler
Copyright 2008-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.
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/handler/whiteboard/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/handler/whiteboard/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/handler/whiteboard/pom.xml (original)
+++ felix/trunk/ipojo/handler/whiteboard/pom.xml Wed Jul 14 18:31:13 2010
@@ -68,8 +68,11 @@
<Private-Package> org.apache.felix.ipojo.handler.wbp
</Private-Package>
<Bundle-Name>${project.name}</Bundle-Name>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: felix/trunk/ipojo/manipulator/DEPENDENCIES (from r963959,
felix/trunk/ipojo/manipulator/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/DEPENDENCIES?p2=felix/trunk/ipojo/manipulator/DEPENDENCIES&p1=felix/trunk/ipojo/manipulator/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
(empty)
Modified: felix/trunk/ipojo/manipulator/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/NOTICE (original)
+++ felix/trunk/ipojo/manipulator/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO Manipulator
Copyright 2008-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.
@@ -10,13 +8,3 @@ Licensed under the Apache License 2.0.
This product includes software developed at
Copyright (c) 2000-2005 INRIA, France Telecom
Licensed under BSD License.
-
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Wed Jul 14 18:31:13 2010
@@ -71,9 +71,13 @@
org.apache.felix.ipojo.manipulation.annotations,
org.apache.felix.ipojo.xml.parser, org.objectweb.asm,
org.objectweb.asm.commons </Private-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/LICENSE.asm=LICENSE.asm, META-INF/NOTICE=NOTICE,
- xsd=src/main/resources </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/LICENSE.asm=LICENSE.asm,
+ META-INF/NOTICE=NOTICE,
+ xsd=src/main/resources,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
<Import-Package>!org.objectweb.asm.tree, *</Import-Package>
</instructions>
<obrRepository>NONE</obrRepository>
Copied: felix/trunk/ipojo/metadata/DEPENDENCIES (from r963959,
felix/trunk/ipojo/metadata/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/DEPENDENCIES?p2=felix/trunk/ipojo/metadata/DEPENDENCIES&p1=felix/trunk/ipojo/metadata/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
(empty)
Modified: felix/trunk/ipojo/metadata/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/NOTICE (original)
+++ felix/trunk/ipojo/metadata/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,13 +1,7 @@
Apache Felix iPOJO Metadata
Copyright 2008-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.
-II. Used Software
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/metadata/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/metadata/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/pom.xml (original)
+++ felix/trunk/ipojo/metadata/pom.xml Wed Jul 14 18:31:13 2010
@@ -48,8 +48,11 @@
<Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
<Bundle-Description> iPOJO Metadata </Bundle-Description>
<Export-Package> org.apache.felix.ipojo.metadata </Export-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE </Include-Resource>
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
+ </Include-Resource>
</instructions>
<obrRepository>NONE</obrRepository>
</configuration>
Copied: felix/trunk/ipojo/online-manipulator/DEPENDENCIES (from r963959,
felix/trunk/ipojo/online-manipulator/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/online-manipulator/DEPENDENCIES?p2=felix/trunk/ipojo/online-manipulator/DEPENDENCIES&p1=felix/trunk/ipojo/online-manipulator/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/online-manipulator/NOTICE (original)
+++ felix/trunk/ipojo/online-manipulator/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -17,9 +17,9 @@ This product uses software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
III. License Summary
Modified: felix/trunk/ipojo/online-manipulator/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/online-manipulator/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/online-manipulator/NOTICE (original)
+++ felix/trunk/ipojo/online-manipulator/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO Online Manipulator
Copyright 2008-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.
@@ -11,18 +9,3 @@ This product includes software developed
Copyright (c) 2000-2005 INRIA, France Telecom
Licensed under BSD License.
-II. Used Software
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
-
Modified: felix/trunk/ipojo/online-manipulator/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/online-manipulator/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/online-manipulator/pom.xml (original)
+++ felix/trunk/ipojo/online-manipulator/pom.xml Wed Jul 14 18:31:13 2010
@@ -55,9 +55,11 @@
org.objectweb.asm.commons, org.objectweb.asm </Export-Package>
<Import-Package> !org.objectweb.asm.tree, !sun.io,
org.osgi.framework;version=1.3, *
</Import-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
META-INF/LICENSE.asm=LICENSE.asm,
- META-INF/NOTICE=NOTICE
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES
</Include-Resource>
<!-- <Embed-Dependency>xercesImpl|xml-resolver</Embed-Dependency>
-->
</instructions>
Copied: felix/trunk/ipojo/plugin/DEPENDENCIES (from r963959,
felix/trunk/ipojo/metadata/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/DEPENDENCIES?p2=felix/trunk/ipojo/plugin/DEPENDENCIES&p1=felix/trunk/ipojo/metadata/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/metadata/NOTICE (original)
+++ felix/trunk/ipojo/plugin/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -1,13 +1,7 @@
-Apache Felix iPOJO Metadata
+Apache Felix iPOJO Maven Plugin
Copyright 2008-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.
-II. Used Software
-
-III. License Summary
-- Apache License 2.0
Modified: felix/trunk/ipojo/plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/plugin/pom.xml (original)
+++ felix/trunk/ipojo/plugin/pom.xml Wed Jul 14 18:31:13 2010
@@ -76,6 +76,20 @@
</dependency>
</dependencies>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE*</include>
+ <include>NOTICE*</include>
+ <include>DEPENDENCIES*</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Copied: felix/trunk/ipojo/webconsole-plugin/DEPENDENCIES (from r963959,
felix/trunk/ipojo/webconsole-plugin/NOTICE)
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/DEPENDENCIES?p2=felix/trunk/ipojo/webconsole-plugin/DEPENDENCIES&p1=felix/trunk/ipojo/webconsole-plugin/NOTICE&r1=963959&r2=964124&rev=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/NOTICE (original)
+++ felix/trunk/ipojo/webconsole-plugin/DEPENDENCIES Wed Jul 14 18:31:13 2010
@@ -13,9 +13,9 @@ Licensed under the JSON License
II. Used Software
-This product uses software developed at
+This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
This product uses software developed at
Modified: felix/trunk/ipojo/webconsole-plugin/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/NOTICE?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/NOTICE (original)
+++ felix/trunk/ipojo/webconsole-plugin/NOTICE Wed Jul 14 18:31:13 2010
@@ -1,8 +1,6 @@
Apache Felix iPOJO Webconsole Plugins
Copyright 2008-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.
@@ -11,18 +9,3 @@ This product includes software from http
Copyright (c) 2002 JSON.org
Licensed under the JSON License
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- JSON License
-
Modified: felix/trunk/ipojo/webconsole-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/pom.xml?rev=964124&r1=964123&r2=964124&view=diff
==============================================================================
--- felix/trunk/ipojo/webconsole-plugin/pom.xml (original)
+++ felix/trunk/ipojo/webconsole-plugin/pom.xml Wed Jul 14 18:31:13 2010
@@ -61,8 +61,12 @@
org.apache.felix.ipojo.webconsole
</Private-Package>
<Import-Package>*</Import-Package>
- <Include-Resource> META-INF/LICENSE=LICENSE,
- META-INF/NOTICE=NOTICE, res=src/main/resources/res
+ <Include-Resource>
+ META-INF/LICENSE=LICENSE,
+ META-INF/LICENSE.json=LICENSE.json,
+ META-INF/NOTICE=NOTICE,
+ META-INF/DEPENDENCIES=DEPENDENCIES,
+ res=src/main/resources/res
</Include-Resource>
<Embed-Dependency>
<!-- Required for JSON data transfer -->
