Remove javax.annotation-api version overrides

odlparent-4.0.9 is integrated, hence the override is not needed
anymore.

Change-Id: I535c5b9e93a0d324729a7c741cab178b6cae01a1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/web/impl-jetty/pom.xml b/web/impl-jetty/pom.xml
index d857bb76f26592ad4c32bd93af5efa8d77d88bae..bf7ce5e513394febc256340f51b9fa0f1109776c 100644 (file)
--- a/web/impl-jetty/pom.xml
+++ b/web/impl-jetty/pom.xml
@@ -52,8 +52,6 @@
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
       <optional>true</optional>
-      <!-- FIXME: remove version with odlparent-4.0.8 -->
-      <version>1.2</version>
     </dependency>
 
     <dependency>

diff --git a/web/impl-osgi/pom.xml b/web/impl-osgi/pom.xml
index cf1c6db7d74de7856617074a9d697e26775de2d9..2264ede3f979a7982cc66214de89a5e9bc6c2533 100644 (file)
--- a/web/impl-osgi/pom.xml
+++ b/web/impl-osgi/pom.xml
@@ -50,8 +50,6 @@
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
       <optional>true</optional>
-      <!-- FIXME: remove version with odlparent-4.0.8 -->
-      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>