From: Olivier Lamy <olamy@apache.org>
Date: Tue, 17 Apr 2012 21:23:33 +0000 (+0000)
Subject: use expression evaluator from apache namespace
X-Git-Tag: archiva-1.4-M3~765
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6338fd0cd3d8ce8330883a7e1a7982175419b740;p=archiva.git

use expression evaluator from apache namespace

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

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index 16b342272..90e3e0ab4 100644
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -85,7 +85,7 @@
       <artifactId>spring-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.codehaus.plexus</groupId>
+      <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>plexus-expression-evaluator</artifactId>
     </dependency>
     <dependency>
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 37d0db1db..e4b1165d8 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
@@ -56,7 +56,7 @@
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-digester/${commons-digester.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-jxpath/${commons-jxpath.bundle.version}</bundle>
     <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-configuration/${commons-configuration.bundle.version}</bundle>
-    <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.codehaus.plexus/plexus-interpolation/${plexus-interpolation.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-api/${redback.registry.version}</bundle>
     <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components.registry/spring-registry-commons/${redback.registry.version}</bundle>
diff --git a/pom.xml b/pom.xml
index a20e5c3e6..0c08feae1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -767,7 +767,7 @@
         <version>${plexus-digest.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.codehaus.plexus</groupId>
+        <groupId>org.apache.archiva.redback.components</groupId>
         <artifactId>plexus-expression-evaluator</artifactId>
         <version>${plexus-expression-evaluator.version}</version>
         <exclusions>