Removed Export-Package declaration from maven-bundle-plugin. Fixed some maven warnings.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml
index 3adf8937fe9780ee08340a3ecb68fd070d3c260b..08a5100c7a1a2d5faecde8b8774d9a3d85a93c4b 100644 (file)
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -33,9 +33,6 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                        <Export-Package>\r
-                            org.opendaylight.yangtools.sal.binding.generator.api\r
-                        </Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index 7558ea77eb6ae2adc387dd69e9029d832f4ec9ab..81725db3da38b72b34c6dcd01fab362e27e4fce6 100644 (file)
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -60,10 +60,6 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                        <Export-Package>\r
-                            org.opendaylight.yangtools.sal.binding.generator.impl,\r
-                            org.opendaylight.yangtools.sal.binding.yang.types\r
-                        </Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index d627171b70e321e222922e1bce0899daccddd576..fcacebc28f91ed4e6fcac2b935522feb84248550 100644 (file)
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -33,9 +33,6 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                        <Export-Package>\r
-                            org.opendaylight.yangtools.sal.binding.generator.spi\r
-                        </Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index bbf3f65236f93fb462829fe36ad0430fd0c796eb..33be499ffc1397224ef5cc98e7b52812278cb402 100644 (file)
--- a/code-generator/binding-generator-util/pom.xml
+++ b/code-generator/binding-generator-util/pom.xml
@@ -46,10 +46,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.binding.generator.util,
-                            org.opendaylight.yangtools.binding.generator.util.generated.type.builder
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/code-generator/binding-java-api-generator/pom.xml b/code-generator/binding-java-api-generator/pom.xml
index adb87ebfb3a890581a52a946d5ad4ae9417d3b7f..7fe47d733ee042ebbdfb850b41cda0b76b31d1db 100644 (file)
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -22,9 +22,6 @@
                 <configuration>\r
                     <instructions>\r
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>\r
-                        <Export-Package>\r
-                            org.opendaylight.yangtools.sal.java.api.generator\r
-                        </Export-Package>\r
                     </instructions>\r
                 </configuration>\r
             </plugin>\r

diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 9dd14571608a7bceb3e994de5a360eecb5a7d107..c52265ce5e077aadca88ead9f1ecfa2da70ecea3 100644 (file)
--- a/code-generator/binding-model-api/pom.xml
+++ b/code-generator/binding-model-api/pom.xml
@@ -31,10 +31,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.sal.binding.model.api,
-                            org.opendaylight.yangtools.sal.binding.model.api.type.builder
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/code-generator/maven-sal-api-gen-plugin/pom.xml b/code-generator/maven-sal-api-gen-plugin/pom.xml
index 6f9ea6d196d6d01aad97c237190cb65b3c2a1547..0d646c8104254bbe2591f29dc3cc5b9d5307abf3 100644 (file)
--- a/code-generator/maven-sal-api-gen-plugin/pom.xml
+++ b/code-generator/maven-sal-api-gen-plugin/pom.xml
@@ -50,9 +50,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.maven.sal.api.gen.plugin
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/code-generator/pom.xml b/code-generator/pom.xml
index be40d774918e1ef1d6f9a7e20a83974b696512f2..834a326949939c21a6338bb7c6c4c665cb01e73e 100644 (file)
--- a/code-generator/pom.xml
+++ b/code-generator/pom.xml
@@ -135,7 +135,9 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven.jar.version}</version>
                     <configuration>
                         <archive>
                             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

diff --git a/model/pom.xml b/model/pom.xml
index 192c18efa3a6953d62f15958b1dfcd4d77c6ecd7..9a9f755699c0864dd5802def97242dd007bdfb8a 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -85,7 +85,9 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven.jar.version}</version>
                     <configuration>
                         <archive>
                             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>

diff --git a/yang/yang-binding/pom.xml b/yang/yang-binding/pom.xml
index fed740112fde82567645b22447bc48e6300ccf52..b70f942d3ff02751ce5c117e3413c407e20fcf4f 100644 (file)
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -15,7 +15,9 @@
     <build>\r
         <plugins>\r
             <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-jar-plugin</artifactId>\r
+                <version>${maven.jar.version}</version>\r
                 <configuration>\r
                     <archive>\r
                         <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>\r