From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 1 Dec 2018 22:11:20 +0000 (+0100)
Subject: Do not import javax.annotation
X-Git-Tag: v3.0.3~19
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=2b8d07d6282aa4b8bcfd4f79b571c0533c0f13b0;p=mdsal.git

Do not import javax.annotation

javax.annotation.RegEx has retention=runtime, hence we need to
suppress javax.annotation import until we migrate to something
else. Also fix binding2, which uses other JSR305 annotations.

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

diff --git a/binding/mdsal-binding-spec-util/pom.xml b/binding/mdsal-binding-spec-util/pom.xml
index acd895a386..f8528a0126 100644
--- a/binding/mdsal-binding-spec-util/pom.xml
+++ b/binding/mdsal-binding-spec-util/pom.xml
@@ -33,6 +33,19 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            !javax.annotation,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/binding2/mdsal-binding2-api/pom.xml b/binding2/mdsal-binding2-api/pom.xml
index 61d91c1f8b..58f54550d7 100644
--- a/binding2/mdsal-binding2-api/pom.xml
+++ b/binding2/mdsal-binding2-api/pom.xml
@@ -65,6 +65,19 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            !javax.annotation,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/binding2/mdsal-binding2-generator-impl/pom.xml b/binding2/mdsal-binding2-generator-impl/pom.xml
index 09bb094128..1284e2b119 100644
--- a/binding2/mdsal-binding2-generator-impl/pom.xml
+++ b/binding2/mdsal-binding2-generator-impl/pom.xml
@@ -70,6 +70,10 @@
                             org.opendaylight.mdsal.binding2.generator.impl,
                             ;-split-package:=error
                         </Export-Package>
+                        <Import-Package>
+                            !javax.annotation,
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/binding2/mdsal-binding2-generator-util/pom.xml b/binding2/mdsal-binding2-generator-util/pom.xml
index ef03c6fd4f..87b08df82b 100644
--- a/binding2/mdsal-binding2-generator-util/pom.xml
+++ b/binding2/mdsal-binding2-generator-util/pom.xml
@@ -54,6 +54,19 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            !javax.annotation,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/binding2/mdsal-binding2-spi/pom.xml b/binding2/mdsal-binding2-spi/pom.xml
index c0116d51f7..4a5e4215dd 100644
--- a/binding2/mdsal-binding2-spi/pom.xml
+++ b/binding2/mdsal-binding2-spi/pom.xml
@@ -46,6 +46,19 @@
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            !javax.annotation,
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>