Author: olamy
Date: Sat Aug 4 18:21:08 2012
New Revision: 1369388
URL: http://svn.apache.org/viewvc?rev=1369388&view=rev
Log:
cleanup karaf features with guava version
Modified:
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
Modified: archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml?rev=1369388&r1=1369387&r2=1369388&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-karaf/archiva-features/pom.xml Sat
Aug 4 18:21:08 2012
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml?rev=1369388&r1=1369387&r2=1369388&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml
Sat Aug 4 18:21:08 2012
@@ -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>
