Update changelogs
Update copyright year (2011)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk/ipojo/annotations@1054568 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/DEPENDENCIES b/DEPENDENCIES
index ac6fd9e..e1ea054 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,5 +1,5 @@
Apache Felix iPOJO Annotations
-Copyright 2008-2010 The Apache Software Foundation
+Copyright 2008-2011 The Apache Software Foundation
This software was developed at the Apache Software Foundation
(http://www.apache.org) and may have dependencies on other
diff --git a/NOTICE b/NOTICE
index 8c8ea0f..b1ed786 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Felix iPOJO Annotations
-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/doc/changelog.txt b/doc/changelog.txt
index 889b9c6..e2c9f16 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,9 +1,27 @@
+Changes from the 1.6.4 to 1.8.0
+-------------------------------
+** Bug
+ * [FELIX-2568] - Rename Transactionnal to Transactional
+
+** Improvement
+ * [FELIX-1428] - Constructor injection of Configuration properties
+ * [FELIX-2620] - Change iPojo annotation parameters to follow java naming conventions
+ * [FELIX-2621] - Rename annotations to remove collisions
+ * [FELIX-2622] - Support static service properties that are not mirrored into fields
+ * [FELIX-2624] - Support multiple whiteboards using annotations
+ * [FELIX-2630] - Rename @Component attributes to follow the java naming conventions
+ * [FELIX-2631] - Rename @Publisher and @Subscriber attributes to follow the java naming conventions
+ * [FELIX-2633] - Rename JMX annotations
+ * [FELIX-2634] - Rename the @Publisher annotation into @Publishes annotation to avoid collision
+ * [FELIX-2666] - Rename the temporal handler annotation to avoid collision
+ * [FELIX-2742] - Constructor injection of service dependencies
+
Changes from the 1.6.2 to 1.6.4
-------------------------------
** Improvement
* [FELIX-2420] - Enum support for @Property annotation
* [FELIX-2461] - Allow specifying the targeted service interface in the @ServiceController
-
+
Changes from the 1.6.0 to 1.6.2
-------------------------------
** Improvement
@@ -13,7 +31,7 @@
-------------------------------
** Bug
* [FELIX-1557] - Cosmetic change of the Bundle-Name and Bundle-SymbolicName in iPOJO annotations.
-
+
** Improvement
* [FELIX-1426] - Service injection with Dynamic Proxies
* [FELIX-1427] - Service injection with Smart Proxies
@@ -24,7 +42,7 @@
** Wish
* [FELIX-1940] - Add @Instance annotation to declare instances without metadata.xml
-
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
@@ -33,7 +51,7 @@
** Improvement
* Update parent pom
-
+
Changes from 1.0.0 to 1.2.0
---------------------------
** Improvement
@@ -42,7 +60,7 @@
** Bug
* [FELIX-867] - iPOJO @ServiceProperty can target method
- * [FELIX-868] - iPOJO @Component don't support factory methods
+ * [FELIX-868] - iPOJO @Component don't support factory methods
Changes from 0.8.0 to 1.0.0
