Drop dependency on javax.annotation-api

This appears to be unused and may be contributing to issues with newer
versions of jsr305. (jsr305 3.0.0 doesn't provide any OSGi bundle
information, but 3.0.1 does, and the information provided conflicts
with the bundle information in javax.annotation-api.)

Change-Id: I39a22901e86220be5bc1da15975b39db11a6f426
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/shiro/pom.xml b/features/shiro/pom.xml
index 2a2aadfef25759d7768302b9d816474edcb342b5..d6aa5d512b0fb1f2313ed2fb3ba7d861fcfb96d7 100644 (file)
--- a/features/shiro/pom.xml
+++ b/features/shiro/pom.xml
@@ -19,7 +19,6 @@
     <packaging>jar</packaging>
 
     <properties>
-        <javax.annotation.api.version>1.2</javax.annotation.api.version>
         <servicemix.version>1.8.3_2</servicemix.version>
     </properties>
     <dependencyManagement>
@@ -118,11 +117,6 @@
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn-sts</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${javax.annotation.api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.dependencymanager</artifactId>

diff --git a/features/shiro/src/main/features/features.xml b/features/shiro/src/main/features/features.xml
index f965681593943e4a5bbd3fe50dd4892bee791a0f..d1b6300ee637fef01db9fb36ab00d86401ed22cd 100644 (file)
--- a/features/shiro/src/main/features/features.xml
+++ b/features/shiro/src/main/features/features.xml
@@ -24,7 +24,6 @@
         <bundle>mvn:org.apache.shiro/shiro-core/{{VERSION}}</bundle>
 
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:javax.annotation/javax.annotation-api/{{VERSION}}</bundle>
         <bundle>wrap:mvn:com.google.code.findbugs/jsr305/{{VERSION}}</bundle>
         <bundle>wrap:mvn:commons-codec/commons-codec/{{VERSION}}</bundle>
         <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.resourceserver/{{VERSION}}</bundle>