Prepare 1.2.1 release

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@711870 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/doc/changelog.txt b/bundlerepository/doc/changelog.txt
index 500d841..f2e05c0 100644
--- a/bundlerepository/doc/changelog.txt
+++ b/bundlerepository/doc/changelog.txt
@@ -1,3 +1,15 @@
+Changes from 1.2.0 to 1.2.1
+---------------------------
+* [2008-10-24] Fixed potential NPE when comparing resources. (FELIX-789)
+* [2008-10-24] Removed the default repository URL from OBR, so now it must 
+  be configured to have a repository. (FELIX-481)
+* [2008-10-24] Print message if there are no matching bundles. (FELIX-785)
+* [2008-10-23] Modified the OBR shell command to hide multiple versions of 
+  available artifacts to cut down on noise. It is still possible to list 
+  all versions by using a new "-v" switch.
+* [2008-09-29] Adapt Bundle-DocURL header to modified URL
+
+
 Changes from 1.0.3 to 1.2.0
 ---------------------------
 
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 06f3118..1163642 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -28,7 +28,7 @@
   <name>Apache Felix Bundle Repository</name>
   <description>Bundle repository service.</description>
   <artifactId>org.apache.felix.bundlerepository</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.2.1-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.apache.felix.shell</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
     <dependency>
       <groupId>net.sf.kxml</groupId>