Prepare release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1024032 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index e378885..240a78f 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.4 to 3.0.5
+---------------------------
+
+** Improvement
+ * Update to framework and main 3.0.5
+
Changes from 3.0.3 to 3.0.4
---------------------------
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index 1984c8d..b45059d 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,13 @@
+Changes from 3.0.4 to 3.0.5
+---------------------------
+
+** Bug
+ * [FELIX-2653] - LinkageError caused by duplicate class definition during implicit boot delegation
+
+** Improvement
+ * [FELIX-2645] - Add a (hidden) way to retrieve a local URL for a given bundle URL
+ * [FELIX-2654] - [Framework] Modify bundle cache to use a single file per bundle state
+
Changes from 3.0.3 to 3.0.4
---------------------------
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 6f11898..c52aaf2 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.4 to 3.0.5
+---------------------------
+
+** Improvement
+ * Update to latest framework version 3.0.5
+
Changes from 3.0.3 to 3.0.4
---------------------------
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 15459fc..5ef532c 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -29,7 +29,7 @@
<artifactId>org.apache.felix.main.distribution</artifactId>
<version>3.1.0-SNAPSHOT</version>
<properties>
- <framework.version>3.1.0-SNAPSHOT</framework.version>
+ <framework.version>3.0.5</framework.version>
<gogo.runtime.version>0.6.1</gogo.runtime.version>
<gogo.shell.version>0.6.1</gogo.shell.version>
<gogo.command.version>0.6.1</gogo.command.version>