You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/08/03 15:25:35 UTC
svn commit: r981863 - in /felix/trunk/fileinstall: DEPENDENCIES NOTICE
doc/changelog.txt pom.xml
Author: rickhall
Date: Tue Aug 3 13:25:34 2010
New Revision: 981863
URL: http://svn.apache.org/viewvc?rev=981863&view=rev
Log:
Prepare for release.
Added:
felix/trunk/fileinstall/DEPENDENCIES
- copied, changed from r980460, felix/trunk/fileinstall/NOTICE
Modified:
felix/trunk/fileinstall/NOTICE
felix/trunk/fileinstall/doc/changelog.txt
felix/trunk/fileinstall/pom.xml
Copied: felix/trunk/fileinstall/DEPENDENCIES (from r980460, felix/trunk/fileinstall/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/DEPENDENCIES?p2=felix/trunk/fileinstall/DEPENDENCIES&p1=felix/trunk/fileinstall/NOTICE&r1=980460&r2=981863&rev=981863&view=diff
==============================================================================
--- felix/trunk/fileinstall/NOTICE (original)
+++ felix/trunk/fileinstall/DEPENDENCIES Tue Aug 3 13:25:34 2010
@@ -1,21 +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 Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
+I. Included Third-Party Software
+n/a
-II. Used Software
+II. Used Third-Party Software
This product uses software developed at
The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
+Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
-
III. License Summary
- Apache License 2.0
Modified: felix/trunk/fileinstall/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/NOTICE?rev=981863&r1=981862&r2=981863&view=diff
==============================================================================
--- felix/trunk/fileinstall/NOTICE (original)
+++ felix/trunk/fileinstall/NOTICE Tue Aug 3 13:25:34 2010
@@ -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
Modified: felix/trunk/fileinstall/doc/changelog.txt
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/doc/changelog.txt?rev=981863&r1=981862&r2=981863&view=diff
==============================================================================
--- felix/trunk/fileinstall/doc/changelog.txt (original)
+++ felix/trunk/fileinstall/doc/changelog.txt Tue Aug 3 13:25:34 2010
@@ -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
Modified: felix/trunk/fileinstall/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/fileinstall/pom.xml?rev=981863&r1=981862&r2=981863&view=diff
==============================================================================
--- felix/trunk/fileinstall/pom.xml (original)
+++ felix/trunk/fileinstall/pom.xml Tue Aug 3 13:25:34 2010
@@ -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>