Updated NOTICE files to 2009 and updated uses section
Changed parent pom to org.apache.felix:felix-parent:1.2.0
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@775686 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/upnp/samples/binarylight/NOTICE b/upnp/samples/binarylight/NOTICE
index b9ec20c..056771a 100644
--- a/upnp/samples/binarylight/NOTICE
+++ b/upnp/samples/binarylight/NOTICE
@@ -1,5 +1,5 @@
Apache Felix UPnP Sample Binary-Light
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2009 The Apache Software Foundation
I. Included Software
@@ -15,6 +15,11 @@
Copyright 2006-2008 The OSGi Alliance.
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
III. License Summary
- Apache License 2.0
- BSD License
diff --git a/upnp/samples/binarylight/pom.xml b/upnp/samples/binarylight/pom.xml
index dd5bd12..3d4050a 100644
--- a/upnp/samples/binarylight/pom.xml
+++ b/upnp/samples/binarylight/pom.xml
@@ -19,9 +19,9 @@
-->
<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>
- <artifactId>felix</artifactId>
+ <artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.0.4</version>
+ <version>1.2.0</version>
<relativePath>../../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/upnp/samples/clock/NOTICE b/upnp/samples/clock/NOTICE
index 91755b5..78bb8fd 100644
--- a/upnp/samples/clock/NOTICE
+++ b/upnp/samples/clock/NOTICE
@@ -1,5 +1,5 @@
Apache Felix UPnP Sample Clock
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2009 The Apache Software Foundation
I. Included Software
@@ -20,6 +20,11 @@
Copyright 2006-2008 The OSGi Alliance.
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
III. License Summary
- Apache License 2.0
- BSD License
diff --git a/upnp/samples/clock/pom.xml b/upnp/samples/clock/pom.xml
index 0dff244..b89d41d 100644
--- a/upnp/samples/clock/pom.xml
+++ b/upnp/samples/clock/pom.xml
@@ -19,9 +19,9 @@
-->
<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>
- <artifactId>felix</artifactId>
+ <artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.0.4</version>
+ <version>1.2.0</version>
<relativePath>../../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/upnp/samples/tv/NOTICE b/upnp/samples/tv/NOTICE
index 1633ca2..5e9809f 100644
--- a/upnp/samples/tv/NOTICE
+++ b/upnp/samples/tv/NOTICE
@@ -1,5 +1,5 @@
Apache Felix UPnP Sample TV
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2009 The Apache Software Foundation
I. Included Software
@@ -20,6 +20,11 @@
Copyright 2006-2008 The OSGi Alliance.
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
+
III. License Summary
- Apache License 2.0
- BSD License
diff --git a/upnp/samples/tv/pom.xml b/upnp/samples/tv/pom.xml
index ebdcd45..2b20318 100644
--- a/upnp/samples/tv/pom.xml
+++ b/upnp/samples/tv/pom.xml
@@ -19,9 +19,9 @@
-->
<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>
- <artifactId>felix</artifactId>
+ <artifactId>felix-parent</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.0.4</version>
+ <version>1.2.0</version>
<relativePath>../../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -35,7 +35,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>