artifactId changed

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1327882 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 c45a7129f5f741081e8a29e9572584688acbed22..97746b6a65476a84a4011a9f8d60a85b2ab6eee1 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -86,7 +86,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva.redback.components</groupId>
-      <artifactId>plexus-expression-evaluator</artifactId>
+      <artifactId>expression-evaluator</artifactId>
       <exclusions>
         <exclusion>
           <groupId>org.codehaus.plexus</groupId>

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 e4b1165d80eb3bada6a2fa95ca8bcf95fee6fa67..d6a8dc6c3b816eb79d2ca47a07ae52430b235f6d 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.apache.archiva.redback.components/plexus-expression-evaluator/${plexus-expression-evaluator.version}</bundle>
+    <bundle dependency="true">wrap:mvn:org.apache.archiva.redback.components/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 0f46abf6cc08be19a1f4d20483e47d45f409a0cc..ff455f322618b75fd8f332293402fd103aaf865d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -768,7 +768,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.archiva.redback.components</groupId>
-        <artifactId>plexus-expression-evaluator</artifactId>
+        <artifactId>expression-evaluator</artifactId>
         <version>${plexus-expression-evaluator.version}</version>
         <exclusions>
           <exclusion>