From 5248b7424780c345334c2bf3799af2d435b206cc Mon Sep 17 00:00:00 2001
From: Martin Vitez <mvitez@cisco.com>
Date: Fri, 20 Sep 2013 10:01:59 +0200
Subject: [PATCH] Removed Export-Package declaration from maven-bundle-plugin.
 Fixed some maven warnings.

Signed-off-by: Martin Vitez <mvitez@cisco.com>
---
 code-generator/binding-generator-api/pom.xml      | 3 ---
 code-generator/binding-generator-impl/pom.xml     | 4 ----
 code-generator/binding-generator-spi/pom.xml      | 3 ---
 code-generator/binding-generator-util/pom.xml     | 4 ----
 code-generator/binding-java-api-generator/pom.xml | 3 ---
 code-generator/binding-model-api/pom.xml          | 4 ----
 code-generator/maven-sal-api-gen-plugin/pom.xml   | 3 ---
 code-generator/pom.xml                            | 2 ++
 model/pom.xml                                     | 2 ++
 yang/yang-binding/pom.xml                         | 2 ++
 10 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/code-generator/binding-generator-api/pom.xml b/code-generator/binding-generator-api/pom.xml
index 3adf8937fe..08a5100c7a 100644
--- a/code-generator/binding-generator-api/pom.xml
+++ b/code-generator/binding-generator-api/pom.xml
@@ -33,9 +33,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.sal.binding.generator.api
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/code-generator/binding-generator-impl/pom.xml b/code-generator/binding-generator-impl/pom.xml
index 7558ea77eb..81725db3da 100644
--- a/code-generator/binding-generator-impl/pom.xml
+++ b/code-generator/binding-generator-impl/pom.xml
@@ -60,10 +60,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.sal.binding.generator.impl,
-                            org.opendaylight.yangtools.sal.binding.yang.types
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/code-generator/binding-generator-spi/pom.xml b/code-generator/binding-generator-spi/pom.xml
index d627171b70..fcacebc28f 100644
--- a/code-generator/binding-generator-spi/pom.xml
+++ b/code-generator/binding-generator-spi/pom.xml
@@ -33,9 +33,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.sal.binding.generator.spi
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/code-generator/binding-generator-util/pom.xml b/code-generator/binding-generator-util/pom.xml
index bbf3f65236..33be499ffc 100644
--- 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 adb87ebfb3..7fe47d733e 100644
--- a/code-generator/binding-java-api-generator/pom.xml
+++ b/code-generator/binding-java-api-generator/pom.xml
@@ -22,9 +22,6 @@
                 <configuration>
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-                        <Export-Package>
-                            org.opendaylight.yangtools.sal.java.api.generator
-                        </Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/code-generator/binding-model-api/pom.xml b/code-generator/binding-model-api/pom.xml
index 9dd1457160..c52265ce5e 100644
--- 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 6f9ea6d196..0d646c8104 100644
--- 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 be40d77491..834a326949 100644
--- 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 192c18efa3..9a9f755699 100644
--- 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 fed740112f..b70f942d3f 100644
--- a/yang/yang-binding/pom.xml
+++ b/yang/yang-binding/pom.xml
@@ -15,7 +15,9 @@
     <build>
         <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>
-- 
2.36.6