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 16b34227288125b56f426edfcf0abc50934654e1..90e3e0ab4d93c37b59a73dbb21aa6a9279edd09b 100644 (file)
--- 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 37d0db1db9d24116e4a8adf4480a51b3f9e83dc6..e4b1165d80eb3bada6a2fa95ca8bcf95fee6fa67 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
@@ -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 a20e5c3e615dbdde38fd9b8e29a84c3dff8ed594..0c08feae1bbeca3467cd994d6d1b0b80424d8e36 100644 (file)
--- 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>