Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix package declarations 

avoid duplicating classes in the produced bundle
This commit is contained in:
Brett Porter 2014-07-30 11:39:50 +10:00
parent 8007a47a3a
commit b9920ed0ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archiva-modules/archiva-base/archiva-maven2-model/pom.xml
View File

@ -47,11 +47,11 @@
<Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName> <Bundle-SymbolicName>org.apache.archiva.maven2.model</Bundle-SymbolicName>
<Bundle-Version>${project.version}</Bundle-Version> <Bundle-Version>${project.version}</Bundle-Version>
<Import-Package> <Import-Package>
javax.xml.bind.annotation javax.xml.bind.annotation,
com.fasterxml.jackson.annotation
</Import-Package> </Import-Package>
<Export-Package> <Export-Package>
org.apache.archiva.maven2.model*;version=${project.version}, org.apache.archiva.maven2.model*;version=${project.version}
com.fasterxml.jackson.annotation
</Export-Package> </Export-Package>
</instructions> </instructions>
</configuration> </configuration>

4
archiva-modules/metadata/metadata-model-maven2/pom.xml
View File

@ -46,10 +46,10 @@
<artifactId>maven-bundle-plugin</artifactId> <artifactId>maven-bundle-plugin</artifactId>
<configuration> <configuration>
<instructions> <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> <Bundle-Version>${project.version}</Bundle-Version>
<Export-Package> <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> </Export-Package>
<Import-Package> <Import-Package>
javax.xml.bind.annotation, javax.xml.bind.annotation,