From b9920ed0ff3051c1c58ea35a53ed167daca1eabc Mon Sep 17 00:00:00 2001
From: Brett Porter <brett@apache.org>
Date: Wed, 30 Jul 2014 11:39:50 +1000
Subject: [PATCH] fix package declarations

avoid duplicating classes in the produced bundle
---
 archiva-modules/archiva-base/archiva-maven2-model/pom.xml | 6 +++---
 archiva-modules/metadata/metadata-model-maven2/pom.xml    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 5a72f767b..9a5e20532 100644
--- a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
@@ -47,11 +47,11 @@
             <Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Import-Package>
-              javax.xml.bind.annotation
+              javax.xml.bind.annotation,
+              com.fasterxml.jackson.annotation
             </Import-Package>
             <Export-Package>
-              org.apache.archiva.maven2.model*;version=${project.version},
-              com.fasterxml.jackson.annotation
+              org.apache.archiva.maven2.model*;version=${project.version}
             </Export-Package>
           </instructions>
         </configuration>
diff --git a/archiva-modules/metadata/metadata-model-maven2/pom.xml b/archiva-modules/metadata/metadata-model-maven2/pom.xml
index 1132f195c..1606bd1bb 100644
--- a/archiva-modules/metadata/metadata-model-maven2/pom.xml
+++ b/archiva-modules/metadata/metadata-model-maven2/pom.xml
@@ -46,10 +46,10 @@
         <artifactId>maven-bundle-plugin</artifactId>
         <configuration>
           <instructions>
-            <Bundle-SymbolicName>org.apache.archiva.metadata.model</Bundle-SymbolicName>
+            <Bundle-SymbolicName>org.apache.archiva.metadata.model.maven2</Bundle-SymbolicName>
             <Bundle-Version>${project.version}</Bundle-Version>
             <Export-Package>
-              org.apache.archiva.metadata.model;version=${project.version};-split-package:=merge-first
+              org.apache.archiva.metadata.model.maven2;version=${project.version}
             </Export-Package>
             <Import-Package>
               javax.xml.bind.annotation,