Fix license issue
Update changelog
Upgrade some settings in the configuration test suite
Add the obr.xml file for the web console plugin

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@795564 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/annotations/doc/changelog.txt b/ipojo/annotations/doc/changelog.txt
index f3d9feb..6dbbdb9 100644
--- a/ipojo/annotations/doc/changelog.txt
+++ b/ipojo/annotations/doc/changelog.txt
@@ -1,3 +1,12 @@
+Changes from 1.2.0 to 1.4.0

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

+** Bug

+    * [FELIX-1319] - Issue in the metadata overriding analysis in iPOJO annotations

+

+** Improvement

+    * Update parent pom

+

+    

 Changes from 1.0.0 to 1.2.0

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

 ** Improvement

@@ -17,4 +26,4 @@
 

 Version 0.8.0

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

-    * Initial release
\ No newline at end of file
+    * Initial release