Update changelog and dependencies for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1708375 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/doc/changelog.txt b/framework/doc/changelog.txt
index f7639ed..77ed22a 100644
--- a/framework/doc/changelog.txt
+++ b/framework/doc/changelog.txt
@@ -1,3 +1,17 @@
+Changes from 5.2.0 to 5.4.0
+---------------------------
+
+** Bug
+ * [FELIX-5043] - Potential of waiting forever in ServiceRegistry.getService()
+ * [FELIX-5061] - Optional resource fragment with requirements that cause class space consistency issues with the host export cause unexpected ResolutionExceptions
+ * [FELIX-5064] - Framework should provide service capabilities for registered services
+ * [FELIX-5075] - Framework hooks not re-sorted on service ranking update
+
+** Improvement
+ * [FELIX-5014] - Support Windows 10 for Bundle-NativeCode
+ * [FELIX-5034] - Reduce and correct locking related to the hook registry
+ * Update to latest resolver 1.8.0
+
Changes from 5.0.1 to 5.2.0
---------------------------
** Bug
diff --git a/framework/pom.xml b/framework/pom.xml
index 74c9164..6fc2097 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.resolver</artifactId>
- <version>1.7.0-SNAPSHOT</version>
+ <version>1.8.0</version>
<scope>provided</scope>
</dependency>
<dependency>