oups fix the build

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1327295 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 90e3e0ab4d93c37b59a73dbb21aa6a9279edd09b..c45a7129f5f741081e8a29e9572584688acbed22 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -87,6 +87,12 @@
     <dependency>
       <groupId>org.apache.archiva.redback.components</groupId>
       <artifactId>plexus-expression-evaluator</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.codehaus.plexus</groupId>
+          <artifactId>plexus-component-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>

diff --git a/pom.xml b/pom.xml
index 0c08feae1bbeca3467cd994d6d1b0b80424d8e36..0f46abf6cc08be19a1f4d20483e47d45f409a0cc 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -100,7 +100,7 @@
     <sisu-inject-plexus.version>2.3.0</sisu-inject-plexus.version>
     <sisu-guice.version>3.1.0</sisu-guice.version>
     <plexus-digest.version>1.1</plexus-digest.version>
-    <plexus-expression-evaluator.version>1.0-rc1</plexus-expression-evaluator.version>
+    <plexus-expression-evaluator.version>2.0-SNAPSHOT</plexus-expression-evaluator.version>
     <plexus-utils.version>1.5.5</plexus-utils.version>
     <asfTomcatMavenPluginVersion>2.0-beta-1</asfTomcatMavenPluginVersion>
     <tomcat7Version>7.0.27</tomcat7Version>