[FELIX-3002] Embed the OBR specific information for the EventAdmin bundle in the manifest
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1136426 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/eventadmin/impl/changelog.txt b/eventadmin/impl/changelog.txt
index 2eaaf11..e2ec2bb 100644
--- a/eventadmin/impl/changelog.txt
+++ b/eventadmin/impl/changelog.txt
@@ -1,3 +1,10 @@
+Changes from 1.2.12 to 1.2.14
+-----------------------------
+
+** Bug
+ * [FELIX-3002] - Embed the OBR specific information for the EventAdmin bundle in the manifest
+
+
Changes from 1.2.10 to 1.2.12
-----------------------------
diff --git a/eventadmin/impl/obr.xml b/eventadmin/impl/obr.xml
deleted file mode 100644
index 6e685ae..0000000
--- a/eventadmin/impl/obr.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<obr>
- <require extend="false"
- filter="(service=org.osgi.service.event.EventHandler)"
- multiple="true"
- name="service"
- optional="true">
- Import Service org.osgi.service.event.EventHandler
- </require>
- <require extend="false"
- filter="(service=org.osgi.service.log.LogService)"
- multiple="false"
- name="service"
- optional="true">
- Import Service org.osgi.service.log.LogService
- </require>
- <require extend="false"
- filter="(service=org.osgi.service.log.LogReaderService)"
- multiple="false"
- name="service"
- optional="true">
- Import Service org.osgi.service.log.LogReaderService
- </require>
-</obr>
\ No newline at end of file
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index dc51efd..536ea3a 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -75,7 +75,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.3.4</version>
+ <version>2.3.5-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -108,7 +108,9 @@
<Export-Package>org.osgi.service.event</Export-Package>
<Private-Package>org.apache.felix.eventadmin.impl.*</Private-Package>
<Import-Service>
- org.osgi.service.event.EventHandler, org.osgi.service.log.LogService, org.osgi.service.log.LogReaderService
+ org.osgi.service.event.EventHandler;availability:=optional;multiple:=true,
+ org.osgi.service.log.LogService;availability:=optional;multiple:=false,
+ org.osgi.service.log.LogReaderService;availability:=optional;multiple:=false
</Import-Service>
<Export-Service>
org.osgi.service.event.EventAdmin