FELIX-2689 - Upgrade Descriptor generator to new parent POM and adapt legal files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1372268 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/scrtask/changelog.txt b/scrplugin/scrtask/changelog.txt
index 278368a..f0ffc1a 100644
--- a/scrplugin/scrtask/changelog.txt
+++ b/scrplugin/scrtask/changelog.txt
@@ -1,3 +1,20 @@
+Changes from 1.1.4 to 1.2.0
+---------------------------
+
+** Task
+ * [FELIX-3225] - Drop javadoc annotation support
+ * [FELIX-3552] - Implement new features of DS 1.2
+ * [FELIX-3550] - Reimplement the SCR Generator
+
+** Bug
+ * [FELIX-3571] - "Comparison method violates general contract!" error in maven-scr-plugin
+ * [FELIX-3510] - Non java files will be processed
+
+** Improvement
+ * [FELIX-3509] - Undocumented features "strictMode", "parseJavadoc" and "processAnnotations"
+ * [FELIX-2689] - Upgrade Descriptor generator to new parent POM and adapt legal files
+
+
Changes from 1.1.2 to 1.1.4
---------------------------