diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-11-24 23:04:57 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-11-24 23:04:57 +0000 |
| commit | 07a70248ebc9bb3d2f06f4dd256fe1b03bb3bd8d (patch) | |
| tree | bec6fb372cf14a125df11325500f0900c031f3b9 /archiva-modules/archiva-karaf/archiva-features | |
| parent | 435ca5f9c21a887e1078ec85483d150aef63d9cf (diff) | |
| download | archiva-07a70248ebc9bb3d2f06f4dd256fe1b03bb3bd8d.tar.gz archiva-07a70248ebc9bb3d2f06f4dd256fe1b03bb3bd8d.zip | |
[MRM-1562] Update to Archiva as OSGi compliant application
Archiva REST and Archiva RSS as OSGi bundle.
Submitted by Jean-Baptiste Onofre.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1206014 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-karaf/archiva-features')
| -rw-r--r-- | archiva-modules/archiva-karaf/archiva-features/pom.xml | 1 | ||||
| -rw-r--r-- | archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml index 42804b796..d018ccfa5 100644 --- a/archiva-modules/archiva-karaf/archiva-features/pom.xml +++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml @@ -58,6 +58,7 @@ <plexus-interpolation.version>1.14</plexus-interpolation.version> <plexus-velocity.version>1.1.8</plexus-velocity.version> <quartz.bundle.version>2.1.0_1-SNAPSHOT</quartz.bundle.version> + <rome.bundle.version>1.0_2</rome.bundle.version> <servicemix.specs.version>1.9.0</servicemix.specs.version> <sisu-inject-bean.version>2.3.0</sisu-inject-bean.version> <sisu-guava.version>0.9.9</sisu-guava.version> diff --git a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml index 8f8b8447e..438475aa9 100644 --- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml +++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml @@ -15,6 +15,8 @@ --> <features name="archiva-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.0.0"> + <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxfVersion}/xml/features</repository> + <feature name="archiva-common" description="Archiva Common module" version="${project.version}" resolver="(obr)"> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-lang/${commons-lang.bundle.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject.bundle.version}</bundle> @@ -308,6 +310,23 @@ <bundle>mvn:org.apache.archiva/archiva-security-common/${project.version}</bundle> </feature> + <feature name="archiva-rest-api" description="Archiva REST API module" version="${project.version}" resolver="(obr)"> + <feature version="[2.4,3)">cxf</feature> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-repository-admin-api</feature> + <bundle>mvn:org.apache.archiva/archiva-rest-api/${project.version}</bundle> + </feature> + <feature name="archiva-rest-services" description="Archiva REST Services module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-rest-api</feature> + <bundle>mvn:org.apache.archiva/archiva-rest-services/${project.version}</bundle> + </feature> + + <feature name="archiva-rss" description="Archiva RSS module" version="${project.version}" resolver="(obr)"> + <feature version="${project.version}">archiva-common</feature> + <feature version="${project.version}">archiva-metadata</feature> + <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome.bundle.version}</bundle> + <bundle>mvn:org.apache.archiva/archiva-rss/${project.version}</bundle> + </feature> </features>
\ No newline at end of file |