Update to latest parent pom 2.1
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1174058 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework.security/DEPENDENCIES b/framework.security/DEPENDENCIES
deleted file mode 100644
index 53a3ecd..0000000
--- a/framework.security/DEPENDENCIES
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2009).
-Licensed under the Apache License 2.0.
-
-II. Used Third-Party Software
-
-This product uses software developed at
-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
diff --git a/framework.security/NOTICE b/framework.security/NOTICE
deleted file mode 100644
index a3a9daa..0000000
--- a/framework.security/NOTICE
+++ /dev/null
@@ -1,11 +0,0 @@
-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).
-Licensed under the Apache License 2.0.
diff --git a/framework.security/pom.xml b/framework.security/pom.xml
index 68e2fb4..ecd7ebd 100644
--- a/framework.security/pom.xml
+++ b/framework.security/pom.xml
@@ -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>
diff --git a/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES b/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES
new file mode 100644
index 0000000..cce7c0b
--- /dev/null
+++ b/framework.security/src/main/appended-resources/META-INF/DEPENDENCIES
@@ -0,0 +1,16 @@
+I. Included Third-Party Software
+
+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.
+
+II. Used Third-Party Software
+
+This product uses software developed at
+The OSGi Alliance (http://www.osgi.org/).
+Copyright (c) OSGi Alliance (2000, 2009).
+Licensed under the Apache License 2.0.
+
+III. License Summary
+- Apache License 2.0
diff --git a/framework.security/LICENSE b/framework.security/src/main/appended-resources/META-INF/LICENSE
similarity index 100%
rename from framework.security/LICENSE
rename to framework.security/src/main/appended-resources/META-INF/LICENSE
diff --git a/framework.security/src/main/appended-resources/META-INF/NOTICE b/framework.security/src/main/appended-resources/META-INF/NOTICE
new file mode 100644
index 0000000..3db2e43
--- /dev/null
+++ b/framework.security/src/main/appended-resources/META-INF/NOTICE
@@ -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.