From: Mathieu Lemay <mlemay@inocybe.com>
Date: Thu, 5 Jun 2014 14:55:26 +0000 (-0400)
Subject: Fixed missing javax.activation bundle in system folder of distribution
X-Git-Tag: release/helium~707
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=823fe7754242bae184e2e1ac6e24eac90eefea03

Fixed missing javax.activation bundle in system folder of distribution

Change-Id: I56b0d5c316db2236134affda4cf72ab3748894db
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>
---

diff --git a/features/base/src/main/resources/features.xml b/features/base/src/main/resources/features.xml
index e9118d04bd..23051f5a9a 100644
--- a/features/base/src/main/resources/features.xml
+++ b/features/base/src/main/resources/features.xml
@@ -51,6 +51,7 @@
       <bundle>mvn:com.eclipsesource.jaxrs/jersey-all/${jersey2.version}</bundle>
       <bundle>mvn:com.eclipsesource.jaxrs/publisher/${jersey2.publisher.version}</bundle>
       <bundle start="true" start-level="35">mvn:javax.ws.rs/javax.ws.rs-api/${jsr311.v2.api.version}</bundle>
+      <bundle>mvn:javax.annotation/javax.annotation-api/${javax.annotation.version}</bundle>
     </feature>
    <feature name="base-jackson" description="Jackson JAX-RS" version="${jackson.version}">
       <bundle start="true" start-level="35">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 943bbb878c..80be29570d 100644
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -88,6 +88,7 @@
     <java.version.source>1.7</java.version.source>
     <java.version.target>1.7</java.version.target>
     <javassist.version>3.17.1-GA</javassist.version>
+    <javax.annotation.version>1.2</javax.annotation.version>
     <!-- Third party version -->
     <jersey-servlet.version>1.17</jersey-servlet.version>
     <jersey.version>1.17</jersey.version>