Author: fmeschbe
Date: Fri Feb 4 23:09:42 2011
New Revision: 1067336
URL: http://svn.apache.org/viewvc?rev=1067336&view=rev
Log:
FELIX-1747 Use new Felix Parent POM 2-SNAPSHOT and move
legal file additions
Added:
felix/trunk/configadmin/src/main/appended-resources/
felix/trunk/configadmin/src/main/appended-resources/META-INF/
felix/trunk/configadmin/src/main/appended-resources/META-INF/DEPENDENCIES
- copied, changed from r1067335, felix/trunk/configadmin/DEPENDENCIES
felix/trunk/configadmin/src/main/appended-resources/META-INF/NOTICE (with
props)
Removed:
felix/trunk/configadmin/DEPENDENCIES
felix/trunk/configadmin/LICENSE
felix/trunk/configadmin/NOTICE
Modified:
felix/trunk/configadmin/pom.xml
Modified: felix/trunk/configadmin/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/pom.xml?rev=1067336&r1=1067335&r2=1067336&view=diff
==============================================================================
--- felix/trunk/configadmin/pom.xml (original)
+++ felix/trunk/configadmin/pom.xml Fri Feb 4 23:09:42 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>2-SNAPSHOT</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
Copied:
felix/trunk/configadmin/src/main/appended-resources/META-INF/DEPENDENCIES (from
r1067335, felix/trunk/configadmin/DEPENDENCIES)
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/configadmin/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/configadmin/DEPENDENCIES&r1=1067335&r2=1067336&rev=1067336&view=diff
==============================================================================
--- felix/trunk/configadmin/DEPENDENCIES (original)
+++ felix/trunk/configadmin/src/main/appended-resources/META-INF/DEPENDENCIES
Fri Feb 4 23:09:42 2011
@@ -1,10 +1,3 @@
-Apache Felix Configuration Admin Service
-Copyright 2006-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
This product includes software developed at
Added: felix/trunk/configadmin/src/main/appended-resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/felix/trunk/configadmin/src/main/appended-resources/META-INF/NOTICE?rev=1067336&view=auto
==============================================================================
--- felix/trunk/configadmin/src/main/appended-resources/META-INF/NOTICE (added)
+++ felix/trunk/configadmin/src/main/appended-resources/META-INF/NOTICE Fri Feb
4 23:09:42 2011
@@ -0,0 +1,4 @@
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
\ No newline at end of file
Propchange: felix/trunk/configadmin/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
