archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject [6/6] git commit: fix package declarations
Date Wed, 30 Jul 2014 01:47:38 GMT
fix package declarations

avoid duplicating classes in the produced bundle


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/b9920ed0
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/b9920ed0
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/b9920ed0

Branch: refs/heads/master
Commit: b9920ed0ff3051c1c58ea35a53ed167daca1eabc
Parents: 8007a47
Author: Brett Porter <brett@apache.org>
Authored: Wed Jul 30 11:39:50 2014 +1000
Committer: Brett Porter <brett@apache.org>
Committed: Wed Jul 30 11:46:31 2014 +1000

----------------------------------------------------------------------
 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(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/b9920ed0/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-maven2-model/pom.xml b/archiva-modules/archiva-base/archiva-maven2-model/pom.xml
index 5a72f76..9a5e205 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>

http://git-wip-us.apache.org/repos/asf/archiva/blob/b9920ed0/archiva-modules/metadata/metadata-model-maven2/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/metadata/metadata-model-maven2/pom.xml b/archiva-modules/metadata/metadata-model-maven2/pom.xml
index 1132f19..1606bd1 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,


Mime
View raw message