Author: gnodet
Date: Tue Apr 17 16:25:00 2012
New Revision: 1327165
URL: http://svn.apache.org/viewvc?rev=1327165&view=rev
Log:
Use new felix parent to generate legal files
Added:
felix/trunk/fileinstall/src/main/appended-resources/
felix/trunk/fileinstall/src/main/appended-resources/META-INF/
felix/trunk/fileinstall/src/main/appended-resources/META-INF/DEPENDENCIES
- copied, changed from r1327164, felix/trunk/fileinstall/DEPENDENCIES
Removed:
felix/trunk/fileinstall/DEPENDENCIES
felix/trunk/fileinstall/LICENSE
felix/trunk/fileinstall/NOTICE
Modified:
felix/trunk/fileinstall/pom.xml
Modified: felix/trunk/fileinstall/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/fileinstall/pom.xml?rev=1327165&r1=1327164&r2=1327165&view=diff
==============================================================================
--- felix/trunk/fileinstall/pom.xml (original)
+++ felix/trunk/fileinstall/pom.xml Tue Apr 17 16:25:00 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
+ <version>2</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
@@ -80,15 +80,12 @@
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>
+ <Bundle-DocURL>
+ http://felix.apache.org/site/apache-felix-file-install.html
+ </Bundle-DocURL>
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
<Embed-Dependency>
org.apache.felix.configadmin;inline="org/apache/felix/cm/file/ConfigurationHandler.*",
Copied:
felix/trunk/fileinstall/src/main/appended-resources/META-INF/DEPENDENCIES (from
r1327164, felix/trunk/fileinstall/DEPENDENCIES)
URL:
http://svn.apache.org/viewvc/felix/trunk/fileinstall/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/fileinstall/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/fileinstall/DEPENDENCIES&r1=1327164&r2=1327165&rev=1327165&view=diff
==============================================================================
--- felix/trunk/fileinstall/DEPENDENCIES (original)
+++ felix/trunk/fileinstall/src/main/appended-resources/META-INF/DEPENDENCIES
Tue Apr 17 16:25:00 2012
@@ -1,10 +1,3 @@
-Apache Felix File Install
-Copyright 2008-2012 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
