Author: jbonofre
Date: Fri Aug 3 07:45:35 2012
New Revision: 1368818
URL: http://svn.apache.org/viewvc?rev=1368818&view=rev
Log:
[MRM-1651] Improve OSGi statements by defining version ranges
Added:
archiva/redback/redback-components/trunk/redback-features/
archiva/redback/redback-components/trunk/redback-features/pom.xml
archiva/redback/redback-components/trunk/redback-features/src/
archiva/redback/redback-components/trunk/redback-features/src/main/
archiva/redback/redback-components/trunk/redback-features/src/main/resources/
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
Modified:
archiva/redback/redback-components/trunk/expression-evaluator/pom.xml
archiva/redback/redback-components/trunk/pom.xml
archiva/redback/redback-components/trunk/spring-apacheds/pom.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/pom.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/pom.xml
archiva/redback/redback-components/trunk/spring-jdo2/pom.xml
archiva/redback/redback-components/trunk/spring-quartz/pom.xml
archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/pom.xml
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/pom.xml
archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml
archiva/redback/redback-components/trunk/spring-utils/pom.xml
Modified: archiva/redback/redback-components/trunk/expression-evaluator/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/expression-evaluator/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/expression-evaluator/pom.xml
(original)
+++ archiva/redback/redback-components/trunk/expression-evaluator/pom.xml Fri
Aug 3 07:45:35 2012
@@ -30,7 +30,6 @@
<artifactId>expression-evaluator</artifactId>
<packaging>bundle</packaging>
- <version>2.0-SNAPSHOT</version>
<name>Expression Evaluator Components</name>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -61,6 +60,17 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.evaluator*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ org.codehaus.plexus.util;version="[1.5,2)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: archiva/redback/redback-components/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/pom.xml (original)
+++ archiva/redback/redback-components/trunk/pom.xml Fri Aug 3 07:45:35 2012
@@ -35,6 +35,7 @@
<module>spring-taskqueue</module>
<module>spring-apacheds</module>
<module>spring-utils</module>
+ <module>redback-features</module>
</modules>
<build>
<plugins>
Added: archiva/redback/redback-components/trunk/redback-features/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-features/pom.xml?rev=1368818&view=auto
==============================================================================
--- archiva/redback/redback-components/trunk/redback-features/pom.xml (added)
+++ archiva/redback/redback-components/trunk/redback-features/pom.xml Fri Aug
3 07:45:35 2012
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.archiva.redback.components</groupId>
+ <artifactId>redback-components</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <relativePath>../redback-components-parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.archiva.redback</groupId>
+ <artifactId>redback-components</artifactId>
+ <packaging>pom</packaging>
+ <name>Redback :: Components :: Karaf features</name>
+
+ <properties>
+ <commons-lang.version>2.6</commons-lang.version>
+ <javax-inject.bundle.version>1_1</javax-inject.bundle.version>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.7</version>
+ <executions>
+ <execution>
+ <id>attach-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml</type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added:
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml?rev=1368818&view=auto
==============================================================================
---
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
(added)
+++
archiva/redback/redback-components/trunk/redback-features/src/main/resources/features.xml
Fri Aug 3 07:45:35 2012
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<features name="redback-components-${project.version}"
xmlns="http://karaf.apache.org/xmlns/features/v1.0.0";>
+
+ <feature name="redback-spring-apacheds" version="${project.version}"
resolver="(obr)">
+ <!-- Require ApacheDS bundle -->
+
<bundle>mvn:org.apache.archiva.redback.components/spring-apacheds/${project.version}</bundle>
+ </feature>
+
+ <feature name="redback-cache-api" version="${project.version}"
resolver="(obr)">
+ <feature>spring</feature>
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
+ <bundle
dependency="true">mvn:commons-lang/commons-lang/${commons-lang.version}</bundle>
+
<bundle>mvn:org.apache.archiva.redback.components.cache/spring-cache-api/${project.version}</bundle>
+ </feature>
+
+ <feature name="redback-cache-ehcache" version="${project.version}"
resolver="(obr)">
+ <feature version="${project.version}">redback-cache-api</feature>
+ <!-- Require ehcache bundle -->
+
<bundle>mvn:org.apache.archiva.redback.components.cache/spring-cache-ehcache/${project.version}</bundle>
+ </feature>
+
+ <feature name="redback-cache-hashmap" version="${project.version}"
resolver="(obr)">
+ <feature version="${project.version}">redback-cache-api</feature>
+
<bundle>mvn:org.apache.archiva.redback.components.cache/spring-cache-hashmap/${project.version}</bundle>
+ </feature>
+
+ <feature name="redback-cache-oscache" version="${project.version}"
resolver="(obr)">
+ <feature version="${project.version}">redback-cache-api</feature>
+ <!-- Require oscache bundle -->
+
<bundle>mvn:org.apache.archiva.redback.components.cache/spring-cache-oscache/${project.version}</bundle>
+ </feature>
+
+ <feature name="redback-spring-jdo2" version="${project.version}"
resolver="(obr)">
+ <!-- javax.jdo2 bundle require -->
+
<bundle>mvn:org.apache.archiva.redback.components/spring-jdo2/${project.version}</bundle>
+ </feature>
+
+ <feature name="redback-spring-quartz" version="${project.version}"
resolver="(obr)">
+ <bundle
dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle>
+
<bundle>mvn:org.apache.archiva.redback.components/spring-quartz/${project.version}</bundle>
+ </feature>
+
+</features>
\ No newline at end of file
Modified: archiva/redback/redback-components/trunk/spring-apacheds/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-apacheds/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-apacheds/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-apacheds/pom.xml Fri Aug 3
07:45:35 2012
@@ -129,6 +129,18 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.apacheds;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.naming*,
+ org.apache.directory.server*;version="[1.5,2)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-api/pom.xml
Fri Aug 3 07:45:35 2012
@@ -80,6 +80,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.cache*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ org.springframework*;version="[3,4)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
Fri Aug 3 07:45:35 2012
@@ -57,6 +57,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.cache.ehcache;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ net.sf.ehcache*;version="[2.5,3)",
+
org.apache.archiva.redback.components.cache*;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
Fri Aug 3 07:45:35 2012
@@ -38,6 +38,19 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.cache.hashmap;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+
org.apache.archiva.redback.components.cache*;version=${project.version},
+ org.springframework*;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-cache/spring-cache-providers/spring-cache-oscache/pom.xml
Fri Aug 3 07:45:35 2012
@@ -52,6 +52,19 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.cache.oscache;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ com.opensymphony.oscache*;version="[2.4,3)",
+
org.apache.archiva.redback.components.cache*;version=${project.version},
+ org.apache.commons.lang;version="[2.6,3)"
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: archiva/redback/redback-components/trunk/spring-jdo2/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-jdo2/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-jdo2/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-jdo2/pom.xml Fri Aug 3
07:45:35 2012
@@ -149,6 +149,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.jdo;version=${project.version}
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.jdo,
+ javax.naming,
+ javax.sql,
+ org.apache.commons.lang;version="[2.6,3)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<!-- I Couldn't get the test classes to generate from modello.
So I just placed the pre-generated classes into the src/test/* tree
instead.
Modified: archiva/redback/redback-components/trunk/spring-quartz/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-quartz/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-quartz/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-quartz/pom.xml Fri Aug 3
07:45:35 2012
@@ -91,6 +91,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.scheduler*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ javax.inject;version="[1,2)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.quartz*;version="[2.1,3)",
+ 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-components/trunk/spring-registry/spring-registry-api/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-api/pom.xml
Fri Aug 3 07:45:35 2012
@@ -43,6 +43,16 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.registry;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified:
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/pom.xml
(original)
+++
archiva/redback/redback-components/trunk/spring-registry/spring-registry-commons/pom.xml
Fri Aug 3 07:45:35 2012
@@ -97,6 +97,22 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.registry.commons;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+
org.apache.archiva.redback.components.registry;version=${project.version},
+ org.apache.commons.configuration*;version="[1.8,2)",,
+ org.apache.commons.lang;version="[2.6,3)",
+ org.codehaus.plexus.interpolation;version="[1.14,2)",
+ org.springframework*;version="[3,4)",
+ org.slf4j
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Modified: archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml Fri Aug
3 07:45:35 2012
@@ -103,6 +103,18 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.taskqueue*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.annotation,
+ org.apache.commons.lang;version="[2.6,3)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: archiva/redback/redback-components/trunk/spring-utils/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-utils/pom.xml?rev=1368818&r1=1368817&r2=1368818&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-utils/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-utils/pom.xml Fri Aug 3
07:45:35 2012
@@ -129,6 +129,20 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Export-Package>
+
org.apache.archiva.redback.components.springutils*;version=${project.version};-split-package:=merge-first
+ </Export-Package>
+ <Import-Package>
+ javax.inject;version="[1,2)",
+ org.apache.commons.lang;version="[2.6,3)",
+ org.codehaus.plexus*,
+ org.springframework*;version="[3,4)",
+ org.slf4j;resolution:=optional
+ </Import-Package>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
