Prepare for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@986923 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 710db94..c2af2c0 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.1 to 3.0.2
+---------------------------
+
+** Improvement
+ * Update to framework and main 3.0.1
+
Changes form 3.0.0 to 3.0.1
---------------------------
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index f0a91e8..48fec12 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,19 @@
+Changes from 3.0.1 to 3.0.2
+---------------------------
+
+** Bug
+ * [FELIX-2421] - Implicit bootdelegation doesn't ignore classloaders if they are inner classes
+ * [FELIX-2437] - Deadlock on refrsh Import and refresh
+ * [FELIX-2451] - Felix uses System.out to print debug messages related to resolver...
+ * [FELIX-2459] - Wrong error message on a missing package
+ * [FELIX-2466] - Unknown attributes are not stripped from Fragment-Host header
+ * [FELIX-2473] - Subtring matching is incorreclty matching against an empty string
+ * [FELIX-2479] - Required bundles not correctly re-exporting their substitutable exports
+
+** Improvement
+ * [FELIX-2528] - Potential performance issue in resolver when uses constraint conflict is detected
+ * [FELIX-2529] - In some scenarios the resolver will not backtrack on imported package decisions
+
Changes from 3.0.0 to 3.0.1
---------------------------
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index 1fe3f8c..4178b50 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,9 @@
+Changes from 3.0.1 to 3.0.2
+---------------------------
+
+** Improvement
+ * Update to latest framework version 3.0.2
+
Changes from 3.0.0 to 3.0.1
---------------------------
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 7c2418c..801cf1e 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.2</framework.version>
<gogo.runtime.version>0.6.0</gogo.runtime.version>
<gogo.shell.version>0.6.0</gogo.shell.version>
<gogo.command.version>0.6.0</gogo.command.version>