Update changelog and dependencies for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1708392 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 0ffb00a..d616b1f 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,12 @@
+Changes from 5.2.0 to 5.4.0
+---------------------------
+
+** Improvement
+ * Update to framework and main 5.4.0
+ * Update to latest obr version 2.0.6
+ * Update to latest gogo shell 0.12.0
+ * Update to latest gogo commands 0.16.0
+
Changes from 5.0.1 to 5.2.0
---------------------------
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index f7639ed..77ed22a 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.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/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 1b385b7..635b4c2 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,12 @@
+Changes from 5.2.0 to 5.4.0
+---------------------------
+
+** Improvement
+ * Update to latest framework version 5.4.0
+ * Update to latest obr 2.0.6
+ * Update to latest gogo shell 0.12.0
+ * Update to latest gogo command 0.16.0
+
Changes from 5.0.1 to 5.2.0
---------------------------
diff --git a/main.distribution/doc/changelog_resolver.txt b/main.distribution/doc/changelog_resolver.txt
index 81e69a4..801e3ed 100644
--- a/main.distribution/doc/changelog_resolver.txt
+++ b/main.distribution/doc/changelog_resolver.txt
@@ -1,3 +1,9 @@
+1.8.0
+-----
+
+** Bug
+ * [FELIX-5015] - NPE in ResolverImpl
+
1.6.0
-----
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 986810d..089e3e0 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -30,11 +30,11 @@
<version>5.3.0-SNAPSHOT</version>
<properties>
<dollar>$</dollar>
- <framework.version>5.2.0</framework.version>
+ <framework.version>5.4.0</framework.version>
<gogo.runtime.version>0.16.2</gogo.runtime.version>
- <gogo.shell.version>0.10.0</gogo.shell.version>
- <gogo.command.version>0.14.0</gogo.command.version>
- <obr.version>2.0.4</obr.version>
+ <gogo.shell.version>0.12.0</gogo.shell.version>
+ <gogo.command.version>0.16.0</gogo.command.version>
+ <obr.version>2.0.6</obr.version>
</properties>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/felix/trunk/main.distribution</connection>