You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2011/03/24 20:49:33 UTC
svn commit: r1085098 - in /felix/trunk/log: DEPENDENCIES NOTICE pom.xml
Author: rickhall
Date: Thu Mar 24 19:49:33 2011
New Revision: 1085098
URL: http://svn.apache.org/viewvc?rev=1085098&view=rev
Log:
Update NOTICE/DEPENDENCIES files.
Added:
felix/trunk/log/DEPENDENCIES
Modified:
felix/trunk/log/NOTICE
felix/trunk/log/pom.xml
Added: felix/trunk/log/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/log/DEPENDENCIES?rev=1085098&view=auto
==============================================================================
--- felix/trunk/log/DEPENDENCIES (added)
+++ felix/trunk/log/DEPENDENCIES Thu Mar 24 19:49:33 2011
@@ -0,0 +1,24 @@
+Apache Felix Log Service
+Copyright 2011 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
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2007).
+Licensed under the Apache License 2.0.
+
+
+II. Used Third=Party Software
+
+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/log/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/log/NOTICE?rev=1085098&r1=1085097&r2=1085098&view=diff
==============================================================================
--- felix/trunk/log/NOTICE (original)
+++ felix/trunk/log/NOTICE Thu Mar 24 19:49:33 2011
@@ -1,8 +1,5 @@
Apache Felix Log Service
-Copyright 2009 The Apache Software Foundation
-
-
-I. Included Software
+Copyright 2011 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -12,15 +9,3 @@ This product includes software developed
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
-
-
-II. Used Software
-
-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/log/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/log/pom.xml?rev=1085098&r1=1085097&r2=1085098&view=diff
==============================================================================
--- felix/trunk/log/pom.xml (original)
+++ felix/trunk/log/pom.xml Thu Mar 24 19:49:33 2011
@@ -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.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -58,6 +58,7 @@
<Bundle-Activator>${pom.artifactId}.Activator</Bundle-Activator>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
<Export-Service>org.osgi.service.log.LogService,org.osgi.service.log.LogReaderService</Export-Service>
+ <Include-Resource>{maven-resources},META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
</configuration>
</plugin>