Update dependencies and changelog

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1442773 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main/doc/changelog.txt b/main/doc/changelog.txt
index 64159d5..445ee60 100644
--- a/main/doc/changelog.txt
+++ b/main/doc/changelog.txt
@@ -1,3 +1,15 @@
+Changes from 4.0.3 to 4.2.0
+---------------------------
+
+** Improvement
+    * Update to latest framework version 4.2.0
+
+Changes from 4.0.2 to 4.0.3
+---------------------------
+
+** Improvement
+    * Update to latest framework version 4.0.3
+
 Changes from 4.0.1 to 4.0.2
 ---------------------------
 
diff --git a/main/pom.xml b/main/pom.xml
index 6459d11..7d855ec 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -43,7 +43,7 @@
   <properties>
     <log.level>4</log.level>
     <dollar>$</dollar>
-    <framework.version>4.1.0-SNAPSHOT</framework.version>
+    <framework.version>4.2.0</framework.version>
     <gogo.runtime.version>0.10.0</gogo.runtime.version>
     <gogo.shell.version>0.10.0</gogo.shell.version>
     <gogo.command.version>0.12.0</gogo.command.version>