You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2011/02/05 00:09:29 UTC
svn commit: r1067335 - in /felix/trunk/scr: ./ src/main/appended-resources/
src/main/appended-resources/META-INF/
Author: fmeschbe
Date: Fri Feb 4 23:09:29 2011
New Revision: 1067335
URL: http://svn.apache.org/viewvc?rev=1067335&view=rev
Log:
FELIX-1747 Use new Felix Parent POM 2-SNAPSHOT and move
legal file additions
Added:
felix/trunk/scr/src/main/appended-resources/
felix/trunk/scr/src/main/appended-resources/META-INF/
felix/trunk/scr/src/main/appended-resources/META-INF/DEPENDENCIES
- copied, changed from r1067334, felix/trunk/scr/DEPENDENCIES
felix/trunk/scr/src/main/appended-resources/META-INF/LICENSE (with props)
felix/trunk/scr/src/main/appended-resources/META-INF/NOTICE (with props)
Removed:
felix/trunk/scr/DEPENDENCIES
felix/trunk/scr/LICENSE
felix/trunk/scr/NOTICE
Modified:
felix/trunk/scr/pom.xml
Modified: felix/trunk/scr/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/scr/pom.xml?rev=1067335&r1=1067334&r2=1067335&view=diff
==============================================================================
--- felix/trunk/scr/pom.xml (original)
+++ felix/trunk/scr/pom.xml Fri Feb 4 23:09:29 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>
@@ -145,20 +145,6 @@
</dependencies>
<build>
<directory>${bundle.build.name}</directory>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- <include>DEPENDENCIES</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -338,6 +324,14 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ <excludePackageNames>*.impl</excludePackageNames>
+ </configuration>
+ </plugin>
</plugins>
</build>
Copied: felix/trunk/scr/src/main/appended-resources/META-INF/DEPENDENCIES (from r1067334, felix/trunk/scr/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/scr/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/scr/DEPENDENCIES&r1=1067334&r2=1067335&rev=1067335&view=diff
==============================================================================
--- felix/trunk/scr/DEPENDENCIES (original)
+++ felix/trunk/scr/src/main/appended-resources/META-INF/DEPENDENCIES Fri Feb 4 23:09:29 2011
@@ -1,7 +1,3 @@
-Apache Felix Declarative Services
-Copyright 2006-2010 The Apache Software Foundation
-
-
I. Included Software
This product includes software developed at
Added: felix/trunk/scr/src/main/appended-resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/appended-resources/META-INF/LICENSE?rev=1067335&view=auto
==============================================================================
--- felix/trunk/scr/src/main/appended-resources/META-INF/LICENSE (added)
+++ felix/trunk/scr/src/main/appended-resources/META-INF/LICENSE Fri Feb 4 23:09:29 2011
@@ -0,0 +1,31 @@
+
+
+APACHE FELIX DECLARATIVE SERVICES SUBCOMPONENTS:
+
+The Apache Felix Declarative Services 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 the KXml component:
+
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+IN THE SOFTWARE.
Propchange: felix/trunk/scr/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Added: felix/trunk/scr/src/main/appended-resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/appended-resources/META-INF/NOTICE?rev=1067335&view=auto
==============================================================================
--- felix/trunk/scr/src/main/appended-resources/META-INF/NOTICE (added)
+++ felix/trunk/scr/src/main/appended-resources/META-INF/NOTICE Fri Feb 4 23:09:29 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/scr/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native