Update changelogs
Update copyright year (2011)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1054568 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/composite/DEPENDENCIES b/ipojo/composite/DEPENDENCIES
index 0346e51..b16ed8f 100644
--- a/ipojo/composite/DEPENDENCIES
+++ b/ipojo/composite/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix iPOJO Composite
-Copyright 2008-2010 The Apache Software Foundation
+Copyright 2008-2011 The Apache Software Foundation
I. Included Software
diff --git a/ipojo/composite/NOTICE b/ipojo/composite/NOTICE
index 81972a5..4c77df6 100644
--- a/ipojo/composite/NOTICE
+++ b/ipojo/composite/NOTICE
@@ -1,5 +1,5 @@
Apache Felix iPOJO Composite
-Copyright 2008-2010 The Apache Software Foundation
+Copyright 2008-2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/ipojo/composite/doc/changelog.txt b/ipojo/composite/doc/changelog.txt
index 765d424..36548c7 100644
--- a/ipojo/composite/doc/changelog.txt
+++ b/ipojo/composite/doc/changelog.txt
@@ -1,38 +1,43 @@
+Changes from the 1.6.0 to 1.8.0
+-------------------------------
+** Improvement
+ * [FELIX-2746] - Composite should support instance configuration
+
Changes from the 1.4.0 to 1.6.0
-------------------------------
** Improvement
* [FELIX-1427] - Service injection with Smart Proxies
* [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified
-
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
* [FELIX-994] - ClassCastException while Architecture on a composite with a provided service
-
+
** Improvement
* Update parent pom
-
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Bug
* [FELIX-797] - Composite Architecture contains duplicate instances
* [FELIX-817] - iPOJO Service Exported throw an error when stopping
-
+
Changes from 0.8.1 to 1.0.0
---------------------------
-** Bug
+** Bug
* [FELIX-622] - iPOJO Composite Service Instance can use factories twice to create service instance
* [FELIX-628] - Architecture service should not publish the instance.name property
- * [FELIX-637] - Composite service implementation does not support long argument
-
+ * [FELIX-637] - Composite service implementation does not support long argument
+
** Improvement
- * [FELIX-673] - Provide OBR description to iPOJO bundles
- * [FELIX-688] - Better error reporting when an instance creation failed
- * [FELIX-689] - Instance 'name' property should become 'instance.name'
+ * [FELIX-673] - Provide OBR description to iPOJO bundles
+ * [FELIX-688] - Better error reporting when an instance creation failed
+ * [FELIX-689] - Instance 'name' property should become 'instance.name'
* [FELIX-716] - Provide XML schemas for iPOJO descriptors
Version 0.8.1
-------------
- * Initial release
+ * Initial release