Update changelog files for the next release (1.4.2)
Update dependencies to use released version.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@806490 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/ant/doc/changelog.txt b/ipojo/ant/doc/changelog.txt
index 34adf7b..24fc431 100644
--- a/ipojo/ant/doc/changelog.txt
+++ b/ipojo/ant/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from the 1.4.0 to 1.4.2
+-------------------------------
+** Bug
+ * [FELIX-1411] - Issue on windows to find components inside bundle
+
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
diff --git a/ipojo/ant/pom.xml b/ipojo/ant/pom.xml
index 1b93f9e..b94ba8b 100644
--- a/ipojo/ant/pom.xml
+++ b/ipojo/ant/pom.xml
@@ -41,7 +41,8 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <!-- <version>${pom.version}</version> -->
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
diff --git a/ipojo/manipulator/doc/changelog.txt b/ipojo/manipulator/doc/changelog.txt
index 683250e..24e167e 100644
--- a/ipojo/manipulator/doc/changelog.txt
+++ b/ipojo/manipulator/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from the 1.4.0 to 1.4.2
+-------------------------------
+** Bug
+ * [FELIX-1411] - Issue on windows to find components inside bundle
+
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index d336c0f..587eca0 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -49,7 +49,8 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
+ <!-- <version>${pom.version}</version> -->
+ <version>1.4.0</version>
</dependency>
</dependencies>
<build>
diff --git a/ipojo/plugin/doc/changelog.txt b/ipojo/plugin/doc/changelog.txt
index 9fcee21..3649f9e 100644
--- a/ipojo/plugin/doc/changelog.txt
+++ b/ipojo/plugin/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from the 1.4.0 to 1.4.2
+-------------------------------
+** Bug
+ * [FELIX-1411] - Issue on windows to find components inside bundle
+
+
Changes from 1.2.0 to 1.4.0
---------------------------
** Bug
diff --git a/ipojo/plugin/pom.xml b/ipojo/plugin/pom.xml
index 5d2b68f..0b89d71 100644
--- a/ipojo/plugin/pom.xml
+++ b/ipojo/plugin/pom.xml
@@ -67,8 +67,8 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>${pom.version}</version>
- </dependency>
+ <!-- <version>${pom.version}</version> -->
+ <version>1.4.0</version> </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
diff --git a/ipojo/webconsole-plugin/doc/changelog.txt b/ipojo/webconsole-plugin/doc/changelog.txt
index ce9d069..55c9534 100644
--- a/ipojo/webconsole-plugin/doc/changelog.txt
+++ b/ipojo/webconsole-plugin/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from the 1.4.0 to 1.4.2
+-------------------------------
+** Bug
+ * [FELIX-1497] - iPOJO Web Console plugin NPE when the service reference list is null
+
+
Version 1.4.0
-------------
** Improvement
diff --git a/ipojo/webconsole-plugin/pom.xml b/ipojo/webconsole-plugin/pom.xml
index a2f9b1b..166325b 100644
--- a/ipojo/webconsole-plugin/pom.xml
+++ b/ipojo/webconsole-plugin/pom.xml
@@ -114,12 +114,14 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo</artifactId>
- <version>${pom.version}</version>
+ <!-- <version>${pom.version}</version> -->
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.annotations</artifactId>
- <version>${pom.version}</version>
+ <!-- <version>${pom.version}</version> -->
+ <version>1.4.0</version>
</dependency>
</dependencies>
</project>