You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by le...@apache.org on 2009/05/17 18:04:40 UTC
svn commit: r775686 - in /felix/trunk/upnp: ./ basedriver/ extra/ samples/
samples/binarylight/ samples/clock/ samples/tv/ tester/
Author: lenzi
Date: Sun May 17 16:04:39 2009
New Revision: 775686
URL: http://svn.apache.org/viewvc?rev=775686&view=rev
Log:
Updated NOTICE files to 2009 and updated uses section
Changed parent pom to org.apache.felix:felix-parent:1.2.0
Modified:
felix/trunk/upnp/ (props changed)
felix/trunk/upnp/basedriver/NOTICE
felix/trunk/upnp/basedriver/pom.xml
felix/trunk/upnp/extra/NOTICE
felix/trunk/upnp/extra/pom.xml
felix/trunk/upnp/samples/ (props changed)
felix/trunk/upnp/samples/binarylight/NOTICE
felix/trunk/upnp/samples/binarylight/pom.xml
felix/trunk/upnp/samples/clock/NOTICE
felix/trunk/upnp/samples/clock/pom.xml
felix/trunk/upnp/samples/tv/NOTICE
felix/trunk/upnp/samples/tv/pom.xml
felix/trunk/upnp/tester/NOTICE
felix/trunk/upnp/tester/pom.xml
Propchange: felix/trunk/upnp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun May 17 16:04:39 2009
@@ -1,3 +1,4 @@
+target
.project
.classpath
bin
Modified: felix/trunk/upnp/basedriver/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/NOTICE?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/NOTICE (original)
+++ felix/trunk/upnp/basedriver/NOTICE Sun May 17 16:04:39 2009
@@ -1,5 +1,5 @@
Apache Felix UPnP Base Driver
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/upnp/basedriver/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/basedriver/pom.xml?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/basedriver/pom.xml (original)
+++ felix/trunk/upnp/basedriver/pom.xml Sun May 17 16:04:39 2009
@@ -1,8 +1,8 @@
<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</artifactId>
- <version>1.0.4</version>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,27 +11,6 @@
<name>Apache Felix UPnP Base Driver</name>
<artifactId>org.apache.felix.upnp.basedriver</artifactId>
<version>0.9.0-SNAPSHOT</version>
- <repositories>
- <!-- For snapshots (no release jars or non-apache jars) -->
- <repository>
- <id>snap.domoware.isti.cnr.it</id>
- <name>Domoware Snapshot Repository</name>
- <url>http://domoware.isti.cnr.it/maven2-snap</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- <!-- For release (no snapshots jars or non-apache jars) -->
- <repository>
- <id>release.domoware.isti.cnr.it</id>
- <name>Domoware Release Repository</name>
- <url>http://domoware.isti.cnr.it/maven2</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
- <!-- <url>http://maven.apache.org</url> -->
<profiles>
<profile>
@@ -62,7 +41,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.5.0-SNAPSHOT</version>
<executions>
<execution>
<id>cyberlink</id>
@@ -117,7 +95,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<excludeDependencies>org.cybergarage.cyberlink:upnp-stack,upnp-stack-jdk13</excludeDependencies>
Modified: felix/trunk/upnp/extra/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/extra/NOTICE?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/extra/NOTICE (original)
+++ felix/trunk/upnp/extra/NOTICE Sun May 17 16:04:39 2009
@@ -1,5 +1,5 @@
Apache Felix UPnP Extra
-Copyright 2006-2008 The Apache Software Foundation
+Copyright 2006-2009 The Apache Software Foundation
I. Included Software
Modified: felix/trunk/upnp/extra/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/extra/pom.xml?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/extra/pom.xml (original)
+++ felix/trunk/upnp/extra/pom.xml Sun May 17 16:04:39 2009
@@ -19,8 +19,8 @@
<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</artifactId>
- <version>1.0.4</version>
+ <artifactId>felix-parent</artifactId>
+ <version>1.2.0</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -43,7 +43,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Propchange: felix/trunk/upnp/samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun May 17 16:04:39 2009
@@ -0,0 +1,2 @@
+target
+
Modified: felix/trunk/upnp/samples/binarylight/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/binarylight/NOTICE?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/samples/binarylight/NOTICE (original)
+++ felix/trunk/upnp/samples/binarylight/NOTICE Sun May 17 16:04:39 2009
@@ -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
Modified: felix/trunk/upnp/samples/binarylight/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/binarylight/pom.xml?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/samples/binarylight/pom.xml (original)
+++ felix/trunk/upnp/samples/binarylight/pom.xml Sun May 17 16:04:39 2009
@@ -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>
Modified: felix/trunk/upnp/samples/clock/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/clock/NOTICE?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/samples/clock/NOTICE (original)
+++ felix/trunk/upnp/samples/clock/NOTICE Sun May 17 16:04:39 2009
@@ -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
Modified: felix/trunk/upnp/samples/clock/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/clock/pom.xml?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/samples/clock/pom.xml (original)
+++ felix/trunk/upnp/samples/clock/pom.xml Sun May 17 16:04:39 2009
@@ -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>
Modified: felix/trunk/upnp/samples/tv/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/tv/NOTICE?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/samples/tv/NOTICE (original)
+++ felix/trunk/upnp/samples/tv/NOTICE Sun May 17 16:04:39 2009
@@ -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
Modified: felix/trunk/upnp/samples/tv/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/samples/tv/pom.xml?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/samples/tv/pom.xml (original)
+++ felix/trunk/upnp/samples/tv/pom.xml Sun May 17 16:04:39 2009
@@ -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>
Modified: felix/trunk/upnp/tester/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/tester/NOTICE?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/tester/NOTICE (original)
+++ felix/trunk/upnp/tester/NOTICE Sun May 17 16:04:39 2009
@@ -1,5 +1,5 @@
Apache Felix UPnP Tester
-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
Modified: felix/trunk/upnp/tester/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/upnp/tester/pom.xml?rev=775686&r1=775685&r2=775686&view=diff
==============================================================================
--- felix/trunk/upnp/tester/pom.xml (original)
+++ felix/trunk/upnp/tester/pom.xml Sun May 17 16:04:39 2009
@@ -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>
@@ -37,7 +37,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<instructions>