Skip to content
Permalink
Browse files
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
  • Loading branch information
Stefano Lenzi committed May 17, 2009
1 parent 0ce0623 commit 788debd03e9ce31c01299345459a5732a2d97dd8
Show file tree
Hide file tree
Showing 12 changed files with 38 additions and 46 deletions.
@@ -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
@@ -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>
@@ -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
@@ -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>
@@ -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 @@ The OSGi Alliance (http://www.osgi.org/).
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
@@ -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>
@@ -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 @@ The OSGi Alliance (http://www.osgi.org/).
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
@@ -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>
@@ -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 @@ The OSGi Alliance (http://www.osgi.org/).
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
@@ -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>
@@ -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 @@ The OSGi Alliance (http://www.osgi.org/).
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

@@ -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>

0 comments on commit 788debd

Please sign in to comment.