diff options
| author | Olivier Lamy <olamy@apache.org> | 2012-08-04 18:21:08 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2012-08-04 18:21:08 +0000 |
| commit | 2378be5050394f5fdd349b18fc4ea06ee86365a5 (patch) | |
| tree | eb04f37e5a13117874f9531b1c5a41d448f7a61d /archiva-modules/archiva-karaf | |
| parent | 148e9f13411112cd0b42da381b5acbbd54dbbcc9 (diff) | |
| download | archiva-2378be5050394f5fdd349b18fc4ea06ee86365a5.tar.gz archiva-2378be5050394f5fdd349b18fc4ea06ee86365a5.zip | |
cleanup karaf features with guava version
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1369388 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-karaf')
| -rw-r--r-- | archiva-modules/archiva-karaf/archiva-features/pom.xml | 2 | ||||
| -rw-r--r-- | archiva-modules/archiva-karaf/archiva-features/src/main/resources/features.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/archiva-modules/archiva-karaf/archiva-features/pom.xml b/archiva-modules/archiva-karaf/archiva-features/pom.xml index ae95df65e..eb6ba6079 100644 --- 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 a5c5866f5..23707e975 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 @@ -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> |