Prepare the Felix 1.2 release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@690797 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/NOTICE b/bundlerepository/NOTICE
index 93d7b1c..a997bda 100644
--- a/bundlerepository/NOTICE
+++ b/bundlerepository/NOTICE
@@ -9,7 +9,7 @@
This product includes 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.
This product includes software from http://kxml.sourceforge.net.
@@ -20,7 +20,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.
III. License Summary
diff --git a/bundlerepository/doc/changelog.txt b/bundlerepository/doc/changelog.txt
index 0b32c9b..500d841 100644
--- a/bundlerepository/doc/changelog.txt
+++ b/bundlerepository/doc/changelog.txt
@@ -1,3 +1,21 @@
+Changes from 1.0.3 to 1.2.0
+---------------------------
+
+* [2008-08-30] Prevent issues when updating running bundles. (FELIX-701)
+* [2008-08-28] Prevent NullPointerException if a locally installed bundle
+ does not have a Bundle-SymbolicName or version. (FELIX-108)
+* [2008-08-12] Added OBR descriptor and updated to the newest bundle plugin. (FELIX-672)
+* [2008-07-31] Use LogService instead of System.err. (FELIX-482)
+* [2008-07-21] Modified OBR to correctly consider the namespace attribute
+ when matching capabilities to requirements. (FELIX-638)
+* [2008-06-26] Implement referral with hop count support. (FELIX-399)
+* [2008-05-09] Return an empty resource array when querying with a filter
+ with invalid syntax. (FELIX-480)
+* [2008-05-09] Fixed improper synchronization with respect to visibility rules.
+* [2008-05-09] Ignore resources with invalid filters. (FELIX-484)
+* [2008-05-09] Move repository URL list initialization to a later time to
+ avoid the default repository URL if it is not desired. (FELIX-485)
+
Changes from 1.0.2 to 1.0.3
---------------------------
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 113db9c..5678020 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -33,12 +33,12 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.service.obr</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.0</version>
+ <version>1.0.2</version>
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
@@ -48,7 +48,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>1.0.0</version>
+ <version>1.2.0</version>
<optional>true</optional>
</dependency>
</dependencies>