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 2011/03/07 10:24:40 UTC
svn commit: r1078720 - in /felix/trunk/eventadmin/impl: ./
src/main/appended-resources/ src/main/appended-resources/META-INF/
Author: cziegeler
Date: Mon Mar 7 09:24:40 2011
New Revision: 1078720
URL: http://svn.apache.org/viewvc?rev=1078720&view=rev
Log:
Use new parent pom and benefit from FELIX-1747
Added:
felix/trunk/eventadmin/impl/src/main/appended-resources/
felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/
felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/DEPENDENCIES
felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/LICENSE
- copied, changed from r1076577, felix/trunk/eventadmin/impl/LICENSE.sun
felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/NOTICE (with props)
Removed:
felix/trunk/eventadmin/impl/DEPENDENCIES
felix/trunk/eventadmin/impl/LICENSE
felix/trunk/eventadmin/impl/LICENSE.sun
felix/trunk/eventadmin/impl/NOTICE
Modified:
felix/trunk/eventadmin/impl/pom.xml
Modified: felix/trunk/eventadmin/impl/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/pom.xml?rev=1078720&r1=1078719&r2=1078720&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/pom.xml (original)
+++ felix/trunk/eventadmin/impl/pom.xml Mon Mar 7 09:24:40 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>2-SNAPSHOT</version>
<relativePath>../../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,16 +41,19 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>4.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>4.2.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>1.3.4</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
<build>
Added: felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/DEPENDENCIES?rev=1078720&view=auto
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/DEPENDENCIES (added)
+++ felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/DEPENDENCIES Mon Mar 7 09:24:40 2011
@@ -0,0 +1,22 @@
+I. Included Third-Party Software
+
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+This product includes software developed at
+Sun Microsystems, Inc.
+Copyright (c) 1994-2000.
+Licensed under a BSD license.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
+- BSD License
Copied: felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/LICENSE (from r1076577, felix/trunk/eventadmin/impl/LICENSE.sun)
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/LICENSE?p2=felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/LICENSE&p1=felix/trunk/eventadmin/impl/LICENSE.sun&r1=1076577&r2=1078720&rev=1078720&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/LICENSE.sun (original)
+++ felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/LICENSE Mon Mar 7 09:24:40 2011
@@ -1,3 +1,15 @@
+
+
+APACHE FELIX EVENT ADMIN SUBCOMPONENTS:
+
+The Apache Felix Event Admin includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses.
+
+
+For Dough Lea's util.concurrent package:
+
TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. TO DOUG LEA
Whereas Doug Lea desires to utlized certain Java Software technologies
@@ -8,7 +20,7 @@ certain Java Software technologies in th
Therefore the parties agree as follows, effective May 31, 2002:
-âJava Software technologiesâ means
+"Java Software technologies" means
classes/java/util/ArrayList.java, and
classes/java/util/HashMap.java.
Added: felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/NOTICE?rev=1078720&view=auto
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/NOTICE (added)
+++ felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/NOTICE Mon Mar 7 09:24:40 2011
@@ -0,0 +1,4 @@
+This product includes software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
Propchange: felix/trunk/eventadmin/impl/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native