You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2009/04/09 11:22:32 UTC
svn commit: r763574 - in /felix/trunk/ipojo: api/LICENSE.asm api/NOTICE
api/pom.xml arch/NOTICE core/NOTICE
junit4osgi/maven-junit4osgi-plugin/pom.xml manipulator/LICENSE.asm
manipulator/NOTICE manipulator/pom.xml
Author: clement
Date: Thu Apr 9 09:22:31 2009
New Revision: 763574
URL: http://svn.apache.org/viewvc?rev=763574&view=rev
Log:
Fix some issues in LICENSE and NOTICE files.
Modified:
felix/trunk/ipojo/api/LICENSE.asm
felix/trunk/ipojo/api/NOTICE
felix/trunk/ipojo/api/pom.xml
felix/trunk/ipojo/arch/NOTICE
felix/trunk/ipojo/core/NOTICE
felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
felix/trunk/ipojo/manipulator/LICENSE.asm
felix/trunk/ipojo/manipulator/NOTICE
felix/trunk/ipojo/manipulator/pom.xml
Modified: felix/trunk/ipojo/api/LICENSE.asm
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/api/LICENSE.asm?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/api/LICENSE.asm (original)
+++ felix/trunk/ipojo/api/LICENSE.asm Thu Apr 9 09:22:31 2009
@@ -1,28 +1,29 @@
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
Modified: felix/trunk/ipojo/api/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/api/NOTICE?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/api/NOTICE (original)
+++ felix/trunk/ipojo/api/NOTICE Thu Apr 9 09:22:31 2009
@@ -1,5 +1,5 @@
Apache Felix iPOJO API
-Copyright 2008 The Apache Software Foundation
+Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -18,10 +18,10 @@
Licensed under the Apache License 2.0.
This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
+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
-- BSD Licence
+- BSD License
Modified: felix/trunk/ipojo/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/api/pom.xml?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/api/pom.xml (original)
+++ felix/trunk/ipojo/api/pom.xml Thu Apr 9 09:22:31 2009
@@ -46,7 +46,7 @@
org.apache.felix.ipojo.manipulation.annotations,
org.objectweb.asm.commons, org.objectweb.asm</Private-Package>
<Include-Resource> META-INF/LICENCE=LICENSE,
- META-INF/NOTICE=NOTICE, META-INF/LICENCE.asm=LICENSE.asm
+ META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm
</Include-Resource>
</instructions>
</configuration>
Modified: felix/trunk/ipojo/arch/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/arch/NOTICE?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/arch/NOTICE (original)
+++ felix/trunk/ipojo/arch/NOTICE Thu Apr 9 09:22:31 2009
@@ -13,5 +13,10 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
+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/ipojo/core/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/NOTICE?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/core/NOTICE (original)
+++ felix/trunk/ipojo/core/NOTICE Thu Apr 9 09:22:31 2009
@@ -15,7 +15,7 @@
II. Used Software
This product uses software developed at
-The OSGi Alliance (http://www.osgi.org).
+The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
Modified: felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml (original)
+++ felix/trunk/ipojo/junit4osgi/maven-junit4osgi-plugin/pom.xml Thu Apr 9 09:22:31 2009
@@ -43,7 +43,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>1.4.0</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified: felix/trunk/ipojo/manipulator/LICENSE.asm
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/LICENSE.asm?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/LICENSE.asm (original)
+++ felix/trunk/ipojo/manipulator/LICENSE.asm Thu Apr 9 09:22:31 2009
@@ -1,28 +1,29 @@
-
- ASM: a very small and fast Java bytecode manipulation framework
- Copyright (c) 2000-2005 INRIA, France Telecom
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. Neither the name of the copyright holders nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- THE POSSIBILITY OF SUCH DAMAGE.
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
Modified: felix/trunk/ipojo/manipulator/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/NOTICE?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/NOTICE (original)
+++ felix/trunk/ipojo/manipulator/NOTICE Thu Apr 9 09:22:31 2009
@@ -19,4 +19,4 @@
III. License Summary
- Apache License 2.0
-- BSD Licence
+- BSD License
Modified: felix/trunk/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/pom.xml?rev=763574&r1=763573&r2=763574&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/pom.xml Thu Apr 9 09:22:31 2009
@@ -66,7 +66,7 @@
org.apache.felix.ipojo.xml.parser, org.objectweb.asm,
org.objectweb.asm.commons </Private-Package>
<Include-Resource> META-INF/LICENCE=LICENSE,
- META-INF/LICENCE.asm=LICENSE.asm, META-INF/NOTICE=NOTICE,
+ META-INF/LICENSE.asm=LICENSE.asm, META-INF/NOTICE=NOTICE,
xsd=src/main/resources </Include-Resource>
</instructions>
<obrRepository>NONE</obrRepository>