Update changelog and update dependencies to released versions
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@811883 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.osgi.compendium/doc/changelog.txt b/org.osgi.compendium/doc/changelog.txt
index fdc46dc..98616f0 100644
--- a/org.osgi.compendium/doc/changelog.txt
+++ b/org.osgi.compendium/doc/changelog.txt
@@ -1,3 +1,11 @@
+Changes from 1.2.0 to 1.4.0
+----------------------------
+
+*[2009-09-01] Update to latest R4.2 API
+
+Changes from 1.0.1 to 1.2.0
+----------------------------
+
* [2008-08-02] Updated from Compendium 4.0 to 4.1 (FELIX-514)
Changes from 1.0.0 to 1.0.1
diff --git a/org.osgi.compendium/pom.xml b/org.osgi.compendium/pom.xml
index 3c2da97..854f52b 100644
--- a/org.osgi.compendium/pom.xml
+++ b/org.osgi.compendium/pom.xml
@@ -18,10 +18,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>felix</artifactId>
- <version>1.0.4</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
+ <relativePath>../pom/pom.xml</relativePath> </parent>
<organization>
<name>OSGi Alliance</name>
<url>http://www.osgi.org/</url>
@@ -36,7 +35,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
@@ -46,7 +45,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.foundation</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
<build>