Author: jbonofre
Date: Thu Aug 2 07:34:34 2012
New Revision: 1368371
URL: http://svn.apache.org/viewvc?rev=1368371&view=rev
Log:
[MRM-1651] Add OSGi support in spring-apacheds, spring-quartz, spring-registry,
spring-taskqueue, spring-utils
Modified:
archiva/redback/redback-components/trunk/spring-apacheds/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/spring-apacheds/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-apacheds/pom.xml?rev=1368371&r1=1368370&r2=1368371&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-apacheds/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-apacheds/pom.xml Thu Aug 2
07:34:34 2012
@@ -18,16 +18,19 @@
~ 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>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>spring-apacheds</artifactId>
+ <packaging>bundle</packaging>
<name>Spring Apache Directory Server Components</name>
- <version>2.0-SNAPSHOT</version>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -121,4 +124,13 @@
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
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=1368371&r1=1368370&r2=1368371&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-quartz/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-quartz/pom.xml Thu Aug 2
07:34:34 2012
@@ -18,16 +18,19 @@
~ 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>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>spring-quartz</artifactId>
+ <packaging>bundle</packaging>
<name>Spring Quartz Component</name>
- <version>2.0-SNAPSHOT</version>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -82,9 +85,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -93,4 +101,5 @@
</plugin>
</plugins>
</build>
+
</project>
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=1368371&r1=1368370&r2=1368371&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
Thu Aug 2 07:34:34 2012
@@ -18,19 +18,33 @@
~ 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.registry</groupId>
<artifactId>spring-registry</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>spring-registry-api</artifactId>
+ <packaging>bundle</packaging>
<name>Redback Spring Registry Api</name>
- <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
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=1368371&r1=1368370&r2=1368371&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
Thu Aug 2 07:34:34 2012
@@ -18,15 +18,19 @@
~ 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.registry</groupId>
<artifactId>spring-registry</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
<artifactId>spring-registry-commons</artifactId>
+ <packaging>bundle</packaging>
<name>Redback Spring Registry commons-configuration</name>
- <packaging>jar</packaging>
+
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -87,9 +91,14 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<plugins>
<plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
@@ -101,4 +110,5 @@
</plugin>
</plugins>
</build>
+
</project>
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=1368371&r1=1368370&r2=1368371&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-taskqueue/pom.xml Thu Aug
2 07:34:34 2012
@@ -18,16 +18,19 @@
~ 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>
- <modelVersion>4.0.0</modelVersion>
+ </parent>
+
<artifactId>spring-taskqueue</artifactId>
+ <packaging>bundle</packaging>
<name>Spring Task Queue</name>
- <version>2.0-SNAPSHOT</version>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -94,4 +97,14 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
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=1368371&r1=1368370&r2=1368371&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-utils/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-utils/pom.xml Thu Aug 2
07:34:34 2012
@@ -18,18 +18,20 @@
~ 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>
+
<artifactId>spring-utils</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
<name>Spring Utils Goodies</name>
<description>Contains some spring goodies.</description>
- <packaging>bundle</packaging>
<url>http://archiva.apache.org/redback/components/${project.artifactId}</url>
@@ -127,29 +129,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
-
<Bundle-SymbolicName>org.apache.archiva.common.plexusbridge</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- <Export-Package>
-
org.apache.archiva.redback.components.springutils;version=${project.version},
-
org.apache.archiva.redback.components.springutils.plexusshim;version=${project.version}
- </Export-Package>
- <Import-Package>
- javax.inject,
- org.codehaus.plexus,
- org.codehaus.plexus.classworlds,
- org.codehaus.plexus.classworlds.realm,
- org.codehaus.plexus.component.repository.exception,
- org.springframework.stereotype,
- org.apache.commons.lang,
- org.springframework.beans.factory.support,
- org.springframework.context,
- org.springframework.web.context.support,
- org.slf4j;resolution:=optional
- </Import-Package>
- </instructions>
- </configuration>
</plugin>
</plugins>
</build>
