From 46e5b386359f354d865af926274c3c9036a25b98 Mon Sep 17 00:00:00 2001
From: Carlos Sanchez Gonzalez <carlos@apache.org>
Date: Fri, 1 Jun 2007 23:38:41 +0000
Subject: [PATCH] [MNG-2943] Avoid using package names used in other artifacts,
 configure the bundle plugin to ignore deprecated packages

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@543666 13f79535-47bb-0310-9956-ffa450edef68
---
 maven-core/pom.xml     | 13 +++++++++++++
 maven-settings/pom.xml |  9 +++++++++
 pom.xml                | 22 +++++++++++++---------
 3 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 9f5e3574b8..0954abe864 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -150,4 +150,17 @@ under the License.
       <scope>test</scope>
     </dependency>      
   </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>!org.apache.maven.monitor.*,*</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/maven-settings/pom.xml b/maven-settings/pom.xml
index eb47e6e19f..808f77f90d 100644
--- a/maven-settings/pom.xml
+++ b/maven-settings/pom.xml
@@ -47,6 +47,15 @@ under the License.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Export-Package>!org.apache.maven,*</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 14f70504a6..a3fa37d9a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,21 +100,25 @@ under the License.
             </execution>
           </executions>
         </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <!-- if plugin not released at maven release time the manifests generated could be checked in by hand -->
+          <version>0.9.0-incubator-SNAPSHOT</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>manifest</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
-      <!-- if plugin not released at maven release time the manifests generated could be checked in by hand -->
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>0.9.0-incubator-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
       </plugin>
       <!-- Needed for including the manifest, see MJAR-71 -->
       <plugin>