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 2010/05/11 22:28:51 UTC
svn commit: r943277 - in /felix/trunk/main: NOTICE pom.xml
src/main/resources/META-INF/
Author: rickhall
Date: Tue May 11 20:28:50 2010
New Revision: 943277
URL: http://svn.apache.org/viewvc?rev=943277&view=rev
Log:
Handle NOTICE file like other subprojects. (FELIX-1144)
Removed:
felix/trunk/main/src/main/resources/META-INF/
Modified:
felix/trunk/main/NOTICE
felix/trunk/main/pom.xml
Modified: felix/trunk/main/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/main/NOTICE?rev=943277&r1=943276&r2=943277&view=diff
==============================================================================
--- felix/trunk/main/NOTICE (original)
+++ felix/trunk/main/NOTICE Tue May 11 20:28:50 2010
@@ -13,9 +13,6 @@ The OSGi Alliance (http://www.osgi.org/)
Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
-This product includes software from http://kxml.sourceforge.net.
-Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
-Licensed under BSD License.
II. Used Software
@@ -30,4 +27,3 @@ Licensed under the Apache License 2.0.
III. License Summary
- Apache License 2.0
-- BSD License
Modified: felix/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/main/pom.xml?rev=943277&r1=943276&r2=943277&view=diff
==============================================================================
--- felix/trunk/main/pom.xml (original)
+++ felix/trunk/main/pom.xml Tue May 11 20:28:50 2010
@@ -33,16 +33,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>${framework.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
</dependency>
</dependencies>
<properties>
@@ -106,23 +96,6 @@
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>unpack</id>
- <phase>validate</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <artifactItems>
- <artifactItem>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${framework.version}</version>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- <execution>
<id>copy</id>
<phase>package</phase>
<goals>