Update release notes and version in preparation for the release
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1604092 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/doc/changelog.txt b/bundleplugin/doc/changelog.txt
index 001b948..3cad331 100644
--- a/bundleplugin/doc/changelog.txt
+++ b/bundleplugin/doc/changelog.txt
@@ -1,3 +1,17 @@
+Changes from 2.4.0 to 2.5.0
+---------------------------
+
+** Improvement
+ * [FELIX-3381] - Support for {maven-test-resources} and {maven-test-sources} placeholders
+ * [FELIX-4205] - "null" Bundle-Activator causes bundle to fail
+ * [FELIX-4518] - Provide a way to disable some plugins
+ * [FELIX-4539] - Update to Bndlib 2.3.0
+
+** New Feature
+ * [FELIX-3462] - Nicer Manifest formatting
+ * [FELIX-4512] - Add a new Mojo to invoke the BND Baseline tool
+ * [FELIX-4517] - Generate generic capabilities and requirements for services from blueprint and scr descriptors
+
Changes from 2.3.7 to 2.4.0
---------------------------
diff --git a/bundleplugin/pom.xml b/bundleplugin/pom.xml
index ab92a3e..434aca7 100644
--- a/bundleplugin/pom.xml
+++ b/bundleplugin/pom.xml
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.1-SNAPSHOT</version>
+ <version>2.5.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Bundle Plugin</name>