Author: jbonofre
Date: Thu Aug 9 04:17:30 2012
New Revision: 1371037
URL: http://svn.apache.org/viewvc?rev=1371037&view=rev
Log:
[MRM-1651] Continue the OSGi statements enhancements
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-integrations-security/pom.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-jsecurity/pom.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/pom.xml
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml?rev=1371037&r1=1371036&r2=1371037&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-common-integrations/pom.xml
Thu Aug 9 04:17:30 2012
@@ -209,6 +209,36 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.integration*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ javax.mail*,
+ javax.servlet*,
+
org.apache.archiva.redback.authentication;version=${project.version},
+
org.apache.archiva.redback.authorization;version=${project.version},
+
org.apache.archiva.redback.configuration;version=${project.version},
+ org.apache.archiva.redback.keys;version=${project.version},
+ org.apache.archiva.redback.policy;version=${project.version},
+ org.apache.archiva.redback.rbac;version=${project.version},
+ org.apache.archiva.redback.role*;version=${project.version},
+ org.apache.archiva.redback.system*;version=${project.version},
+ org.apache.archiva.redback.users;version=${project.version},
+ org.apache.commons.beanutils;version="[1.7,2)",
+ org.apache.commons.codec.binary;version="[1.6,2)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.apache.velocity*;version="[1.7,2)",
+ org.codehaus.plexus.util;version="[3,4)",
+ org.extremecomponents*;version="[1,2)",
+ org.springframework*;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-integrations-security/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-integrations-security/pom.xml?rev=1371037&r1=1371036&r2=1371037&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-integrations-security/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-integrations-security/pom.xml
Thu Aug 9 04:17:30 2012
@@ -36,6 +36,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.integration.security.role;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-jsecurity/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-jsecurity/pom.xml?rev=1371037&r1=1371036&r2=1371037&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-jsecurity/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-jsecurity/pom.xml
Thu Aug 9 04:17:30 2012
@@ -79,6 +79,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.jsecurity;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ org.apache.archiva.redback.policy;version=${project.version},
+ org.apache.archiva.redback.rbac;version=${project.version},
+ org.apache.archiva.redback.users;version=${project.version},
+ org.jsecurity*;version="[0.9,2)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/pom.xml?rev=1371037&r1=1371036&r2=1371037&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-api/pom.xml
Thu Aug 9 04:17:30 2012
@@ -66,6 +66,22 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.rest.api*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.ws.rs,
+ javax.xml.bind.annotation,
+
org.apache.archiva.redback.authorization;version=${project.version},
+
org.apache.archiva.redback.integration.util;version=${project.version},
+ org.apache.archiva.redback.rbac;version=${project.version},
+ org.apache.archiva.redback.users;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml?rev=1371037&r1=1371036&r2=1371037&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-integrations/redback-rest/redback-rest-services/pom.xml
Thu Aug 9 04:17:30 2012
@@ -189,6 +189,45 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.rest.services*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ javax.mail.internet,
+ javax.servlet.http,
+ javax.ws.rs.core,
+ javax.ws.rs.ext,
+ net.sf.ehcache,
+
org.apache.archiva.redback.authentication;version=${project.version},
+
org.apache.archiva.redback.authorization;version=${project.version},
+
org.apache.archiva.redback.components.cache;version=${project.version},
+
org.apache.archiva.redback.configuration;version=${project.version},
+
org.apache.archiva.redback.integration.filter.authentication*;version=${project.version},
+
org.apache.archiva.redback.integration.mail;version=${project.version},
+
org.apache.archiva.redback.integration.model;version=${project.version},
+
org.apache.archiva.redback.integration.util;version=${project.version},
+ org.apache.archiva.redback.keys*;version=${project.version},
+ org.apache.archiva.redback.policy;version=${project.version},
+ org.apache.archiva.redback.rbac;version=${project.version},
+
org.apache.archiva.redback.rest.api.model;version=${project.version},
+
org.apache.archiva.redback.rest.api.services;version=${project.version},
+ org.apache.archiva.redback.role*;version=${project.version},
+ org.apache.archiva.redback.system*;version=${project.version},
+ org.apache.archiva.redback.users;version=${project.version},
+ org.apache.commons.io;version="[1.4,2)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.apache.cxf*;version="[2.6,3)",
+ org.codehaus.jackson.map;version="[1.9.8,2)",
+ org.codehaus.plexus.util;version="[3,4)",
+ org.springframework*;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
