You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/04/17 23:38:50 UTC
svn commit: r1327295 - in /archiva/trunk:
archiva-modules/archiva-base/archiva-configuration/pom.xml pom.xml
Author: olamy
Date: Tue Apr 17 21:38:49 2012
New Revision: 1327295
URL: http://svn.apache.org/viewvc?rev=1327295&view=rev
Log:
oups fix the build
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
archiva/trunk/pom.xml
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml?rev=1327295&r1=1327294&r2=1327295&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/pom.xml Tue Apr 17 21:38:49 2012
@@ -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>
Modified: archiva/trunk/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=1327295&r1=1327294&r2=1327295&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Apr 17 21:38:49 2012
@@ -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>