You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pa...@apache.org on 2011/09/22 11:52:47 UTC
svn commit: r1174026 - in /felix/trunk/framework: ./
src/main/appended-resources/ src/main/appended-resources/META-INF/
Author: pauls
Date: Thu Sep 22 09:52:47 2011
New Revision: 1174026
URL: http://svn.apache.org/viewvc?rev=1174026&view=rev
Log:
Update to the latest parent pom 2.1
Added:
felix/trunk/framework/src/main/appended-resources/
felix/trunk/framework/src/main/appended-resources/META-INF/
felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES (contents, props changed)
- copied, changed from r1173983, felix/trunk/framework/DEPENDENCIES
felix/trunk/framework/src/main/appended-resources/META-INF/LICENSE (props changed)
- copied unchanged from r1173983, felix/trunk/framework/LICENSE
felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1173983, felix/trunk/framework/NOTICE
Removed:
felix/trunk/framework/DEPENDENCIES
felix/trunk/framework/LICENSE
felix/trunk/framework/NOTICE
Modified:
felix/trunk/framework/pom.xml
Modified: felix/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework/pom.xml?rev=1174026&r1=1174025&r2=1174026&view=diff
==============================================================================
--- felix/trunk/framework/pom.xml (original)
+++ felix/trunk/framework/pom.xml Thu Sep 22 09:52:47 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.1</version>
+ <version>2.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -58,25 +58,30 @@
<Export-Package>org.osgi.framework.*;-split-package:=merge-first,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
<Private-Package>org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource>
</instructions>
</configuration>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
- <configuration>
- <excludeSubProjects>false</excludeSubProjects>
- <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
- <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
- <excludes>
- <param>doc/*</param>
- <param>maven-eclipse.xml</param>
- <param>.checkstyle</param>
- <param>.externalToolBuilders/*</param>
- </excludes>
- </configuration>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <excludes>
+ <exclude>src/main/appended-resources/**</exclude>
+ <exclude>src/**/packageinfo</exclude>
+ <exclude>src/main/resources/META-INF/services/org.osgi.framework.launch.FrameworkFactory</exclude>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
<resources>
Copied: felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES (from r1173983, felix/trunk/framework/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/framework/DEPENDENCIES&r1=1173983&r2=1174026&rev=1174026&view=diff
==============================================================================
--- felix/trunk/framework/DEPENDENCIES (original)
+++ felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES Thu Sep 22 09:52:47 2011
@@ -1,4 +1,3 @@
-Apache Felix Framework
Copyright 2011 The Apache Software Foundation
This software was developed at the Apache Software Foundation
@@ -19,9 +18,5 @@ The OSGi Alliance (http://www.osgi.org/)
Copyright (c) OSGi Alliance (2000, 2009).
Licensed under the Apache License 2.0.
-This product uses software developed at
-The Codehaus (http://www.codehaus.org)
-Licensed under the Apache License 2.0.
-
III. License Summary
- Apache License 2.0
Propchange: felix/trunk/framework/src/main/appended-resources/META-INF/DEPENDENCIES
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/trunk/framework/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE (from r1173983, felix/trunk/framework/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE?p2=felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE&p1=felix/trunk/framework/NOTICE&r1=1173983&r2=1174026&rev=1174026&view=diff
==============================================================================
--- felix/trunk/framework/NOTICE (original)
+++ felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE Thu Sep 22 09:52:47 2011
@@ -1,10 +1,3 @@
-Apache Felix Framework
-Copyright 2011 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
This product includes software developed at
The OSGi Alliance (http://www.osgi.org/).
Copyright (c) OSGi Alliance (2000, 2009).
Propchange: felix/trunk/framework/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mergeinfo =