Prepare for release.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@981863 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/fileinstall/DEPENDENCIES b/fileinstall/DEPENDENCIES
new file mode 100644
index 0000000..2d0ff80
--- /dev/null
+++ b/fileinstall/DEPENDENCIES
@@ -0,0 +1,20 @@
+Apache Felix File Install
+Copyright 2008-2010 The Apache Software Foundation
+
+This software was developed at the Apache Software Foundation
+(http://www.apache.org) and may have dependencies on other
+Apache software licensed under Apache License 2.0.
+
+I. Included Third-Party Software
+
+n/a
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/fileinstall/NOTICE b/fileinstall/NOTICE
index 8c01e98..c37710c 100644
--- a/fileinstall/NOTICE
+++ b/fileinstall/NOTICE
@@ -1,21 +1,6 @@
Apache Felix File Install
Copyright 2008-2010 The Apache Software Foundation
-
-I. Included Software
-
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
diff --git a/fileinstall/doc/changelog.txt b/fileinstall/doc/changelog.txt
index bf36dfa..4b25cf0 100644
--- a/fileinstall/doc/changelog.txt
+++ b/fileinstall/doc/changelog.txt
@@ -1,3 +1,11 @@
+Version 3.0.2
+-------------
+** Bug
+ * [FELIX-2366] - Avoiding property substitution by escaping does not remove escape character
+
+** Improvement
+ * [FELIX-1657] - Add option in fileinstall to start bundles transiently (START_TRANSIENT)
+
Version 3.0.0
-------------
** Bug
diff --git a/fileinstall/pom.xml b/fileinstall/pom.xml
index f984472..3eec267 100644
--- a/fileinstall/pom.xml
+++ b/fileinstall/pom.xml
@@ -17,12 +17,12 @@
under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.1</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
@@ -63,6 +63,7 @@
org.osgi.service.cm;resolution:=optional,
*
</Import-Package>
+ <Include-Resource>src/main/resources,META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
<Bundle-Activator>org.apache.felix.fileinstall.internal.FileInstall</Bundle-Activator>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
@@ -70,21 +71,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>
+ <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>