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/plugin/DEPENDENCIES b/ipojo/plugin/DEPENDENCIES
index 9f8b48f..1d209d3 100644
--- a/ipojo/plugin/DEPENDENCIES
+++ b/ipojo/plugin/DEPENDENCIES
@@ -1,5 +1,5 @@
 Apache Felix iPOJO Maven Plugin
-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/plugin/NOTICE b/ipojo/plugin/NOTICE
index eabddbd..1e2f3be 100644
--- a/ipojo/plugin/NOTICE
+++ b/ipojo/plugin/NOTICE
@@ -1,5 +1,5 @@
 Apache Felix iPOJO Maven Plugin
-Copyright 2008-2010 The Apache Software Foundation
+Copyright 2008-2011 The Apache Software Foundation
 
 I. Included Software
 
diff --git a/ipojo/plugin/doc/changelog.txt b/ipojo/plugin/doc/changelog.txt
index 0353c79..821dd1c 100644
--- a/ipojo/plugin/doc/changelog.txt
+++ b/ipojo/plugin/doc/changelog.txt
@@ -1,8 +1,15 @@
+Changes from the 1.6.0 to 1.8.0

+-------------------------------

+** Improvement

+    * [FELIX-2733] - The maven-ipojo-plugin should support JAR and WAR as packaging type

+    * [FELIX-2744] - Add annotations to the maven-ipojo-plugin archetype

+    * [FELIX-2755] - Allow the manipulator and the different front end to use several metadata files

+

 Changes from the 1.4.2 to 1.6.0

 -------------------------------

 ** Bug

     * [FELIX-1411] - Issue on windows to find components inside bundle

-    

+

 ** Improvement

     * [FELIX-1427] - Service injection with Smart Proxies

     * [FELIX-1906] - Allow calling a method when service properties of an already injected service are modified

@@ -13,7 +20,7 @@
 ** Bug

     * [FELIX-1411] - Issue on windows to find components inside bundle

 

-    

+

 Changes from 1.2.0 to 1.4.0

 ---------------------------

 ** Bug

@@ -21,19 +28,19 @@
 

 ** Improvement

     * Update parent pom

-    

-  

+

+

 Changes from 1.0.0 to 1.2.0

 ---------------------------

 ** Improvement

     * [FELIX-813] - Resolve XML-Schemas locally rather than from Internet

     * [FELIX-846] - Enhance the iPojo maven plugin to take metadata from pom.

-        

+

 Changes from 0.8.0 to 1.0.0

 ---------------------------

 ** Improvement

     * Embed the latest manipulator

-    

+

 Version 0.8.0

 -------------

-    * Initial release 

+    * Initial release