cleanup karaf features with guava version

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369388 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml
index ae95df65ecbe5e0e2ff171d6000572b129bbadc9..eb6ba607977a3e1e65de686947a40397d266104a 100644 (file)
--- a/archiva-modules/archiva-karaf/archiva-features/pom.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/pom.xml
@@ -63,7 +63,7 @@
     <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>
+    <guava.version>13.0</guava.version>
     <stax-utils.bundle.version>20040917_2</stax-utils.bundle.version>
     <testng.version>6.3.1</testng.version>
     <velocity.bundle.version>1.7_3</velocity.bundle.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 a5c5866f5ee03ba89e8b42b54b497435c70e60e0..23707e97557689aa2c9358e37ca2955323e44bab 100644 (file)
--- a/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
+++ b/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
@@ -24,7 +24,7 @@
     <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-classworlds/${plexus-classworlds.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-component-annotations/${plexus-component-annotations.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-utils/${plexus-utils.version}</bundle>
-    <bundle dependency="true">mvn:org.sonatype.sisu/sisu-guava/${sisu-guava.version}</bundle>
+    <bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
     <bundle dependency="true">mvn:org.sonatype.sisu/sisu-guice/${sisu-guice.version}</bundle>
     <bundle dependency="true">mvn:org.sonatype.sisu/sisu-inject-bean/${sisu-inject-bean.version}</bundle>
     <bundle dependency="true">mvn:org.sonatype.sisu/sisu-inject-plexus/${sisu-inject-plexus.version}</bundle>