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 13:13:38 UTC
svn commit: r1174058 - in /felix/trunk/framework.security: ./
src/main/appended-resources/ src/main/appended-resources/META-INF/
Author: pauls
Date: Thu Sep 22 11:13:37 2011
New Revision: 1174058
URL: http://svn.apache.org/viewvc?rev=1174058&view=rev
Log:
Update to latest parent pom 2.1
Added:
felix/trunk/framework.security/src/main/appended-resources/
felix/trunk/framework.security/src/main/appended-resources/META-INF/
felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES (contents, props changed)
- copied, changed from r1173984, felix/trunk/framework.security/DEPENDENCIES
felix/trunk/framework.security/src/main/appended-resources/META-INF/LICENSE (props changed)
- copied unchanged from r1173984, felix/trunk/framework.security/LICENSE
felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1173984, felix/trunk/framework.security/NOTICE
Removed:
felix/trunk/framework.security/DEPENDENCIES
felix/trunk/framework.security/LICENSE
felix/trunk/framework.security/NOTICE
Modified:
felix/trunk/framework.security/pom.xml
Modified: felix/trunk/framework.security/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/framework.security/pom.xml?rev=1174058&r1=1174057&r2=1174058&view=diff
==============================================================================
--- felix/trunk/framework.security/pom.xml (original)
+++ felix/trunk/framework.security/pom.xml Thu Sep 22 11:13:37 2011
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>1.2.0</version>
+ <version>2.1</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -41,7 +41,6 @@
<groupId>${pom.groupId}</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<version>3.3.0-SNAPSHOT</version>
- <scope>provided</scope>
</dependency>
</dependencies>
<build>
@@ -63,13 +62,15 @@
<instructions>
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Export-Package>org.osgi.service.permissionadmin;-split-package:=merge-first, org.osgi.service.condpermadmin;-split-package:=merge-first</Export-Package>
+ <Export-Package>org.osgi.service.permissionadmin, org.osgi.service.condpermadmin</Export-Package>
<Private-Package>org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
<Fragment-Host>system.bundle; extension:=framework</Fragment-Host>
<Felix-Activator>org.apache.felix.framework.SecurityActivator</Felix-Activator>
- <Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES</Include-Resource>
</instructions>
+ <excludeDependencies>
+ org.apache.felix.framework
+ </excludeDependencies>
</configuration>
</plugin>
</plugins>
Copied: felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES (from r1173984, felix/trunk/framework.security/DEPENDENCIES)
URL: http://svn.apache.org/viewvc/felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES?p2=felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES&p1=felix/trunk/framework.security/DEPENDENCIES&r1=1173984&r2=1174058&rev=1174058&view=diff
==============================================================================
--- felix/trunk/framework.security/DEPENDENCIES (original)
+++ felix/trunk/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES Thu Sep 22 11:13:37 2011
@@ -1,10 +1,3 @@
-Apache Felix Framework Security
-Copyright 2011 The Apache Software Foundation
-
-This software was developed at the Apache Software Foundation
-(http://www.apache.org) and may have dependencies on other
-Apache software licensed under Apache License 2.0.
-
I. Included Third-Party Software
This product includes software developed at
@@ -19,9 +12,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.security/src/main/appended-resources/META-INF/DEPENDENCIES
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: felix/trunk/framework.security/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE (from r1173984, felix/trunk/framework.security/NOTICE)
URL: http://svn.apache.org/viewvc/felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE?p2=felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE&p1=felix/trunk/framework.security/NOTICE&r1=1173984&r2=1174058&rev=1174058&view=diff
==============================================================================
--- felix/trunk/framework.security/NOTICE (original)
+++ felix/trunk/framework.security/src/main/appended-resources/META-INF/NOTICE Thu Sep 22 11:13:37 2011
@@ -1,10 +1,3 @@
-Apache Felix Framework Security
-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.security/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:mergeinfo =