fix package declarations

avoid duplicating classes in the produced bundle

diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 5a72f767bea67a7b0baac25a397f806b8baa0f1d..9a5e20532212f23cd5f11c73fe4192e8d7d68c64 100644 (file)
--- 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 1132f195cc196f569416b90439962cc74274be44..1606bd1bb98781d1799dce9f6a43331115939971 100644 (file)
--- 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,