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 acd895a3869dc09d861bf2764afbb6d2d598e714..f8528a0126149af4bdab36708842435b1fbb63a9 100644 (file)
--- 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 61d91c1f8b1bf60eea3599c6425e82118d39fadf..58f54550d709c5dbb31b7174d9173a6753466993 100644 (file)
--- 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 09bb094128b211a531387003479acf7cef6fd379..1284e2b119a6bdbdd6ac154a97780ec37378bbef 100644 (file)
--- 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 ef03c6fd4fcf42169f98a7bd176ecc3429deebf1..87b08df82b69950c199de3d8e0153accd770bd2e 100644 (file)
--- 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 c0116d51f7a7a1a3763ec9f096cbba454fba63ed..4a5e4215dd0ca2e26dd3501e8889785a930994e4 100644 (file)
--- 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>