You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2009/06/23 09:09:20 UTC

svn commit: r787570 - in /felix/trunk/prefs: NOTICE pom.xml

Author: cziegeler
Date: Tue Jun 23 07:09:19 2009
New Revision: 787570

URL: http://svn.apache.org/viewvc?rev=787570&view=rev
Log:
Use latest parent pom and update notice file.

Modified:
    felix/trunk/prefs/NOTICE
    felix/trunk/prefs/pom.xml

Modified: felix/trunk/prefs/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/NOTICE?rev=787570&r1=787569&r2=787570&view=diff
==============================================================================
--- felix/trunk/prefs/NOTICE (original)
+++ felix/trunk/prefs/NOTICE Tue Jun 23 07:09:19 2009
@@ -1,10 +1,30 @@
 Apache Felix Preferences Service
-Copyright 2007-2008 The Apache Software Foundation
+Copyright 2007-2009 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.
 
 This product includes software developed at
 The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
+Copyright (c) OSGi Alliance (2000, 2007).
 Licensed under the Apache License 2.0.
+
+
+II. Used Software
+
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+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/prefs/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/prefs/pom.xml?rev=787570&r1=787569&r2=787570&view=diff
==============================================================================
--- felix/trunk/prefs/pom.xml (original)
+++ felix/trunk/prefs/pom.xml Tue Jun 23 07:09:19 2009
@@ -22,8 +22,8 @@
 
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>felix</artifactId>
-        <version>1.0.4</version>
+        <artifactId>felix-parent</artifactId>
+        <version>1.2.0</version>
         <relativePath>../pom</relativePath>
     </parent>
 
@@ -38,14 +38,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>1.0.0</version>
+            <version>1.2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>${pom.groupId}</groupId>
+            <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.compendium</artifactId>
-            <version>1.0.0</version>
+            <version>1.2.0</version>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>
@@ -67,7 +68,7 @@
                         <Bundle-SymbolicName>
                             ${artifactId}
                         </Bundle-SymbolicName>
-            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
                         <Export-Package>
                             org.apache.felix.prefs,
                             org.osgi.service.prefs;version=1.1