Update changelog and dependencies for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1685480 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index bab85b3..ddf431d 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,8 @@
+Changes from 5.0.0 to 5.0.1
+---------------------------
+** Improvement
+ * Update to framework and main 5.0.1
+
Changes from 4.6.1 to 5.0.0
---------------------------
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index 019d112..1bc31c5 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,14 @@
+Changes from 5.0.0 to 5.0.1
+---------------------------
+** Bug
+ * [FELIX-4867] - Stale bundle revisions don't get cleaned up when last using bundle is gone
+ * [FELIX-4905] - Framework does not export org.osgi.service.resolver
+ * [FELIX-4914] - Resolution problem with identity requirements on fragments
+ * [FELIX-4927] - Felix reports itself as an OSGi R4/R5 Framework
+
+** Improvement
+ * [FELIX-4866] - Improve service registry
+
Changes from 4.6.1 to 5.0.0
---------------------------
** Bug
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 3062260..428fc24 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,8 @@
+Changes from 5.0.0 to 5.0.1
+---------------------------
+** Improvement
+ * Update to latest framework version 5.0.1
+
Changes form 4.6.1 to 5.0.0
---------------------------
diff --git a/main.distribution/doc/changelog_resolver.txt b/main.distribution/doc/changelog_resolver.txt
new file mode 100644
index 0000000..3945e9a
--- /dev/null
+++ b/main.distribution/doc/changelog_resolver.txt
@@ -0,0 +1,32 @@
+1.4.0
+-----
+
+** Bug
+ * [FELIX-4897] - Dynamic package resolution with fragment package exports can lead to invalid wirings
+ * [FELIX-4914] - Resolution problem with identity requirements on fragments
+
+1.2.0
+-----
+
+** Bug
+ * [FELIX-4182] - Issues with package space consistency check
+ * [FELIX-4428] - When inserting hosted capability from an already resolved fragment the real non-hosted capability is not removed as a candidate
+ * [FELIX-4494] - Fragment identity capabilities are incorrectly wrapped
+ * [FELIX-4495] - Candidates from already resolved fragments get ignored if no new hosts are available
+ * [FELIX-4497] - Invalid wirings may result from substitutable exports
+ * [FELIX-4524] - Substituted exports may cause IndexOutOfBoundsException
+ * [FELIX-4642] - NPE in the resolver when substituting
+ * [FELIX-4727] - WrappedResource.getCapabilities ignores the namespace param
+ * [FELIX-4762] - OutOfMemoryError (Java Heap Space) when resolving bundles
+ * [FELIX-4825] - The resolver may return wires to unresolved resources in some cases
+
+** Improvement
+ * [FELIX-4492] - Enhance resolver logging to get better uses diagnostics
+ * [FELIX-4493] - Allow ResolveContext to supply on demand resources
+ * [FELIX-4498] - Resolver does not allow optional reqs to resolve if they introduce class space inconsistencies
+ * [FELIX-4656] - Improve memory usage and speed of the resolver
+
+1.0.0
+-----
+
+** Initial Release
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index dbda547..2293b4d 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -30,7 +30,7 @@
<version>5.1.0-SNAPSHOT</version>
<properties>
<dollar>$</dollar>
- <framework.version>5.0.0</framework.version>
+ <framework.version>5.0.1</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>