Update changelog and prepare 1.4.0 release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@760628 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/NOTICE b/bundlerepository/NOTICE
index a997bda..17f4e6b 100644
--- a/bundlerepository/NOTICE
+++ b/bundlerepository/NOTICE
@@ -23,6 +23,10 @@
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Codehaus (http://www.codehaus.org)
+Licensed under the Apache License 2.0.
+
III. License Summary
- Apache License 2.0
- BSD License
diff --git a/bundlerepository/doc/changelog.txt b/bundlerepository/doc/changelog.txt
index f2e05c0..6e69938 100644
--- a/bundlerepository/doc/changelog.txt
+++ b/bundlerepository/doc/changelog.txt
@@ -1,3 +1,19 @@
+Changes from 1.2.1 to 1.2.2
+---------------------------
+** Bug
+ * [FELIX-973] - FilterImpl from Felix Framework does not support none LDAP operators
+ * [FELIX-977] - Bundle resolving runs extreme long
+ * [FELIX-999] - The OBR ResolverImpl shouldn't try to start fragment bundles
+
+** Improvement
+ * [FELIX-884] - OBR should expose registered services as capabilities of local repository
+ * [FELIX-887] - Ensure BundleListeners are not forgotten about
+ * [FELIX-940] - Add support for execution environment
+ * [FELIX-986] - Include the symbolicname in the output of obr list -v
+
+** New Feature
+ * [FELIX-976] - OBR update-url shell command
+
Changes from 1.2.0 to 1.2.1
---------------------------
* [2008-10-24] Fixed potential NPE when comparing resources. (FELIX-789)
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 3fc6938..8b69b0c 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
- <version>1.0.2</version>
+ <version>1.0.4</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.shell</artifactId>
- <version>1.0.2</version>
+ <version>1.2.0</version>
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
@@ -75,6 +75,21 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+ <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+ <excludes>
+ <param>doc/*</param>
+ <param>maven-eclipse.xml</param>
+ <param>.checkstyle</param>
+ <param>.externalToolBuilders/*</param>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>