Author: jbonofre
Date: Thu Aug 9 03:37:17 2012
New Revision: 1371034
URL: http://svn.apache.org/viewvc?rev=1371034&view=rev
Log:
[MRM-1651] Resume enhancement of the OSGi statements
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/pom.xml
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/pom.xml
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/pom.xml
archiva/redback/redback-core/trunk/redback-configuration/pom.xml
archiva/redback/redback-core/trunk/redback-data-management/pom.xml
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/pom.xml?rev=1371034&r1=1371033&r2=1371034&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-api/pom.xml
Thu Aug 9 03:37:17 2012
@@ -36,6 +36,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.authorization;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ org.apache.archiva.redback.users;version=${project.version}
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml?rev=1371034&r1=1371033&r2=1371034&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authorization/redback-authorization-providers/redback-authorization-open/pom.xml
Thu Aug 9 03:37:17 2012
@@ -51,6 +51,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.authorization.open;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+
org.apache.archiva.redback.authorization;version=${project.version},
+ org.springframework.stereotype;version="[3,4)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/pom.xml?rev=1371034&r1=1371033&r2=1371034&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-jdo/pom.xml
Thu Aug 9 03:37:17 2012
@@ -90,6 +90,25 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.common.jdo*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ javax.jdo;version="[2,3)",
+
org.apache.archiva.redback.components.jdo;version=${project.version},
+
org.apache.archiva.redback.configuration;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)",
+ org.codehaus.plexus.interpolation;version="[1.9,2)",
+ org.jpox*;version="[1.1,2)",
+ org.springframework.stereotype;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/pom.xml?rev=1371034&r1=1371033&r2=1371034&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-common/redback-common-ldap/pom.xml
Thu Aug 9 03:37:17 2012
@@ -70,6 +70,24 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.common.ldap*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.naming*,
+ javax.inject;version="[1,2)",
+
org.apache.archiva.redback.configuration;version=${project.version},
+ org.apache.archiva.redback.users;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)",
+ org.springframework.stereotype;version="[3,4)",
+ com.sun.jndi.ldap;resolution:=optional,
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: archiva/redback/redback-core/trunk/redback-configuration/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-configuration/pom.xml?rev=1371034&r1=1371033&r2=1371034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-configuration/pom.xml (original)
+++ archiva/redback/redback-core/trunk/redback-configuration/pom.xml Thu Aug 9
03:37:17 2012
@@ -72,6 +72,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.configuration;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+
org.apache.archiva.redback.components.evaluator*;version=${project.version},
+
org.apache.archiva.redback.components.registry;version=${project.version},
+ org.springframework.stereotype;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: archiva/redback/redback-core/trunk/redback-data-management/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-data-management/pom.xml?rev=1371034&r1=1371033&r2=1371034&view=diff
==============================================================================
--- archiva/redback/redback-core/trunk/redback-data-management/pom.xml
(original)
+++ archiva/redback/redback-core/trunk/redback-data-management/pom.xml Thu Aug
9 03:37:17 2012
@@ -86,6 +86,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.management;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.xml.stream,
+ org.apache.archiva.redback.keys*;version=${project.version},
+ org.apache.archiva.redback.rbac*;version=${project.version},
+ org.apache.archiva.redback.users*;version=${project.version},
+ org.codehaus.plexus.util;version="[3,4)",
+ org.springframework.stereotype;version="[3,4)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
