Update changelog and prepare 1.2.0 release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk/shell.tui@760623 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/NOTICE b/NOTICE
index b1e0dad..5955b0a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -15,6 +15,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
diff --git a/doc/changelog.txt b/doc/changelog.txt
index ba03b5c..e327dd4 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,3 +1,9 @@
+Changes from 1.0.2 to 1.2.0
+---------------------------
+
+** Bug
+ * [FELIX-729] - Shell-TUI causes 100% CPU load when using javaw launcher
+
Changes from 1.0.1 to 1.0.2
---------------------------
diff --git a/pom.xml b/pom.xml
index 416ea30..f7db75f 100644
--- a/pom.xml
+++ b/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.1.0-SNAPSHOT</version>
+ <version>1.2.0</version>
</dependency>
</dependencies>
<build>
@@ -61,6 +61,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>
