Update changelogs and dependencies for release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1102035 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/main.distribution/doc/changelog.txt b/main.distribution/doc/changelog.txt
index 5f329d9..97dbb44 100644
--- a/main.distribution/doc/changelog.txt
+++ b/main.distribution/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 3.2.1 to 3.2.2
+---------------------------
+
+** Improvement
+ * Update to framework and main 3.2.2
+
Changes from 3.2.0 to 3.2.1
---------------------------
diff --git a/main.distribution/doc/changelog_framework.txt b/main.distribution/doc/changelog_framework.txt
index 6057806..7285afb 100644
--- a/main.distribution/doc/changelog_framework.txt
+++ b/main.distribution/doc/changelog_framework.txt
@@ -1,3 +1,12 @@
+Changes from 3.2.1 to 3.2.2
+---------------------------
+
+** Bug
+ * [FELIX-2935] - Bundle.getEntryPaths and findEntries are returning META-INF/ multiple times
+ * [FELIX-2941] - Felix Framework 3.2.0 and Framework Security 1.4.2 fails OSGI Conditional Permission Admin CT when running on IBM JVM 5 and 6.
+ * [FELIX-2942] - Bundles with higher start level get activated even before framework reaches that start level
+
+
Changes from 3.2.0 to 3.2.1
---------------------------
diff --git a/main.distribution/doc/changelog_main.txt b/main.distribution/doc/changelog_main.txt
index fed60ac..8eae0df 100644
--- a/main.distribution/doc/changelog_main.txt
+++ b/main.distribution/doc/changelog_main.txt
@@ -1,3 +1,9 @@
+Changes from 3.2.1 to 3.2.2
+---------------------------
+
+** Improvement
+ * Update to latest framework version 3.2.2
+
Changes from 3.2.0 to 3.2.1
---------------------------
diff --git a/main.distribution/pom.xml b/main.distribution/pom.xml
index 82663d7..8f060dc 100644
--- a/main.distribution/pom.xml
+++ b/main.distribution/pom.xml
@@ -30,7 +30,7 @@
<version>3.3.0-SNAPSHOT</version>
<properties>
<dollar>$</dollar>
- <framework.version>3.3.0-SNAPSHOT</framework.version>
+ <framework.version>3.2.2</framework.version>
<gogo.runtime.version>0.8.0</gogo.runtime.version>
<gogo.shell.version>0.8.0</gogo.shell.version>
<gogo.command.version>0.8.0</gogo.command.version>