Release Preparation:
- update changelogs
- bump version to run the final tests)
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1645899 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/composite/changelog.txt b/ipojo/runtime/composite/changelog.txt
index a63b2df..639323f 100644
--- a/ipojo/runtime/composite/changelog.txt
+++ b/ipojo/runtime/composite/changelog.txt
@@ -1,3 +1,16 @@
+Changes from 1.12.0 to 1.12.1
+-----------------------------
+
+** Bug
+ * [FELIX-3836] - NPE when calling InstanceDescription.getDescription()
+ * [FELIX-4565] - Occasional ArrayIndexOutOfBoundException in iPOJO's ProvidedServiceHandler
+ * [FELIX-4646] - @Context(Context.Source.INSTANCE) does not inject bundle context
+ * [FELIX-4713] - Error in ProvidedServiceHandler.checkProvidedService : only the first service is checked
+ * [FELIX-4715] - instance bundle context injection does not works
+ * [FELIX-4716] - Bundle org.apache.felix.ipojo physically contains OSGi API classes
+ * [FELIX-4717] - Cannot use the stream API on injected collections
+ * [FELIX-4728] - InstanceManager concurrency issue
+
Changes from 1.11.2 to 1.12.0
-----------------------------
diff --git a/ipojo/runtime/composite/pom.xml b/ipojo/runtime/composite/pom.xml
index 037da0e..0613611 100644
--- a/ipojo/runtime/composite/pom.xml
+++ b/ipojo/runtime/composite/pom.xml
@@ -30,7 +30,7 @@
<version>1.12.1-SNAPSHOT</version>
<properties>
- <ipojo.package.version>1.12.0</ipojo.package.version>
+ <ipojo.package.version>1.12.1</ipojo.package.version>
</properties>
<description>
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.12.0</version>
+ <version>1.12.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>