Preparation of the next release
- Add / Update NOTICE and LICENSE files
- Add temporal dependency documentation
- Modify changelog
- Update pom version to be 0.8.1-SNAPSHOT and to use only 0.8.0 version
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@663907 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/composite/LICENSE.asm b/ipojo/composite/LICENSE.asm
new file mode 100644
index 0000000..9496b17
--- /dev/null
+++ b/ipojo/composite/LICENSE.asm
@@ -0,0 +1,28 @@
+
+ ASM: a very small and fast Java bytecode manipulation framework
+ Copyright (c) 2000-2005 INRIA, France Telecom
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/ipojo/composite/NOTICE b/ipojo/composite/NOTICE
index cdda91d..bcce229 100644
--- a/ipojo/composite/NOTICE
+++ b/ipojo/composite/NOTICE
@@ -12,6 +12,10 @@
Copyright 2006 The OSGi Alliance.
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
@@ -25,3 +29,4 @@
III. License Summary
- Apache License 2.0
+- BSD Licence
diff --git a/ipojo/composite/doc/changelog.txt b/ipojo/composite/doc/changelog.txt
index 8ca4f32..d3bf9bc 100644
--- a/ipojo/composite/doc/changelog.txt
+++ b/ipojo/composite/doc/changelog.txt
@@ -1,3 +1,3 @@
-Version 0.8.0
+Version 0.8.1
-------------
-* [2008-05-16] Initial release
\ No newline at end of file
+* [2008-06-06] Initial release
\ No newline at end of file
diff --git a/ipojo/composite/pom.xml b/ipojo/composite/pom.xml
index ca46615..b729506 100644
--- a/ipojo/composite/pom.xml
+++ b/ipojo/composite/pom.xml
@@ -28,7 +28,7 @@
<name>Apache Felix iPOJO Composite</name>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
<groupId>org.apache.felix</groupId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.1-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -43,17 +43,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0</version>
</dependency>
</dependencies>
<build>
@@ -92,11 +92,12 @@
</Private-Package>
<Export-Package>
org.apache.felix.ipojo.composite;
- version="0.9.0"
+ version="0.8.0"
</Export-Package>
<Include-Resource>
- META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE
+ META-INF/LICENSE=LICENSE,
+ META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
<IPOJO-Extension>
composite:org.apache.felix.ipojo.composite.CompositeFactory
@@ -110,7 +111,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>0.9.0-SNAPSHOT</version>
+ <version>0.8.0</version>
<executions>
<execution>
<goals>