Author: jbonofre
Date: Tue Aug 7 20:06:43 2012
New Revision: 1370486
URL: http://svn.apache.org/viewvc?rev=1370486&view=rev
Log:
[MRM-1651] Improve OSGi statement introducing version range
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/pom.xml
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/pom.xml?rev=1370486&r1=1370485&r2=1370486&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-api/pom.xml
Tue Aug 7 20:06:43 2012
@@ -54,6 +54,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.authentication;version=${project.version};-split-package:=import-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ org.apache.archiva.redback.policy;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)",
+ org.springframework*;version="[3,4)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml?rev=1370486&r1=1370485&r2=1370486&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-ldap/pom.xml
Tue Aug 7 20:06:43 2012
@@ -100,6 +100,24 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.authentication.ldap;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.naming*,
+ javax.inject;version="[1,2)",
+
org.apache.archiva.redback.authentication;version=${project.version},
+
org.apache.archiva.redback.common.ldap*;version=${project.version},
+
org.apache.archiva.redback.configuration;version=${project.version},
+
org.apache.archiva.redback.users.ldap.service;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)",
+ org.springframework.stereotype;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml?rev=1370486&r1=1370485&r2=1370486&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-memory/pom.xml
Tue Aug 7 20:06:43 2012
@@ -60,6 +60,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.authentication.memory;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+
org.apache.archiva.redback.authentication;version=${project.version},
+ org.springframework.stereotype;version="[3,4)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml?rev=1370486&r1=1370485&r2=1370486&view=diff
==============================================================================
---
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
(original)
+++
archiva/redback/redback-core/trunk/redback-authentication/redback-authentication-providers/redback-authentication-open/pom.xml
Tue Aug 7 20:06:43 2012
@@ -51,6 +51,18 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.authentication.open;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+
org.apache.archiva.redback.authentication;version=${project.version},
+ org.apache.archiva.redback.policy;version=${project.version},
+ org.springframework.stereotype;version="[3,4)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
