Update changelog and prepare 1.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@760601 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/shell/NOTICE b/shell/NOTICE
index 86a705c..19143cd 100644
--- a/shell/NOTICE
+++ b/shell/NOTICE
@@ -16,6 +16,9 @@
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
diff --git a/shell/doc/changelog.txt b/shell/doc/changelog.txt
index 5b2f4b4..6fc8791 100644
--- a/shell/doc/changelog.txt
+++ b/shell/doc/changelog.txt
@@ -1,3 +1,18 @@
+Changes from 1.0.2 to 1.2.0
+---------------------------
+
+** Bug
+ * [FELIX-703] - Cannot install ShellGUIPlugin with OBR
+
+** Improvement
+ * [FELIX-669] - Shell & Shell TUI OBR descriptions
+ * [FELIX-1008] - Rename "packages" command to "exports" to match better with new "imports" command
+
+** New Feature
+ * [FELIX-741] - Modify shell start/stop commands to support transient starting/stopping of bundles
+ * [FELIX-1006] - Add command to shell to list a bundles imported packages
+ * [FELIX-1009] - Add requires/requirers commands to shell
+
Changes from 1.0.1 to 1.0.2
---------------------------
diff --git a/shell/pom.xml b/shell/pom.xml
index 99ea0cb..f05bd2f 100644
--- a/shell/pom.xml
+++ b/shell/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>
@@ -55,6 +55,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>