Prepare the Felix 1.2 release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@690795 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/shell/NOTICE b/shell/NOTICE
index 7eda759..86a705c 100644
--- a/shell/NOTICE
+++ b/shell/NOTICE
@@ -13,7 +13,7 @@
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
diff --git a/shell/doc/changelog.txt b/shell/doc/changelog.txt
index 303f92b..5b2f4b4 100644
--- a/shell/doc/changelog.txt
+++ b/shell/doc/changelog.txt
@@ -1,3 +1,11 @@
+Changes from 1.0.1 to 1.0.2
+---------------------------
+
+* [2008-08-12] Added OBR descriptor and updated to bundle plugin version
+ 1.4.3. (FELIX-669)
+* [2008-05-08] Modified "update" command to not append ".jar" to URLs and
+ modified the "install" command to use the same code. (FELIX-544)
+
Changes from 1.0.0 to 1.0.1
---------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index a5bf805..99ea0cb 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
<build>